Upgrade versions of vendored libs
This commit is contained in:
22
vendor/github.com/cockroachdb/pebble/internal/manifest/version_edit.go
generated
vendored
22
vendor/github.com/cockroachdb/pebble/internal/manifest/version_edit.go
generated
vendored
@@ -648,6 +648,11 @@ func (b *BulkVersionEdit) Apply(
|
||||
} else {
|
||||
v.Levels[level] = curr.Levels[level].clone()
|
||||
}
|
||||
if curr == nil || curr.RangeKeyLevels[level].tree.root == nil {
|
||||
v.RangeKeyLevels[level] = makeLevelMetadata(cmp, level, nil /* files */)
|
||||
} else {
|
||||
v.RangeKeyLevels[level] = curr.RangeKeyLevels[level].clone()
|
||||
}
|
||||
|
||||
if len(b.Added[level]) == 0 && len(b.Deleted[level]) == 0 {
|
||||
// There are no edits on this level.
|
||||
@@ -667,6 +672,7 @@ func (b *BulkVersionEdit) Apply(
|
||||
|
||||
// Some edits on this level.
|
||||
lm := &v.Levels[level]
|
||||
lmRange := &v.RangeKeyLevels[level]
|
||||
addedFiles := b.Added[level]
|
||||
deletedMap := b.Deleted[level]
|
||||
if n := v.Levels[level].Len() + len(addedFiles); n == 0 {
|
||||
@@ -688,6 +694,16 @@ func (b *BulkVersionEdit) Apply(
|
||||
err := errors.Errorf("pebble: internal error: file L%d.%s obsolete during B-Tree removal", level, f.FileNum)
|
||||
return nil, nil, err
|
||||
}
|
||||
if f.HasRangeKeys {
|
||||
if obsolete := v.RangeKeyLevels[level].tree.delete(f); obsolete {
|
||||
// Deleting a file from the B-Tree may decrement its
|
||||
// reference count. However, because we cloned the
|
||||
// previous level's B-Tree, this should never result in a
|
||||
// file's reference count dropping to zero.
|
||||
err := errors.Errorf("pebble: internal error: file L%d.%s obsolete during range-key B-Tree removal", level, f.FileNum)
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var sm, la *FileMetadata
|
||||
@@ -714,6 +730,12 @@ func (b *BulkVersionEdit) Apply(
|
||||
if err != nil {
|
||||
return nil, nil, errors.Wrap(err, "pebble")
|
||||
}
|
||||
if f.HasRangeKeys {
|
||||
err = lmRange.tree.insert(f)
|
||||
if err != nil {
|
||||
return nil, nil, errors.Wrap(err, "pebble")
|
||||
}
|
||||
}
|
||||
removeZombie(f.FileNum)
|
||||
// Track the keys with the smallest and largest keys, so that we can
|
||||
// check consistency of the modified span.
|
||||
|
||||
Reference in New Issue
Block a user