mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-16 03:41:40 -05:00
Code Issues Packages Projects Releases 147 Wiki Activity

Skip empty diffs caused by non-canonicalized tuples.

Browse Source 
At one point, we started to trim null suffixes from tuples. In versions prior to this change,
tuples could have a null field at the end of the tuple. Now we always truncate the tuple.

If old versions insert rows with null values as the last column, it produces a tuple
that is longer than the tuple that would be inserted by the latest version. This leads to
empty diffs.
This commit is contained in:
Dhruv Sringari
2022-11-15 12:55:11 -08:00
parent f69f238908
commit d6a8cdeb57
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
go/store/prolly/tuple_map.go
View File

@@ -118,7 +118,7 @@ func MutateMapWithTupleIter(ctx context.Context, m Map, iter TupleIter) (Map, er
}
func DiffMaps(ctx context.Context, from, to Map, cb tree.DiffFn) error {
return tree.DiffOrderedTrees(ctx, from.tuples, to.tuples, cb)
return tree.DiffOrderedTrees(ctx, from.tuples, to.tuples, makeDiffCallBack(from, to, cb))
}
// RangeDiffMaps returns diffs within a Range. See Range for which diffs are
@@ -153,13 +153,15 @@ func RangeDiffMaps(ctx context.Context, from, to Map, rng Range, cb tree.DiffFn)
return err
}
dcb := makeDiffCallBack(from, to, cb)
for {
var diff tree.Diff
if diff, err = differ.Next(ctx); err != nil {
break
}
if err = cb(ctx, diff); err != nil {
if err = dcb(ctx, diff); err != nil {
break
}
}
@@ -170,7 +172,23 @@ func RangeDiffMaps(ctx context.Context, from, to Map, rng Range, cb tree.DiffFn)
// specified by |start| and |stop|. If |start| and/or |stop| is null, then the
// range is unbounded towards that end.
func DiffMapsKeyRange(ctx context.Context, from, to Map, start, stop val.Tuple, cb tree.DiffFn) error {
return tree.DiffKeyRangeOrderedTrees(ctx, from.tuples, to.tuples, start, stop, cb)
return tree.DiffKeyRangeOrderedTrees(ctx, from.tuples, to.tuples, start, stop, makeDiffCallBack(from, to, cb))
}
func makeDiffCallBack(from, to Map, innerCb tree.DiffFn) tree.DiffFn {
if !from.valDesc.Equals(to.valDesc) {
return innerCb
}
return func(ctx context.Context, diff tree.Diff) error {
// Skip diffs produced by non-canonical tuples. A canonical-tuple is a
// tuple where any null suffixes have been trimmed.
if diff.Type == tree.ModifiedDiff &&
from.valDesc.Compare(val.Tuple(diff.From), val.Tuple(diff.To)) == 0 {
return nil
}
return innerCb(ctx, diff)
}
}
func MergeMaps(ctx context.Context, left, right, base Map, cb tree.CollisionFn) (Map, tree.MergeStats, error) {