Upgrade versions of vendored libs
This commit is contained in:
18
vendor/github.com/cockroachdb/pebble/iterator.go
generated
vendored
18
vendor/github.com/cockroachdb/pebble/iterator.go
generated
vendored
@@ -568,7 +568,10 @@ func (i *Iterator) findNextEntry(limit []byte) {
|
||||
i.iterValidityState = IterValid
|
||||
return
|
||||
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete:
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete, InternalKeyKindDeleteSized:
|
||||
// NB: treating InternalKeyKindSingleDelete as equivalent to DEL is not
|
||||
// only simpler, but is also necessary for correctness due to
|
||||
// InternalKeyKindSSTableInternalObsoleteBit.
|
||||
i.nextUserKey()
|
||||
continue
|
||||
|
||||
@@ -631,7 +634,10 @@ func (i *Iterator) nextPointCurrentUserKey() bool {
|
||||
i.err = base.CorruptionErrorf("pebble: unexpected range key set mid-user key")
|
||||
return false
|
||||
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete:
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete, InternalKeyKindDeleteSized:
|
||||
// NB: treating InternalKeyKindSingleDelete as equivalent to DEL is not
|
||||
// only simpler, but is also necessary for correctness due to
|
||||
// InternalKeyKindSSTableInternalObsoleteBit.
|
||||
return false
|
||||
|
||||
case InternalKeyKindSet, InternalKeyKindSetWithDelete:
|
||||
@@ -929,7 +935,7 @@ func (i *Iterator) findPrevEntry(limit []byte) {
|
||||
// return the key even if the MERGE point key is deleted.
|
||||
rangeKeyBoundary = true
|
||||
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete:
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete, InternalKeyKindDeleteSized:
|
||||
i.value = LazyValue{}
|
||||
i.iterValidityState = IterExhausted
|
||||
valueMerger = nil
|
||||
@@ -1092,9 +1098,13 @@ func (i *Iterator) mergeNext(key InternalKey, valueMerger ValueMerger) {
|
||||
return
|
||||
}
|
||||
switch key.Kind() {
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete:
|
||||
case InternalKeyKindDelete, InternalKeyKindSingleDelete, InternalKeyKindDeleteSized:
|
||||
// We've hit a deletion tombstone. Return everything up to this
|
||||
// point.
|
||||
//
|
||||
// NB: treating InternalKeyKindSingleDelete as equivalent to DEL is not
|
||||
// only simpler, but is also necessary for correctness due to
|
||||
// InternalKeyKindSSTableInternalObsoleteBit.
|
||||
return
|
||||
|
||||
case InternalKeyKindSet, InternalKeyKindSetWithDelete:
|
||||
|
||||
Reference in New Issue
Block a user