cockroachkvs: add functions for MaximumSuffixProperty interface to cockroachkvs

Part of #2002
Previous #5256

Author: Sachuman

cockroachkvs/blockproperties.go

@@ -144,3 +144,32 @@ func mapSuffixToInterval(b []byte) (sstable.BlockInterval, error) {
 	}
 	return sstable.BlockInterval{}, nil
 }
+
+type MaxMVCCTimestampProperty struct{}
+
+// Name implements pebble.MaximumSuffixProperty interface.
+func (MaxMVCCTimestampProperty) Name() string {
+	return mvccWallTimeIntervalCollector
+}
+
+// Extract implements pebble.MaximumSuffixProperty interface.
+// It extracts the maximum MVCC timestamp from the encoded block property and
+// returns it as a CockroachDB-formatted suffix.
+func (MaxMVCCTimestampProperty) Extract(
+	dst []byte, encodedProperty []byte,
+) (suffix []byte, ok bool, err error) {
+	if len(encodedProperty) <= 1 {
+		return nil, false, nil
+	}
+	// First byte is shortID, skip it and decode interval from remainder.
+	interval, err := sstable.DecodeBlockInterval(encodedProperty[1:])
+	if err != nil {
+		return nil, false, err
+	} else if interval.IsEmpty() {
+		return nil, false, nil
+	}
+	dst = append(dst, make([]byte, suffixLenWithWall)...)
+	binary.BigEndian.PutUint64(dst[len(dst)-suffixLenWithWall:], interval.Upper)
+	dst[len(dst)-1] = suffixLenWithWall
+	return dst, true, nil
+}

sstable/block_property.go

@@ -313,7 +313,7 @@ func (b *BlockIntervalCollector) AddRangeKeys(span Span) error {
 func (b *BlockIntervalCollector) AddCollectedWithSuffixReplacement(
 	oldProp []byte, oldSuffix, newSuffix []byte,
 ) error {
-	i, err := decodeBlockInterval(oldProp)
+	i, err := DecodeBlockInterval(oldProp)
 	if err != nil {
 		return err
 	}
@@ -399,7 +399,7 @@ func encodeBlockInterval(i BlockInterval, buf []byte) []byte {
 	return append(buf, encoded[:n]...)
 }
 
-func decodeBlockInterval(buf []byte) (BlockInterval, error) {
+func DecodeBlockInterval(buf []byte) (BlockInterval, error) {
 	if len(buf) == 0 {
 		return BlockInterval{}, nil
 	}
@@ -479,7 +479,7 @@ func (b *BlockIntervalFilter) Name() string {
 
 // Intersects implements the BlockPropertyFilter interface.
 func (b *BlockIntervalFilter) Intersects(prop []byte) (bool, error) {
-	i, err := decodeBlockInterval(prop)
+	i, err := DecodeBlockInterval(prop)
 	if err != nil {
 		return false, err
 	}
@@ -491,7 +491,7 @@ func (b *BlockIntervalFilter) SyntheticSuffixIntersects(prop []byte, suffix []by
 	if b.suffixReplacer == nil {
 		return false, base.AssertionFailedf("missing SuffixReplacer for SyntheticSuffixIntersects()")
 	}
-	i, err := decodeBlockInterval(prop)
+	i, err := DecodeBlockInterval(prop)
 	if err != nil {
 		return false, err
 	}

sstable/block_property_test.go

@@ -88,7 +88,7 @@ func TestIntervalEncodeDecode(t *testing.T) {
 }
 
 func decodeAndCheck(t *testing.T, buf []byte, expected BlockInterval) {
-	i2, err := decodeBlockInterval(buf)
+	i2, err := DecodeBlockInterval(buf)
 	require.NoError(t, err)
 	require.Equal(t, expected, i2)
 }
@@ -239,7 +239,7 @@ func TestBlockIntervalCollector(t *testing.T) {
 	addTestRangeKeys(t, bic, 149)
 	encoded, err = bic.FinishDataBlock(nil)
 	require.NoError(t, err)
-	decoded, err := decodeBlockInterval(encoded)
+	decoded, err := DecodeBlockInterval(encoded)
 	require.NoError(t, err)
 	require.Equal(t, BlockInterval{20, 25}, decoded)
 	var encodedIndexBlock []byte
@@ -1114,7 +1114,7 @@ func (bl *boundLimitedWrapper) Name() string { return bl.inner.Name() }
 
 func (bl *boundLimitedWrapper) Intersects(prop []byte) (bool, error) {
 	propString := fmt.Sprintf("%x", prop)
-	i, err := decodeBlockInterval(prop)
+	i, err := DecodeBlockInterval(prop)
 	if err == nil {
 		// If it decodes as an interval, pretty print it as an interval.
 		propString = fmt.Sprintf("[%d, %d)", i.Lower, i.Upper)
@@ -1129,7 +1129,7 @@ func (bl *boundLimitedWrapper) Intersects(prop []byte) (bool, error) {
 
 func (bl *boundLimitedWrapper) SyntheticSuffixIntersects(prop []byte, suffix []byte) (bool, error) {
 	propString := fmt.Sprintf("%x", prop)
-	i, err := decodeBlockInterval(prop)
+	i, err := DecodeBlockInterval(prop)
 	if err == nil {
 		// If it decodes as an interval, pretty print it as an interval.
 		propString = fmt.Sprintf("[%d, %d)", i.Lower, i.Upper)
@@ -1205,7 +1205,7 @@ func runTablePropsCmd(r *Reader, td *datadriven.TestData) string {
 	var lines []string
 	for _, val := range r.UserProperties {
 		id := shortID(val[0])
-		i, err := decodeBlockInterval([]byte(val[1:]))
+		i, err := DecodeBlockInterval([]byte(val[1:]))
 		if err != nil {
 			return err.Error()
 		}
@@ -1306,7 +1306,7 @@ func runBlockPropsCmd(r *Reader) string {
 			if prop == nil {
 				continue
 			}
-			i, err := decodeBlockInterval(prop)
+			i, err := DecodeBlockInterval(prop)
 			if err != nil {
 				return err
 			}

sstable/block_property_test_utils.go

@@ -155,7 +155,7 @@ func (testprop MaxTestKeysSuffixProperty) Extract(
 		return nil, false, nil
 	}
 	// First byte is shortID, skip it and decode interval from remainder.
-	interval, err := decodeBlockInterval(encodedProperty[1:])
+	interval, err := DecodeBlockInterval(encodedProperty[1:])
 	if err != nil {
 		return nil, false, err
 	} else if interval.IsEmpty() {