[SPARK-33071][SPARK-33536][SQL] Avoid changing dataset_id of LogicalPlan in join() to not break DetectAmbiguousSelfJoin #30488

Ngone51 · 2020-11-24T14:32:38Z

What changes were proposed in this pull request?

Currently, join() uses withPlan(logicalPlan) for convenient to call some Dataset functions. But it leads to the dataset_id inconsistent between the logicalPlan and the original Dataset(because withPlan(logicalPlan) will create a new Dataset with the new id and reset the dataset_id with the new id of the logicalPlan). As a result, it breaks the rule DetectAmbiguousSelfJoin.

In this PR, we propose to drop the usage of withPlan but use the logicalPlan directly so its dataset_id doesn't change.

Besides, this PR also removes related metadata (DATASET_ID_KEY, COL_POS_KEY) when an Alias tries to construct its own metadata. Because the Alias is no longer a reference column after converting to an Attribute. To achieve that, we add a new field, deniedMetadataKeys, to indicate the metadata that needs to be removed.

Why are the changes needed?

For the query below, it returns the wrong result while it should throws ambiguous self join exception instead:

val emp1 = Seq[TestData](
  TestData(1, "sales"),
  TestData(2, "personnel"),
  TestData(3, "develop"),
  TestData(4, "IT")).toDS()
val emp2 = Seq[TestData](
  TestData(1, "sales"),
  TestData(2, "personnel"),
  TestData(3, "develop")).toDS()
val emp3 = emp1.join(emp2, emp1("key") === emp2("key")).select(emp1("*"))
emp1.join(emp3, emp1.col("key") === emp3.col("key"), "left_outer")
  .select(emp1.col("*"), emp3.col("key").as("e2")).show()

// wrong result
+---+---------+---+
|key|    value| e2|
+---+---------+---+
|  1|    sales|  1|
|  2|personnel|  2|
|  3|  develop|  3|
|  4|       IT|  4|
+---+---------+---+

This PR fixes the wrong behaviour.

Does this PR introduce any user-facing change?

Yes, users hit the exception instead of the wrong result after this PR.

How was this patch tested?

Added a new unit test.

Ngone51 · 2020-11-24T14:33:10Z

cc @cloud-fan @xuanyuanking Could you take a look? Thanks!

SparkQA · 2020-11-24T16:15:41Z

Test build #131668 has finished for PR 30488 at commit a617f94.

This patch fails Spark unit tests.
This patch merges cleanly.
This patch adds no public classes.

SparkQA · 2020-11-25T07:56:32Z

Test build #131728 has finished for PR 30488 at commit 05bca19.

This patch fails Spark unit tests.
This patch merges cleanly.
This patch adds no public classes.

xuanyuanking · 2020-11-25T13:01:40Z

Seems the failed UT is related.

org.apache.spark.sql.DataFrameSelfJoinSuite.SPARK-28344: don't fail if there is no ambiguous self join

Ngone51 · 2020-11-25T13:34:13Z

Yeah...I fixed it just now.

sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala

SparkQA · 2020-11-25T18:47:51Z

Test build #131778 has finished for PR 30488 at commit 5cff25f.

This patch passes all tests.
This patch merges cleanly.
This patch adds no public classes.

SparkQA · 2020-11-30T14:35:15Z

Test build #131994 has finished for PR 30488 at commit 85f6f12.

This patch fails to build.
This patch merges cleanly.
This patch adds no public classes.

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala

sql/core/src/main/scala/org/apache/spark/sql/Column.scala

sql/catalyst/src/main/scala/org/apache/spark/sql/types/Metadata.scala

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala

SparkQA · 2020-12-02T14:12:15Z

Test build #132041 has finished for PR 30488 at commit df04549.

This patch fails Spark unit tests.
This patch merges cleanly.
This patch adds no public classes.

cloud-fan · 2020-12-02T14:13:16Z

retest this please

SparkQA · 2020-12-02T16:27:51Z

Test build #132054 has finished for PR 30488 at commit e06b223.

This patch fails Spark unit tests.
This patch merges cleanly.
This patch adds no public classes.

cloud-fan · 2020-12-02T17:51:08Z

GA passed, merging to master, thanks!

SparkQA · 2020-12-02T20:29:55Z

Test build #132059 has finished for PR 30488 at commit d13b88c.

This patch passes all tests.
This patch merges cleanly.
This patch adds no public classes.

…to nonInheritableMetadataKeys in Alias ### What changes were proposed in this pull request? This PR is a followup of #30488. This PR proposes to rename `Alias.deniedMetadataKeys` to `Alias.nonInheritableMetadataKeys` to make it less confusing. ### Why are the changes needed? To make it easier to maintain and read. ### Does this PR introduce _any_ user-facing change? No. This is rather a code cleanup. ### How was this patch tested? Ran the unittests written in the previous PR manually. Jenkins and GitHub Actions in this PR should also test them. Closes #30682 from HyukjinKwon/SPARK-33071-SPARK-33536. Authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>

