-
-
Notifications
You must be signed in to change notification settings - Fork 507
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.
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
Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge. #6980
Commits on Oct 25, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 8dafa27 - Browse repository at this point
Copy the full SHA 8dafa27View commit details -
Configuration menu - View commit details
-
Copy full SHA for b265266 - Browse repository at this point
Copy the full SHA b265266View commit details -
Configuration menu - View commit details
-
Copy full SHA for 27cf02e - Browse repository at this point
Copy the full SHA 27cf02eView commit details -
Configuration menu - View commit details
-
Copy full SHA for dc995c5 - Browse repository at this point
Copy the full SHA dc995c5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0faf90c - Browse repository at this point
Copy the full SHA 0faf90cView commit details
Commits on Nov 8, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 134c635 - Browse repository at this point
Copy the full SHA 134c635View commit details -
Configuration menu - View commit details
-
Copy full SHA for 92b5c25 - Browse repository at this point
Copy the full SHA 92b5c25View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91a5042 - Browse repository at this point
Copy the full SHA 91a5042View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0dfc815 - Browse repository at this point
Copy the full SHA 0dfc815View commit details -
Configuration menu - View commit details
-
Copy full SHA for cbc85d1 - Browse repository at this point
Copy the full SHA cbc85d1View commit details -
During three-way merge, attempt to automatically resolve conflicts wh…
…ere one row was deleted and the other was modified.
Configuration menu - View commit details
-
Copy full SHA for 0c838e6 - Browse repository at this point
Copy the full SHA 0c838e6View commit details -
During three-way merge, process merges even in columns that were remo…
…ved from the result. That way we can still detect conflicts in those columns.
Configuration menu - View commit details
-
Copy full SHA for 66eeeb5 - Browse repository at this point
Copy the full SHA 66eeeb5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 94fdf2d - Browse repository at this point
Copy the full SHA 94fdf2dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 83b16bd - Browse repository at this point
Copy the full SHA 83b16bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0af121d - Browse repository at this point
Copy the full SHA 0af121dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7fb001c - Browse repository at this point
Copy the full SHA 7fb001cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 926d610 - Browse repository at this point
Copy the full SHA 926d610View commit details -
Report null constraint violations when processing left diffs during t…
…hree way merge. This ensures we don't try to compute a merged row that would violate constraints in the final schema.
Configuration menu - View commit details
-
Copy full SHA for 84a28b0 - Browse repository at this point
Copy the full SHA 84a28b0View commit details -
Add
GetKeyColumnsDescriptor
with flag for specifying whether to con……vert address columns to a type that can be used in a primary key.
Configuration menu - View commit details
-
Copy full SHA for 51de4f6 - Browse repository at this point
Copy the full SHA 51de4f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 919ddf8 - Browse repository at this point
Copy the full SHA 919ddf8View commit details
Commits on Nov 9, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 9edbe39 - Browse repository at this point
Copy the full SHA 9edbe39View commit details -
Configuration menu - View commit details
-
Copy full SHA for c6776f5 - Browse repository at this point
Copy the full SHA c6776f5View commit details
Commits on Nov 13, 2023
-
Configuration menu - View commit details
-
Copy full SHA for e16e46e - Browse repository at this point
Copy the full SHA e16e46eView commit details
Commits on Nov 14, 2023
-
Since we now support merging a deleted row with a deleted column, upd…
…ate these tests to include an actual merge conflict.
Configuration menu - View commit details
-
Copy full SHA for 02387aa - Browse repository at this point
Copy the full SHA 02387aaView commit details -
Update correctness issues in cell merging exposed by existing tests, …
…and clarify that simultanious row and column deletes are no longer a conflict.
Configuration menu - View commit details
-
Copy full SHA for 0aa2736 - Browse repository at this point
Copy the full SHA 0aa2736View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6070c5c - Browse repository at this point
Copy the full SHA 6070c5cView commit details -
Configuration menu - View commit details
-
Copy full SHA for e53978d - Browse repository at this point
Copy the full SHA e53978dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b902e8 - Browse repository at this point
Copy the full SHA 1b902e8View commit details
Commits on Nov 15, 2023
-
Update bats tests. These tests test handling data conflicts, but the …
…behavior that was in the test (row deletion + column deletion) is no longer a conflict. This commit changes the behavior to something else that is a conflict.
Configuration menu - View commit details
-
Copy full SHA for efff37b - Browse repository at this point
Copy the full SHA efff37bView commit details -
Update
processBaseColumn
to account for the fact that we no longer ……preemptively migrate the left side of the merge.
Configuration menu - View commit details
-
Copy full SHA for 32fd66d - Browse repository at this point
Copy the full SHA 32fd66dView commit details
Commits on Nov 16, 2023
-
During three-way merging, avoid touching the primary index for every …
…left-side row unless we actually need to (because the schema changed.)
Configuration menu - View commit details
-
Copy full SHA for 445ba96 - Browse repository at this point
Copy the full SHA 445ba96View commit details -
Configuration menu - View commit details
-
Copy full SHA for 95b80fd - Browse repository at this point
Copy the full SHA 95b80fdView commit details -
Fix copy-paste error in
processBaseColumns
Regression test is not included because it led to discovery of #7014
Configuration menu - View commit details
-
Copy full SHA for 85525e5 - Browse repository at this point
Copy the full SHA 85525e5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 52ce8d2 - Browse repository at this point
Copy the full SHA 52ce8d2View commit details
Commits on Nov 20, 2023
-
Configuration menu - View commit details
-
Copy full SHA for c278833 - Browse repository at this point
Copy the full SHA c278833View commit details -
Configuration menu - View commit details
-
Copy full SHA for 560dfc0 - Browse repository at this point
Copy the full SHA 560dfc0View commit details
Commits on Nov 21, 2023
-
Configuration menu - View commit details
-
Copy full SHA for 89f89a0 - Browse repository at this point
Copy the full SHA 89f89a0View commit details -
Add comments explaining why we have to handle left-only diffs during …
…three-way merge.
Configuration menu - View commit details
-
Copy full SHA for 8cf2982 - Browse repository at this point
Copy the full SHA 8cf2982View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6527d9d - Browse repository at this point
Copy the full SHA 6527d9dView commit details