Skip to content

[SPARK-11803][SQL] fix Dataset self-join #9806

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
cloud-fan wants to merge 1 commit into from
Closed

[SPARK-11803][SQL] fix Dataset self-join #9806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,13 +498,17 @@ class Dataset[T] private[sql](
val left = this.logicalPlan
val right = other.logicalPlan

val joined = sqlContext.executePlan(Join(left, right, Inner, Some(condition.expr)))
val leftOutput = joined.analyzed.output.take(left.output.length)
val rightOutput = joined.analyzed.output.takeRight(right.output.length)

val leftData = this.unresolvedTEncoder match {
case e if e.flat => Alias(left.output.head, "_1")()
case _ => Alias(CreateStruct(left.output), "_1")()
case e if e.flat => Alias(leftOutput.head, "_1")()
case _ => Alias(CreateStruct(leftOutput), "_1")()
}
val rightData = other.unresolvedTEncoder match {
case e if e.flat => Alias(right.output.head, "_2")()
case _ => Alias(CreateStruct(right.output), "_2")()
case e if e.flat => Alias(rightOutput.head, "_2")()
case _ => Alias(CreateStruct(rightOutput), "_2")()
}


Expand All @@ -513,7 +517,7 @@ class Dataset[T] private[sql](
withPlan[(T, U)](other) { (left, right) =>
Project(
leftData :: rightData :: Nil,
Join(left, right, Inner, Some(condition.expr)))
joined.analyzed)
}
}

Expand Down
8 changes: 4 additions & 4 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 @@ -347,7 +347,7 @@ class DatasetSuite extends QueryTest with SharedSQLContext {
checkAnswer(joined, ("2", 2))
}

ignore("self join") {
test("self join") {
val ds = Seq("1", "2").toDS().as("a")
val joined = ds.joinWith(ds, lit(true))
checkAnswer(joined, ("1", "1"), ("1", "2"), ("2", "1"), ("2", "2"))
Expand All @@ -360,15 +360,15 @@ class DatasetSuite extends QueryTest with SharedSQLContext {

test("kryo encoder") {
implicit val kryoEncoder = Encoders.kryo[KryoData]
val ds = sqlContext.createDataset(Seq(KryoData(1), KryoData(2)))
val ds = Seq(KryoData(1), KryoData(2)).toDS()

assert(ds.groupBy(p => p).count().collect().toSeq ==
Seq((KryoData(1), 1L), (KryoData(2), 1L)))
}

ignore("kryo encoder self join") {
test("kryo encoder self join") {
implicit val kryoEncoder = Encoders.kryo[KryoData]
val ds = sqlContext.createDataset(Seq(KryoData(1), KryoData(2)))
val ds = Seq(KryoData(1), KryoData(2)).toDS()
assert(ds.joinWith(ds, lit(true)).collect().toSet ==
Set(
(KryoData(1), KryoData(1)),
Expand Down