-
-
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
Merged
Merged
Changes from all commits
Commits
Show all changes
39 commits
Select commit
Hold shift + click to select a range
8dafa27
Remove unused `sqlSchema` parameter.
nicktobey b265266
Track database in system tables.
nicktobey 27cf02e
Change expected error in ambiguous select.
nicktobey dc995c5
Use database name for system tables and table functions.
nicktobey 0faf90c
[ga-bump-dep] Bump dependency in Dolt by nicktobey
nicktobey 134c635
Fix comment formatting.
nicktobey 92b5c25
Refactor test to make it more readable.
nicktobey 91a5042
Replace BATS test with engine test for joining tables from different …
nicktobey 0dfc815
Add schema merge tests.
nicktobey cbc85d1
Add additional schema and mapping information to valueMerger
nicktobey 0c838e6
During three-way merge, attempt to automatically resolve conflicts wh…
nicktobey 66eeeb5
During three-way merge, process merges even in columns that were remo…
nicktobey 94fdf2d
Don't remap the left branch to the new schema prior to merging.
nicktobey 83b16bd
Correctly update secondary indexes when the schema has changed.
nicktobey 0af121d
Correctly update primary indexes when the schema has changed.
nicktobey 7fb001c
Fix validators when the schema has changed.
nicktobey 926d610
Fix cell-wise merging when the schema has changed.
nicktobey 84a28b0
Report null constraint violations when processing left diffs during t…
nicktobey 51de4f6
Add `GetKeyColumnsDescriptor` with flag for specifying whether to con…
nicktobey 919ddf8
Drop secondary indexes when the table schema changed.
nicktobey 9edbe39
Merge branch 'main' into nicktobey/schemamerge
nicktobey c6776f5
Unskip previously skipped test cases.
nicktobey e16e46e
Merge branch 'main' into nicktobey/schemamerge
nicktobey 02387aa
Since we now support merging a deleted row with a deleted column, upd…
nicktobey 0aa2736
Update correctness issues in cell merging exposed by existing tests, …
nicktobey 6070c5c
Make new test object for each data test in schema merge.
nicktobey e53978d
Remove outdated row merge test.
nicktobey 1b902e8
Update schema merge test.
nicktobey efff37b
Update bats tests. These tests test handling data conflicts, but the …
nicktobey 32fd66d
Update `processBaseColumn` to account for the fact that we no longer …
nicktobey 445ba96
During three-way merging, avoid touching the primary index for every …
nicktobey 95b80fd
Cleanup comments in merge_prolly_rows.go
nicktobey 85525e5
Fix copy-paste error in `processBaseColumns`
nicktobey 52ce8d2
Remove unused code and add comments.
nicktobey c278833
Refactor test harness to make clear why we're copying the test object.
nicktobey 560dfc0
Rename `GetKeyColumnsDescriptor` to `GetKeyDescriptorWithNoConversion`
nicktobey 89f89a0
Don't run check validator on resolved deleted rows: it's not needed a…
nicktobey 8cf2982
Add comments explaining why we have to handle left-only diffs during …
nicktobey 6527d9d
Update docstring for `mergeProllyTableData`
nicktobey File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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
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
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
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
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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not related to your changes... but...
JSON
is also an address type (as of very recently at least!). If it's possible to add that in cleanly here, that would be awesome, if you aren't comfortable rolling that into this PR, could you plz open an issue to track adding it here so we don't forget to update this?