Add ordinal to merge schema after merge #2662
Merged
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
max-hoffman
reviewed
Jan 24, 2022
| @@ -118,6 +118,12 @@ func SchemaMerge(ourSch, theirSch, ancSch schema.Schema, tblName string) (sch sc | |||
| if err != nil { | |||
| return nil, sc, err | |||
| } | |||
|
|
|||
| err = sch.SetPkOrdinals(ourSch.GetPkOrdinals()) | |||
There was a problem hiding this comment.
what if the three schemas have different pk ordinals? how to tell which one to keep?
There was a problem hiding this comment.
I believe we do not support merge between tables with competing ordinals.
VinaiRachakonda
changed the title
VinaiRachakonda
changed the title
max-hoffman
approved these changes
Jan 24, 2022
| Expected: []sql.Row{{1, 1, 1}, {2, 3, 2}, {2, 5, 2}}, | ||
| }, | ||
| { | ||
| Query: "/* client b */ insert into test values (4,3,2)", |
There was a problem hiding this comment.
doesn't strike me as the most direct way to test the change, but if it mimics the original customer issue then it make sense
There was a problem hiding this comment.
Yeah without the change, this becomes an incorrect primary key issue and the ordering of the select changes. This indicates that primary key set has changed.
| @@ -118,6 +118,14 @@ func SchemaMerge(ourSch, theirSch, ancSch schema.Schema, tblName string) (sch sc | |||
| if err != nil { | |||
| return nil, sc, err | |||
| } | |||
|
|
|||
| // TODO: We should enforce the existing primary key set pk ordinals as out of order primary | |||
| // key ordinal merge is not supported yet. | |||
There was a problem hiding this comment.
"merge conflict should have blocked any ordinal change"?
max-hoffman
approved these changes
Jan 24, 2022
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.
Still need to add test cases here