Skip to content

Commit

Permalink
storage: don't check uncertainty after passing failOnMoreRecent
Browse files Browse the repository at this point in the history
Fixes #119681.
Fixes #131005.

Epic: none
Release note: None
  • Loading branch information
tbg committed Sep 20, 2024
1 parent c6122f6 commit 6fae54e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/storage/pebble_mvcc_scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@ func (p *pebbleMVCCScanner) getOne(ctx context.Context) (ok, added bool) {
if len(p.mostRecentKey) == 0 {
p.mostRecentKey = append(p.mostRecentKey, p.curUnsafeKey.Key...)
}
// We don't have to fall through to `p.checkUncertainty` because FIXME.
return true /* ok */, false
}

Expand Down Expand Up @@ -1527,10 +1528,9 @@ func (p *pebbleMVCCScanner) processRangeKeys(seeked bool, reverse bool) bool {
}
}
}
}

// Check if any of the range keys are in the uncertainty interval.
if p.checkUncertainty {
// We don't have to fall through to `p.checkUncertainty` because FIXME.
} else if p.checkUncertainty {
// Check if any of the range keys are in the uncertainty interval.
for _, version := range p.curRangeKeys.Versions {
if version.Timestamp.LessEq(p.ts) {
break
Expand Down

0 comments on commit 6fae54e

Please sign in to comment.