[Spark] Batch resolve DeltaMergeAction in ResolveMergeInto #3366
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
c27kwan
changed the title
c27kwan
commented
Jul 16, 2024
| @@ -502,7 +502,7 @@ trait MergeIntoSchemaEvolutionBaseTests { | |||
| testEvolution(s"case-sensitive insert")( | |||
| targetData = Seq((0, 0), (1, 10), (3, 30)).toDF("key", "value"), | |||
| sourceData = Seq((1, 1), (2, 2)).toDF("key", "VALUE"), | |||
| clauses = insert("(key, value, VALUE) VALUES (s.key, s.value, s.VALUE)") :: Nil, | |||
| clauses = insert("(key, value) VALUES (s.key, s.value)") :: Nil, | |||
There was a problem hiding this comment.
There were two different possible errors here. It can throw a different message dependent on whether we batch. I removed the ambiguity so that the error is always the same.
There was a problem hiding this comment.
I've added a TODO for the other test, since it's an unrelated new test and we didn't have coverage for it before.
|
I got rid of the memoization because batching will make memoization at that level obsolete. The opportunity for memoization within merge at that level is probably not very useful. We don't resolve the same expression multiple times against the same plans, unless we have many different conditional when matched/when not matched clauses. |
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.
Which Delta project/connector is this regarding?
Description
In this PR, we batch resolve
DeltaMergeActionsinResolveMergeIntoto avoid redundant invocations of the analyzer.For example, if we have the clause
Previously, we would call
resolveSingleExprOrFailwhich invokes the analyzer 4 times: 1 call to resolvec1, 1 call to resolvesrc.c1, 1 call to resolvec2, and 1 call to resolve22.With this PR, we batch the resolution of the target column name parts (
[c1, c2]) against the target relation and the resolution of assignment expression ([src.c1, 22]) together. We can resolve a Merge clause with 2 calls using batching. This helps us with the analyzer performance on wide tables.How was this patch tested?
Existing tests pass.
Does this PR introduce any user-facing changes?
No.