[Spark] Execute MERGE using Dataframe API in Scala #3456
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/SchemaValidationSuite.scala
Outdated
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/SchemaValidationSuite.scala
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/SchemaValidationSuite.scala
Show resolved
Hide resolved
|
It is necessary to add some tests that check that Merge is actually captured by the |
johanl-db
commented
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/SchemaValidationSuite.scala
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/MergeIntoSuiteBase.scala
Outdated
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/MergeIntoSuiteBase.scala
Outdated
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/MergeIntoSuiteBase.scala
Outdated
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/MergeIntoSuiteBase.scala
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
spark/src/test/scala/org/apache/spark/sql/delta/MergeIntoSuiteBase.scala
Show resolved
Hide resolved
longvu-db
reviewed
Aug 1, 2024
| withKeyValueData( | ||
| source = (0, 0) :: (1, 10) :: Nil, | ||
| target = (1, 1) :: (2, 2) :: Nil) { case (sourceName, targetName) => | ||
| val plans = withLogicalPlansCaptured(spark, optimizedPlan = false) { |
There was a problem hiding this comment.
Is it necessary to test for the case optimizedPlan = true also?
There was a problem hiding this comment.
No, that doesn't bring much, the optimizer has no impact on MergeIntoCommand
|
the build for spark-master failed for unrelated reason. so merging this. |
5 tasks
vkorukanti
pushed a commit
to vkorukanti/delta
that referenced
this pull request
Aug 20, 2024
(cherrypick of delta-io#3456) Due to Spark unfortunate behavior of resolving plan nodes it doesn't know, the `DeltaMergeInto` plan created when using the MERGE scala API needs to be manually resolved to ensure spark doesn't interfere with its analysis. This currently completely bypasses Spark's analysis as we then manually execute the MERGE command which has negatiev effects, e.g. the execution is not visible in QueryExecutionListener. This change addresses this issue, by executing the plan using the Dataframe API after it's manually resolved so that the command goes through the regular code path. Resolves delta-io#1521 Covered by existing tests.
vkorukanti
added a commit
that referenced
this pull request
Aug 20, 2024
(cherrypick of #3456) Due to Spark unfortunate behavior of resolving plan nodes it doesn't know, the `DeltaMergeInto` plan created when using the MERGE scala API needs to be manually resolved to ensure spark doesn't interfere with its analysis. This currently completely bypasses Spark's analysis as we then manually execute the MERGE command which has negatiev effects, e.g. the execution is not visible in QueryExecutionListener. This change addresses this issue, by executing the plan using the Dataframe API after it's manually resolved so that the command goes through the regular code path. Resolves #1521 Covered by existing tests. Co-authored-by: Johan Lasperas <johan.lasperas@databricks.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Due to Spark unfortunate behavior of resolving plan nodes it doesn't know, the
DeltaMergeIntoplan created when using the MERGE scala API needs to be manually resolved to ensure spark doesn't interfere with its analysis.This currently completely bypasses Spark's analysis as we then manually execute the MERGE command which has negatiev effects, e.g. the execution is not visible in QueryExecutionListener.
This change addresses this issue, by executing the plan using the Dataframe API after it's manually resolved so that the command goes through the regular code path.
Resolves #1521
How was this patch tested?
Covered by existing tests.