…to nonInheritableMetadataKeys in Alias ### What changes were proposed in this pull request? This PR is a followup of #30488. This PR proposes to rename `Alias.deniedMetadataKeys` to `Alias.nonInheritableMetadataKeys` to make it less confusing. ### Why are the changes needed? To make it easier to maintain and read. ### Does this PR introduce _any_ user-facing change? No. This is rather a code cleanup. ### How was this patch tested? Ran the unittests written in the previous PR manually. Jenkins and GitHub Actions in this PR should also test them. Closes #30682 from HyukjinKwon/SPARK-33071-SPARK-33536. Authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]> (cherry picked from commit b5399d4) Signed-off-by: HyukjinKwon <[email protected]>

…to nonInheritableMetadataKeys in Alias ### What changes were proposed in this pull request? This PR is a followup of apache/spark#30488. This PR proposes to rename `Alias.deniedMetadataKeys` to `Alias.nonInheritableMetadataKeys` to make it less confusing. ### Why are the changes needed? To make it easier to maintain and read. ### Does this PR introduce _any_ user-facing change? No. This is rather a code cleanup. ### How was this patch tested? Ran the unittests written in the previous PR manually. Jenkins and GitHub Actions in this PR should also test them. Closes #30682 from HyukjinKwon/SPARK-33071-SPARK-33536. Authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>

…lan in join() to not break DetectAmbiguousSelfJoin Currently, `join()` uses `withPlan(logicalPlan)` for convenient to call some Dataset functions. But it leads to the `dataset_id` inconsistent between the `logicalPlan` and the original `Dataset`(because `withPlan(logicalPlan)` will create a new Dataset with the new id and reset the `dataset_id` with the new id of the `logicalPlan`). As a result, it breaks the rule `DetectAmbiguousSelfJoin`. In this PR, we propose to drop the usage of `withPlan` but use the `logicalPlan` directly so its `dataset_id` doesn't change. Besides, this PR also removes related metadata (`DATASET_ID_KEY`, `COL_POS_KEY`) when an `Alias` tries to construct its own metadata. Because the `Alias` is no longer a reference column after converting to an `Attribute`. To achieve that, we add a new field, `deniedMetadataKeys`, to indicate the metadata that needs to be removed. For the query below, it returns the wrong result while it should throws ambiguous self join exception instead: ```scala val emp1 = Seq[TestData]( TestData(1, "sales"), TestData(2, "personnel"), TestData(3, "develop"), TestData(4, "IT")).toDS() val emp2 = Seq[TestData]( TestData(1, "sales"), TestData(2, "personnel"), TestData(3, "develop")).toDS() val emp3 = emp1.join(emp2, emp1("key") === emp2("key")).select(emp1("*")) emp1.join(emp3, emp1.col("key") === emp3.col("key"), "left_outer") .select(emp1.col("*"), emp3.col("key").as("e2")).show() // wrong result +---+---------+---+ |key| value| e2| +---+---------+---+ | 1| sales| 1| | 2|personnel| 2| | 3| develop| 3| | 4| IT| 4| +---+---------+---+ ``` This PR fixes the wrong behaviour. Yes, users hit the exception instead of the wrong result after this PR. Added a new unit test. Closes apache#30488 from Ngone51/fix-self-join. Authored-by: yi.wu <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>

…to nonInheritableMetadataKeys in Alias This PR is a followup of apache#30488. This PR proposes to rename `Alias.deniedMetadataKeys` to `Alias.nonInheritableMetadataKeys` to make it less confusing. To make it easier to maintain and read. No. This is rather a code cleanup. Ran the unittests written in the previous PR manually. Jenkins and GitHub Actions in this PR should also test them. Closes apache#30682 from HyukjinKwon/SPARK-33071-SPARK-33536. Authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>

…lan in join() to not break DetectAmbiguousSelfJoin Currently, `join()` uses `withPlan(logicalPlan)` for convenient to call some Dataset functions. But it leads to the `dataset_id` inconsistent between the `logicalPlan` and the original `Dataset`(because `withPlan(logicalPlan)` will create a new Dataset with the new id and reset the `dataset_id` with the new id of the `logicalPlan`). As a result, it breaks the rule `DetectAmbiguousSelfJoin`. In this PR, we propose to drop the usage of `withPlan` but use the `logicalPlan` directly so its `dataset_id` doesn't change. Besides, this PR also removes related metadata (`DATASET_ID_KEY`, `COL_POS_KEY`) when an `Alias` tries to construct its own metadata. Because the `Alias` is no longer a reference column after converting to an `Attribute`. To achieve that, we add a new field, `deniedMetadataKeys`, to indicate the metadata that needs to be removed. For the query below, it returns the wrong result while it should throws ambiguous self join exception instead: ```scala val emp1 = Seq[TestData]( TestData(1, "sales"), TestData(2, "personnel"), TestData(3, "develop"), TestData(4, "IT")).toDS() val emp2 = Seq[TestData]( TestData(1, "sales"), TestData(2, "personnel"), TestData(3, "develop")).toDS() val emp3 = emp1.join(emp2, emp1("key") === emp2("key")).select(emp1("*")) emp1.join(emp3, emp1.col("key") === emp3.col("key"), "left_outer") .select(emp1.col("*"), emp3.col("key").as("e2")).show() // wrong result +---+---------+---+ |key| value| e2| +---+---------+---+ | 1| sales| 1| | 2|personnel| 2| | 3| develop| 3| | 4| IT| 4| +---+---------+---+ ``` This PR fixes the wrong behaviour. Yes, users hit the exception instead of the wrong result after this PR. Added a new unit test. Closes apache#30488 from Ngone51/fix-self-join. Authored-by: yi.wu <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>

