storage: use block-property filters for MVCC range tomstone masking

Use block-property filters to aid in skipping keys that are deleted by a
MVCC range tombstone.

Release note: None

pkg/storage/pebble.go

@@ -468,6 +468,27 @@ func (tc *pebbleDataBlockMVCCTimeIntervalCollector) UpdateKeySuffixes(
 
 const mvccWallTimeIntervalCollector = "MVCCTimeInterval"
 
+var _ pebble.BlockPropertyFilterMask = (*mvccWallTimeIntervalRangeKeyMask)(nil)
+
+type mvccWallTimeIntervalRangeKeyMask struct {
+	sstable.BlockIntervalFilter
+}
+
+// SetSuffix implements the pebble.BlockPropertyFilterMask interface.
+func (m *mvccWallTimeIntervalRangeKeyMask) SetSuffix(suffix []byte) error {
+	if len(suffix) == 0 {
+		// This is currently impossible, because the only range key Cockroach
+		// writes today is the MVCC Delete Range that's always suffixed.
+		return nil
+	}
+	ts, err := DecodeMVCCTimestampSuffix(suffix)
+	if err != nil {
+		return err
+	}
+	m.BlockIntervalFilter.SetInterval(uint64(ts.WallTime), math.MaxUint64)
+	return nil
+}
+
 // PebbleBlockPropertyCollectors is the list of functions to construct
 // BlockPropertyCollectors.
 var PebbleBlockPropertyCollectors = []func() pebble.BlockPropertyCollector{

pkg/storage/pebble_iterator.go

@@ -40,6 +40,8 @@ type pebbleIterator struct {
 	lowerBoundBuf      []byte
 	upperBoundBuf      []byte
 	rangeKeyMaskingBuf []byte
+	// Filter to use if masking is enabled.
+	maskFilter mvccWallTimeIntervalRangeKeyMask
 
 	// True if the iterator's underlying reader supports range keys.
 	//
@@ -223,6 +225,8 @@ func (p *pebbleIterator) setOptions(opts IterOptions, durability DurabilityRequi
 		p.rangeKeyMaskingBuf = encodeMVCCTimestampSuffixToBuf(
 			p.rangeKeyMaskingBuf, opts.RangeKeyMaskingBelow)
 		p.options.RangeKeyMasking.Suffix = p.rangeKeyMaskingBuf
+		p.maskFilter.BlockIntervalFilter.Init(mvccWallTimeIntervalCollector, 0, math.MaxUint64)
+		p.options.RangeKeyMasking.Filter = &p.maskFilter
 	}
 
 	if opts.MaxTimestampHint.IsSet() {