Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge. #6980

Merged
merged 39 commits into from
Nov 21, 2023
Merged

Correctly identify and report data conflicts when deleting rows and/or columns during a three-way merge. #6980

merged 39 commits into from
Nov 21, 2023

Commits on Oct 25, 2023

  1. Remove unused sqlSchema parameter.

    @nicktobey
    nicktobey committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8dafa27 View commit details
    Browse the repository at this point in the history

  2. Track database in system tables.

    @nicktobey
    nicktobey committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    b265266 View commit details
    Browse the repository at this point in the history

  3. Change expected error in ambiguous select.

    @nicktobey
    nicktobey committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    27cf02e View commit details
    Browse the repository at this point in the history

  4. Use database name for system tables and table functions.

    @nicktobey
    nicktobey committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    dc995c5 View commit details
    Browse the repository at this point in the history

  5. [ga-bump-dep] Bump dependency in Dolt by nicktobey

    @nicktobey
    nicktobey committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    0faf90c View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2023

  1. Fix comment formatting.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    134c635 View commit details
    Browse the repository at this point in the history

  2. Refactor test to make it more readable.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    92b5c25 View commit details
    Browse the repository at this point in the history

  3. Replace BATS test with engine test for joining tables from different … 

    …branches.
    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    91a5042 View commit details
    Browse the repository at this point in the history

  4. Add schema merge tests.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    0dfc815 View commit details
    Browse the repository at this point in the history

  5. Add additional schema and mapping information to valueMerger

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    cbc85d1 View commit details
    Browse the repository at this point in the history

  6. During three-way merge, attempt to automatically resolve conflicts wh… 

    …ere one row was deleted and the other was modified.
    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    0c838e6 View commit details
    Browse the repository at this point in the history

  7. 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.
    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    66eeeb5 View commit details
    Browse the repository at this point in the history

  8. Don't remap the left branch to the new schema prior to merging.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    94fdf2d View commit details
    Browse the repository at this point in the history

  9. Correctly update secondary indexes when the schema has changed.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    83b16bd View commit details
    Browse the repository at this point in the history

  10. Correctly update primary indexes when the schema has changed.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    0af121d View commit details
    Browse the repository at this point in the history

  11. Fix validators when the schema has changed.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    7fb001c View commit details
    Browse the repository at this point in the history

  12. Fix cell-wise merging when the schema has changed.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    926d610 View commit details
    Browse the repository at this point in the history

  13. 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.
    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    84a28b0 View commit details
    Browse the repository at this point in the history

  14. Add GetKeyColumnsDescriptor with flag for specifying whether to con… 

    …vert address columns to a type that can be used in a primary key.
    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    51de4f6 View commit details
    Browse the repository at this point in the history

  15. Drop secondary indexes when the table schema changed.

    @nicktobey
    nicktobey committed Nov 8, 2023
    Configuration menu
    Copy the full SHA
    919ddf8 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'main' into nicktobey/schemamerge

    @nicktobey
    nicktobey committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    9edbe39 View commit details
    Browse the repository at this point in the history

  2. Unskip previously skipped test cases.

    @nicktobey
    nicktobey committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    c6776f5 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2023

  1. Merge branch 'main' into nicktobey/schemamerge

    @nicktobey
    nicktobey committed Nov 13, 2023
    Configuration menu
    Copy the full SHA
    e16e46e View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2023

  1. Since we now support merging a deleted row with a deleted column, upd… 

    …ate these tests to include an actual merge conflict.
    @nicktobey
    nicktobey committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    02387aa View commit details
    Browse the repository at this point in the history

  2. Update correctness issues in cell merging exposed by existing tests, … 

    …and clarify that simultanious row and column deletes are no longer a conflict.
    @nicktobey
    nicktobey committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    0aa2736 View commit details
    Browse the repository at this point in the history

  3. Make new test object for each data test in schema merge.

    @nicktobey
    nicktobey committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    6070c5c View commit details
    Browse the repository at this point in the history

  4. Remove outdated row merge test.

    @nicktobey
    nicktobey committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    e53978d View commit details
    Browse the repository at this point in the history

  5. Update schema merge test.

    @nicktobey
    nicktobey committed Nov 14, 2023
    Configuration menu
    Copy the full SHA
    1b902e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. 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.
    @nicktobey
    nicktobey committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    efff37b View commit details
    Browse the repository at this point in the history

  2. Update processBaseColumn to account for the fact that we no longer … 

    …preemptively migrate the left side of the merge.
    @nicktobey
    nicktobey committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    32fd66d View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. During three-way merging, avoid touching the primary index for every … 

    …left-side row unless we actually need to (because the schema changed.)
    @nicktobey
    nicktobey committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    445ba96 View commit details
    Browse the repository at this point in the history

  2. Cleanup comments in merge_prolly_rows.go

    @nicktobey
    nicktobey committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    95b80fd View commit details
    Browse the repository at this point in the history

  3. Fix copy-paste error in processBaseColumns 

    Regression test is not included because it led to discovery of #7014
    @nicktobey
    nicktobey committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    85525e5 View commit details
    Browse the repository at this point in the history

  4. Remove unused code and add comments.

    @nicktobey
    nicktobey committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    52ce8d2 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Refactor test harness to make clear why we're copying the test object.

    @nicktobey
    nicktobey committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    c278833 View commit details
    Browse the repository at this point in the history

  2. Rename GetKeyColumnsDescriptor to GetKeyDescriptorWithNoConversion

    @nicktobey
    nicktobey committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    560dfc0 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Don't run check validator on resolved deleted rows: it's not needed a… 

    …nd won't work.
    @nicktobey
    nicktobey committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    89f89a0 View commit details
    Browse the repository at this point in the history

  2. Add comments explaining why we have to handle left-only diffs during … 

    …three-way merge.
    @nicktobey
    nicktobey committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    8cf2982 View commit details
    Browse the repository at this point in the history

  3. Update docstring for mergeProllyTableData

    @nicktobey
    nicktobey committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    6527d9d View commit details
    Browse the repository at this point in the history