storageutils: use engine keys in ReportSSTEntries

STTs can contain keys other than MVCCKey, such as lock table keys.

Epic: none
Release note: none

Author: pav-kv

pkg/testutils/storageutils/BUILD.bazel

@@ -16,6 +16,7 @@ go_library(
         "//pkg/keys",
         "//pkg/kv/kvpb",
         "//pkg/kv/kvserver/kvserverbase",
+        "//pkg/kv/kvserver/print",
         "//pkg/roachpb",
         "//pkg/settings/cluster",
         "//pkg/storage",
@@ -25,6 +26,7 @@ go_library(
         "//pkg/util/protoutil",
         "//pkg/util/syncutil",
         "//pkg/util/syncutil/singleflight",
+        "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_pebble//:pebble",
         "@com_github_cockroachdb_pebble//sstable",
         "@com_github_cockroachdb_pebble//sstable/block",

pkg/testutils/storageutils/sst.go

@@ -11,12 +11,14 @@ import (
 	"testing"
 
 	"github.com/cockroachdb/cockroach/pkg/keys"
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/print"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
 	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/storage/enginepb"
 	"github.com/cockroachdb/cockroach/pkg/storage/mvccencoding"
 	"github.com/cockroachdb/cockroach/pkg/util/protoutil"
+	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/pebble"
 	"github.com/cockroachdb/pebble/sstable"
 	"github.com/cockroachdb/pebble/sstable/block"
@@ -150,9 +152,9 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
 		if err := iter.Error(); err != nil {
 			return err
 		}
-		key, err := storage.DecodeMVCCKey(kv.K.UserKey)
-		if err != nil {
-			return err
+		key, ok := storage.DecodeEngineKey(kv.K.UserKey)
+		if !ok {
+			return errors.Errorf("invalid engine key: %x", kv.K.UserKey)
 		}
 		v, _, err := kv.Value(nil)
 		if err != nil {
@@ -162,7 +164,20 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
 		if err != nil {
 			return err
 		}
-		buf.Printf("%s: %s -> %s\n", strings.ToLower(kv.Kind().String()), key, value)
+		if !key.IsMVCCKey() {
+			buf.Printf("%s: %s -> %s\n", strings.ToLower(kv.Kind().String()), key, value)
+			continue
+		}
+		mk, err := key.ToMVCCKey()
+		if err != nil {
+			return err
+		}
+		if mk.IsValue() {
+			buf.Printf("%s: %s -> %s\n", strings.ToLower(kv.Kind().String()), mk, value)
+		} else {
+			buf.Printf("%s: %s -> %s\n", strings.ToLower(kv.Kind().String()), mk,
+				print.SprintMVCCKeyValue(storage.MVCCKeyValue{Key: mk, Value: v}, false /* printKey */))
+		}
 	}
 
 	// Dump rangedels.
@@ -172,13 +187,13 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
 		defer rdIter.Close()
 		s, err := rdIter.First()
 		for ; s != nil; s, err = rdIter.Next() {
-			start, err := storage.DecodeMVCCKey(s.Start)
-			if err != nil {
-				return err
+			start, ok := storage.DecodeEngineKey(s.Start)
+			if !ok {
+				return errors.Errorf("invalid engine key: %x", s.Start)
 			}
-			end, err := storage.DecodeMVCCKey(s.End)
-			if err != nil {
-				return err
+			end, ok := storage.DecodeEngineKey(s.End)
+			if !ok {
+				return errors.Errorf("invalid engine key: %x", s.End)
 			}
 			for _, k := range s.Keys {
 				buf.Printf("%s: %s\n", strings.ToLower(k.Kind().String()),
@@ -197,13 +212,13 @@ func ReportSSTEntries(buf *redact.StringBuilder, name string, sst []byte) error
 		defer rkIter.Close()
 		s, err := rkIter.First()
 		for ; s != nil; s, err = rkIter.Next() {
-			start, err := storage.DecodeMVCCKey(s.Start)
-			if err != nil {
-				return err
+			start, ok := storage.DecodeEngineKey(s.Start)
+			if !ok {
+				return errors.Errorf("invalid engine key: %x", s.Start)
 			}
-			end, err := storage.DecodeMVCCKey(s.End)
-			if err != nil {
-				return err
+			end, ok := storage.DecodeEngineKey(s.End)
+			if !ok {
+				return errors.Errorf("invalid engine key: %x", s.End)
 			}
 			for _, k := range s.Keys {
 				buf.Printf("%s: %s", strings.ToLower(k.Kind().String()),