print: print LockTableKey

Epic: none
Release note: none

Author: pav-kv

pkg/kv/kvserver/print/BUILD.bazel

@@ -30,6 +30,7 @@ go_test(
     srcs = ["debug_print_test.go"],
     embed = [":print"],
     deps = [
+        "//pkg/kv/kvserver/concurrency/lock",
         "//pkg/kv/kvserver/kvserverpb",
         "//pkg/roachpb",
         "//pkg/storage",
@@ -38,6 +39,7 @@ go_test(
         "//pkg/util/hlc",
         "//pkg/util/leaktest",
         "//pkg/util/log",
+        "//pkg/util/uuid",
         "@com_github_cockroachdb_pebble//:pebble",
         "@com_github_stretchr_testify//require",
     ],

pkg/kv/kvserver/print/debug_print.go

@@ -97,15 +97,12 @@ func SprintEngineKeyValue(k storage.EngineKey, v []byte) string {
 		if key, err := k.ToMVCCKey(); err == nil {
 			return SprintMVCCKeyValue(storage.MVCCKeyValue{Key: key, Value: v}, true /* printKey */)
 		}
+	} else if k.IsLockTableKey() {
+		if key, err := k.ToLockTableKey(); err == nil {
+			return fmt.Sprintf("%s: %s", key, SprintIntent(v))
+		}
 	}
-	var sb strings.Builder
-	fmt.Fprintf(&sb, "%s %x (%#x): ", k.Key, k.Version, k.Encode())
-	if out, err := tryIntent(storage.MVCCKeyValue{Value: v}); err == nil {
-		sb.WriteString(out)
-	} else {
-		fmt.Fprintf(&sb, "%x", v)
-	}
-	return sb.String()
+	return fmt.Sprintf("%s %x (%#x): %x", k.Key, k.Version, k.Encode(), v)
 }
 
 // SprintEngineRangeKeyValue is like PrintEngineRangeKeyValue, but returns a

pkg/kv/kvserver/print/debug_print_test.go

@@ -10,6 +10,7 @@ import (
 	"math"
 	"testing"
 
+	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/concurrency/lock"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvserverpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/storage"
@@ -18,6 +19,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
+	"github.com/cockroachdb/cockroach/pkg/util/uuid"
 	"github.com/cockroachdb/pebble"
 	"github.com/stretchr/testify/require"
 )
@@ -38,10 +40,19 @@ func TestStringifyWriteBatch(t *testing.T) {
 		Key:       roachpb.Key("/db1"),
 		Timestamp: hlc.Timestamp{WallTime: math.MaxInt64},
 	}), []byte("test value"), nil /* WriteOptions */))
+
+	ltKey, _ := storage.LockTableKey{
+		Key: roachpb.Key("/key"), Strength: lock.Intent, TxnUUID: uuid.UUID{},
+	}.ToEngineKey(nil)
+	require.NoError(t, batch.Set(ltKey.Encode(), []byte("intent"), nil))
+
 	wb.Data = batch.Repr()
 	s, err = DecodeWriteBatch(wb.Data)
 	require.NoError(t, err)
-	require.Equal(t, "Put: 9223372036.854775807,0 \"/db1\" (0x2f646231007fffffffffffffff09): \"test value\"\n", s)
+	require.Equal(t,
+		`Put: 9223372036.854775807,0 "/db1" (0x2f646231007fffffffffffffff09): "test value"
+Put: "/key"/Intent/00000000-0000-0000-0000-000000000000: 696e74656e74
+`, s)
 
 	batch = pebble.Batch{}
 	encodedKey, err := hex.DecodeString("017a6b12c089f704918df70bee8800010003623a9318c0384d07a6f22b858594df6012")

pkg/storage/engine_key.go

@@ -264,6 +264,11 @@ type LockTableKey struct {
 	TxnUUID  uuid.UUID
 }
 
+// Format implements the fmt.Formatter interface.
+func (lk LockTableKey) Format(f fmt.State, _ rune) {
+	fmt.Fprintf(f, "%s/%s/%s", lk.Key, lk.Strength, lk.TxnUUID)
+}
+
 // replicatedLockStrengthToByte is a mapping between lock.Strength and the
 // strength byte persisted in a lock table key's encoding. See
 // LockTableKey.ToEngineKey().