Skip to content

[SPARK-48718][SQL] Handle and fix the case when deserializer in cogroup is resolved during application of DeduplicateRelation rule #47091

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
anchovYu wants to merge 2 commits into from
Closed

[SPARK-48718][SQL] Handle and fix the case when deserializer in cogroup is resolved during application of DeduplicateRelation rule #47091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb831d8
fix
anchovYu Jun 25, 2024
8c78357
Update DatasetSuite.scala
cloud-fan Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions ...catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/DeduplicateRelations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,12 +255,18 @@ object DeduplicateRelations extends Rule[LogicalPlan] {
val newRightGroup = rewriteAttrs(c.rightGroup, rightAttrMap)
val newLeftOrder = rewriteAttrs(c.leftOrder, leftAttrMap)
val newRightOrder = rewriteAttrs(c.rightOrder, rightAttrMap)
val newKeyDes = c.keyDeserializer.asInstanceOf[UnresolvedDeserializer]
.copy(inputAttributes = newLeftGroup)
val newLeftDes = c.leftDeserializer.asInstanceOf[UnresolvedDeserializer]
.copy(inputAttributes = newLeftAttr)
val newRightDes = c.rightDeserializer.asInstanceOf[UnresolvedDeserializer]
.copy(inputAttributes = newRightAttr)
val newKeyDes = c.keyDeserializer match {
case u: UnresolvedDeserializer => u.copy(inputAttributes = newLeftGroup)
case e: Expression => e.withNewChildren(rewriteAttrs(e.children, leftAttrMap))
}
val newLeftDes = c.leftDeserializer match {
case u: UnresolvedDeserializer => u.copy(inputAttributes = newLeftAttr)
case e: Expression => e.withNewChildren(rewriteAttrs(e.children, leftAttrMap))
}
val newRightDes = c.rightDeserializer match {
case u: UnresolvedDeserializer => u.copy(inputAttributes = newRightAttr)
case e: Expression => e.withNewChildren(rewriteAttrs(e.children, rightAttrMap))
}
c.copy(keyDeserializer = newKeyDes, leftDeserializer = newLeftDes,
rightDeserializer = newRightDes, leftGroup = newLeftGroup,
rightGroup = newRightGroup, leftAttr = newLeftAttr, rightAttr = newRightAttr,
Expand Down
20 changes: 20 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import java.io.{Externalizable, ObjectInput, ObjectOutput}
import java.sql.{Date, Timestamp}

import scala.collection.immutable.HashSet
import scala.jdk.CollectionConverters._
import scala.reflect.ClassTag
import scala.util.Random

Expand Down Expand Up @@ -952,6 +953,25 @@ class DatasetSuite extends QueryTest
assert(result2.length == 3)
}

test("SPARK-48718: cogroup deserializer expr is resolved before dedup relation") {
val lhs = spark.createDataFrame(
List(Row(123L)).asJava,
StructType(Seq(StructField("GROUPING_KEY", LongType)))
)
val rhs = spark.createDataFrame(
List(Row(0L, 123L)).asJava,
StructType(Seq(StructField("ID", LongType), StructField("GROUPING_KEY", LongType)))
)

val lhsKV = lhs.groupByKey((r: Row) => r.getAs[Long]("GROUPING_KEY"))
val rhsKV = rhs.groupByKey((r: Row) => r.getAs[Long]("GROUPING_KEY"))
val cogrouped = lhsKV.cogroup(rhsKV)(
(a: Long, b: Iterator[Row], c: Iterator[Row]) => Iterator(0L)
)
val joined = rhs.join(cogrouped, col("ID") === col("value"), "left")
checkAnswer(joined, Row(0L, 123L, 0L) :: Nil)
}

test("SPARK-34806: observation on datasets") {
val namedObservation = Observation("named")
val unnamedObservation = Observation()
Expand Down