…to nonInheritableMetadataKeys in Alias ### What changes were proposed in this pull request? This PR is a followup of apache#30488. This PR proposes to rename `Alias.deniedMetadataKeys` to `Alias.nonInheritableMetadataKeys` to make it less confusing. ### Why are the changes needed? To make it easier to maintain and read. ### Does this PR introduce _any_ user-facing change? No. This is rather a code cleanup. ### How was this patch tested? Ran the unittests written in the previous PR manually. Jenkins and GitHub Actions in this PR should also test them. Closes apache#30682 from HyukjinKwon/SPARK-33071-SPARK-33536. Authored-by: HyukjinKwon <[email protected]> Signed-off-by: HyukjinKwon <[email protected]>

fix

a617f94

cloud-fan approved these changes Nov 24, 2020

View reviewed changes

github-actions bot added the SQL label Nov 24, 2020

add SPARK-33701

05bca19

Ngone51 changed the title ~~[SPARK-33536][SQL] Avoid changing dataset_id of LogicalPlan in join() to not break DetectAmbiguousSelfJoin~~ [SPARK-33071][SPARK-33536][SQL] Avoid changing dataset_id of LogicalPlan in join() to not break DetectAmbiguousSelfJoin Nov 25, 2020

Ngone51 commented Nov 25, 2020

View reviewed changes

sql/core/src/main/scala/org/apache/spark/sql/Dataset.scala Outdated Show resolved Hide resolved

Ngone51 commented Nov 25, 2020

View reviewed changes

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala Outdated Show resolved Hide resolved

cloud-fan reviewed Nov 25, 2020

View reviewed changes

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala Outdated Show resolved Hide resolved

Ngone51 added 3 commits November 30, 2020 22:06

switch to another way

e397abb

fix df.show

eb6afe1

update equals

85f6f12

Ngone51 force-pushed the fix-self-join branch from 5cff25f to 85f6f12 Compare November 30, 2020 14:16

Ngone51 closed this Dec 1, 2020

Ngone51 reopened this Dec 1, 2020

cloud-fan reviewed Dec 1, 2020

View reviewed changes

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala Show resolved Hide resolved

cloud-fan reviewed Dec 1, 2020

View reviewed changes

sql/core/src/main/scala/org/apache/spark/sql/Column.scala Show resolved Hide resolved

cloud-fan reviewed Dec 1, 2020

View reviewed changes

sql/catalyst/src/main/scala/org/apache/spark/sql/types/Metadata.scala Outdated Show resolved Hide resolved

Ngone51 added 3 commits December 2, 2020 17:06

remove(keys: String*)

dc1af09

add comments

b17da86

update comment

df04549

cloud-fan reviewed Dec 2, 2020

View reviewed changes

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/namedExpressions.scala Outdated Show resolved Hide resolved

Ngone51 added 2 commits December 2, 2020 21:38

use loop

9809e57

update

e06b223

cloud-fan approved these changes Dec 2, 2020

View reviewed changes

fix ColumnarAlias

d13b88c

cloud-fan closed this in a082f46 Dec 2, 2020

HyukjinKwon mentioned this pull request Dec 9, 2020

[SPARK-33071][SPARK-33536][SQL][FOLLOW-UP] Rename deniedMetadataKeys to nonInheritableMetadataKeys in Alias #30682

Closed

cloud-fan mentioned this pull request Jan 22, 2021

[SPARK-34200][SQL] Ambiguous column reference should consider attribute availability #31287

Closed

[SPARK-33071][SPARK-33536][SQL] Avoid changing dataset_id of LogicalPlan in join() to not break DetectAmbiguousSelfJoin #30488

[SPARK-33071][SPARK-33536][SQL] Avoid changing dataset_id of LogicalPlan in join() to not break DetectAmbiguousSelfJoin #30488

Uh oh!

Conversation

Ngone51 commented Nov 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What changes were proposed in this pull request?

Why are the changes needed?

Does this PR introduce any user-facing change?

How was this patch tested?

Uh oh!

Ngone51 commented Nov 24, 2020

Uh oh!

SparkQA commented Nov 24, 2020

Uh oh!

SparkQA commented Nov 25, 2020

Uh oh!

xuanyuanking commented Nov 25, 2020

Uh oh!

Ngone51 commented Nov 25, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SparkQA commented Nov 25, 2020

Uh oh!

SparkQA commented Nov 30, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SparkQA commented Dec 2, 2020

Uh oh!

cloud-fan commented Dec 2, 2020

Uh oh!

SparkQA commented Dec 2, 2020

Uh oh!

cloud-fan commented Dec 2, 2020

Uh oh!

SparkQA commented Dec 2, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Ngone51 commented Nov 24, 2020 •

edited

Loading