Skip to content

Commit ba7131f

Browse files
committed
print: fix GCHint pretty printer
Epic: none Release note: none
1 parent 3ec8561 commit ba7131f

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

pkg/kv/kvserver/print/debug_print.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,9 @@ func tryRangeIDKey(kv storage.MVCCKeyValue) (string, error) {
434434
case bytes.Equal(suffix, keys.LocalRaftTruncatedStateSuffix):
435435
msg = &kvserverpb.RaftTruncatedState{}
436436

437+
case bytes.Equal(suffix, keys.LocalRangeGCHintSuffix):
438+
msg = &roachpb.GCHint{}
439+
437440
case bytes.Equal(suffix, keys.LocalRangeLeaseSuffix):
438441
msg = &roachpb.Lease{}
439442

pkg/kv/kvserver/stateloader/initial_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"context"
1010
"path/filepath"
1111
"reflect"
12-
"strings"
1312
"testing"
1413

1514
"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
@@ -52,7 +51,6 @@ func TestWriteInitialRangeState(t *testing.T) {
5251

5352
str, err := print.DecodeWriteBatch(b.Repr())
5453
require.NoError(t, err)
55-
str = strings.ReplaceAll(str, "\n\n", "\n")
5654
echotest.Require(t, str, filepath.Join("testdata", t.Name()+".txt"))
5755
}
5856

pkg/kv/kvserver/stateloader/testdata/TestWriteInitialRangeState.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ echo
33
Put: 0,0 /Local/RangeID/5/u/RaftTruncatedState (0x01698d757266747400): index:10 term:5
44
Put: 0,0 /Local/RangeID/5/r/RangeLease (0x01698d72726c6c2d00): <empty>
55
Put: 0,0 /Local/RangeID/5/r/RangeGCThreshold (0x01698d726c67632d00): 0,0
6-
Put: 0,0 /Local/RangeID/5/r/RangeGCHint (0x01698d727267636800): meta={id=00000000 key=/Min iso=Serializable pri=0.00000000 epo=0 ts=0,0 min=0,0 seq=0} lock=false stat=PENDING rts=0,0 gul=0,0
6+
Put: 0,0 /Local/RangeID/5/r/RangeGCHint (0x01698d727267636800): latest_range_delete_timestamp:<> gc_timestamp:<> gc_timestamp_next:<>
77
Put: 0,0 /Local/RangeID/5/r/RangeVersion (0x01698d727276657200): 10.2
88
Put: 0,0 /Local/RangeID/5/r/RangeAppliedState (0x01698d727261736b00): raft_applied_index:10 lease_applied_index:10 range_stats:<sys_bytes:142 sys_count:4 > raft_closed_timestamp:<> raft_applied_index_term:5
99
Put: 0,0 /Local/RangeID/5/u/RaftHardState (0x01698d757266746800): term:5 vote:0 commit:10 lead:0 lead_epoch:0

0 commit comments

Comments
 (0)