Fix stream output when the same file occurs with different DVs in the same batch #1897
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
vkorukanti
reviewed
Jul 14, 2023
core/src/main/scala/org/apache/spark/sql/delta/sources/DeltaSource.scala
Outdated
Show resolved
Hide resolved
vkorukanti
approved these changes
Aug 22, 2023
vkorukanti
reviewed
Aug 22, 2023
| import org.apache.spark.sql.streaming.{StreamTest, Trigger} | ||
| import org.apache.spark.sql.streaming.util.StreamManualClock | ||
|
|
||
| trait DeltaSourceDeletionVectorTests extends StreamTest with DeletionVectorsTestUtils { |
There was a problem hiding this comment.
Also cherry-pick once the flaky test fix is in the master.
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.
Cherry-pick of d36623f for branch-2.4
Description
There was an edge case in streaming with deletion vectors in the source, where in
ignoreChanges-mode it could happen that if the same file occurred with different DVs in the same batch (or both with a DV and without a DV), then we would read the file with the wrong DV, since we broadcast the DVs to the scans by data file path.This PR fixes this issue, by reading files from different versions in different scans and then taking the union of the result to build the final
DataFramefor the batch.How was this patch tested?
Added new tests for having 2 DML commands (DELETE->DELETE and DELETE->INSERT) in the same batch for all change modi.
Does this PR introduce any user-facing changes?
No.