fix keyless duplicate update #5514
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
|
Does this also fix #5433 ? |
|
Nice catch, it looks like this does address #5433 |
added 2 commits
March 8, 2023 13:02
max-hoffman
approved these changes
Mar 9, 2023
| @@ -160,7 +160,8 @@ func (k prollyKeylessWriter) uniqueKeyError(ctx context.Context, keyStr string, | |||
| vd := k.valBld.Desc | |||
| for from := range k.valMap { | |||
| to := k.valMap.MapOrdinal(from) | |||
| if existing[to], err = index.GetField(ctx, vd, from, value, k.mut.NodeStore()); err != nil { | |||
| // offset from index for keyless rows, as first field is the count | |||
| if existing[to], err = index.GetField(ctx, vd, from+1, value, k.mut.NodeStore()); err != nil { | |||
There was a problem hiding this comment.
it might be better for valMap to just have the right mappings, embed the cardinality offset so that other methods don't have to add 1 everywhere
There was a problem hiding this comment.
That was my initial approach, but I don't think the valMap or the tuple descriptors can tell if the first field is encoding the cardinality or a column of type uint64. Maybe it's worth modifying them? or changing MapOrdinal to take a keyless bool or something like that?
There was a problem hiding this comment.
something like this?
func ordinalMappingsFromSchema(from sql.Schema, to schema.Schema) (km, vm val.OrdinalMapping) {
keyless := schema.IsKeyless(to)
km = makeOrdinalMapping(from, to.GetPKCols(), keyless)
vm = makeOrdinalMapping(from, to.GetNonPKCols(), keyless)
return
}
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.
fix for: #5442 and #5433
tests: dolthub/go-mysql-server#1642