roachpb: move FullReplicaID type in

pav-kv · pav-kv · commit f17cf577363c · 2025-07-16T11:53:29.000+01:00
Define FullReplicaID next to RangeID and ReplicaID.

Epic: none
Release note: none
diff --git a/pkg/kv/kvserver/client_raft_log_queue_test.go b/pkg/kv/kvserver/client_raft_log_queue_test.go
@@ -26,7 +26,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/server"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
-	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/storage/fs"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/listenerutil"
@@ -263,7 +262,7 @@ func TestCrashWhileTruncatingSideloadedEntries(t *testing.T) {
 		propFilter := newAtomicFunc(func(kvserverbase.ProposalFilterArgs) *kvpb.Error {
 			return nil
 		})
-		applyThrottle := newAtomicFunc(func(storage.FullReplicaID) {})
+		applyThrottle := newAtomicFunc(func(roachpb.FullReplicaID) {})
 		postSideEffects := newAtomicFunc(func(args kvserverbase.ApplyFilterArgs) (int, *kvpb.Error) {
 			return 0, nil
 		})
@@ -293,7 +292,7 @@ func TestCrashWhileTruncatingSideloadedEntries(t *testing.T) {
 					Store: &kvserver.StoreTestingKnobs{
 						DisableRaftLogQueue:     true, // we send a log truncation manually
 						DisableSyncLogWriteToss: true, // always use async log writes
-						TestingAfterRaftLogSync: func(id storage.FullReplicaID) { applyThrottle.get()(id) },
+						TestingAfterRaftLogSync: func(id roachpb.FullReplicaID) { applyThrottle.get()(id) },
 						TestingProposalFilter: func(args kvserverbase.ProposalFilterArgs) *kvpb.Error {
 							return propFilter.get()(args)
 						},
@@ -347,7 +346,7 @@ func TestCrashWhileTruncatingSideloadedEntries(t *testing.T) {
 		// Before writing more commands, block the raft commands application flow on
 		// the follower replica.
 		unblockApply := make(chan struct{})
-		applyThrottle.set(func(id storage.FullReplicaID) {
+		applyThrottle.set(func(id roachpb.FullReplicaID) {
 			if id == follower.ID() {
 				applyThrottle.reset()
 				<-unblockApply
diff --git a/pkg/kv/kvserver/kvstorage/datadriven_test.go b/pkg/kv/kvserver/kvstorage/datadriven_test.go
@@ -60,7 +60,7 @@ func (e *env) close() {
 func (e *env) handleNewReplica(
 	t *testing.T,
 	ctx context.Context,
-	id storage.FullReplicaID,
+	id roachpb.FullReplicaID,
 	skipRaftReplicaID bool,
 	k, ek roachpb.RKey,
 ) *roachpb.RangeDescriptor {
@@ -154,7 +154,7 @@ func TestDataDriven(t *testing.T) {
 					d.ScanArgs(t, "skip-raft-replica-id", &skipRaftReplicaID)
 				}
 				if desc := e.handleNewReplica(t, ctx,
-					storage.FullReplicaID{RangeID: roachpb.RangeID(rangeID), ReplicaID: roachpb.ReplicaID(replicaID)},
+					roachpb.FullReplicaID{RangeID: roachpb.RangeID(rangeID), ReplicaID: roachpb.ReplicaID(replicaID)},
 					skipRaftReplicaID, keys.MustAddr(roachpb.Key(k)), keys.MustAddr(roachpb.Key(ek)),
 				); desc != nil {
 					fmt.Fprintln(&buf, desc)
diff --git a/pkg/kv/kvserver/kvstorage/init.go b/pkg/kv/kvserver/kvstorage/init.go
@@ -388,8 +388,8 @@ type Replica struct {
 }
 
 // ID returns the FullReplicaID.
-func (r Replica) ID() storage.FullReplicaID {
-	return storage.FullReplicaID{
+func (r Replica) ID() roachpb.FullReplicaID {
+	return roachpb.FullReplicaID{
 		RangeID:   r.RangeID,
 		ReplicaID: r.ReplicaID,
 	}
diff --git a/pkg/kv/kvserver/kvstorage/replica_state.go b/pkg/kv/kvserver/kvstorage/replica_state.go
@@ -71,8 +71,8 @@ func LoadReplicaState(
 	return ls, nil
 }
 
-func (r LoadedReplicaState) FullReplicaID() storage.FullReplicaID {
-	return storage.FullReplicaID{RangeID: r.ReplState.Desc.RangeID, ReplicaID: r.ReplicaID}
+func (r LoadedReplicaState) FullReplicaID() roachpb.FullReplicaID {
+	return roachpb.FullReplicaID{RangeID: r.ReplState.Desc.RangeID, ReplicaID: r.ReplicaID}
 }
 
 // check makes sure that the replica invariants hold for the loaded state.
@@ -120,7 +120,7 @@ const CreateUninitReplicaTODO = 0
 // Returns kvpb.RaftGroupDeletedError if this replica can not be created
 // because it has been deleted.
 func CreateUninitializedReplica(
-	ctx context.Context, eng storage.Engine, storeID roachpb.StoreID, id storage.FullReplicaID,
+	ctx context.Context, eng storage.Engine, storeID roachpb.StoreID, id roachpb.FullReplicaID,
 ) error {
 	sl := stateloader.Make(id.RangeID)
 	// Before creating the replica, see if there is a tombstone which would
diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go
@@ -1096,8 +1096,8 @@ func (r *Replica) ReplicaID() roachpb.ReplicaID {
 }
 
 // ID returns the FullReplicaID for the Replica.
-func (r *Replica) ID() storage.FullReplicaID {
-	return storage.FullReplicaID{RangeID: r.RangeID, ReplicaID: r.replicaID}
+func (r *Replica) ID() roachpb.FullReplicaID {
+	return roachpb.FullReplicaID{RangeID: r.RangeID, ReplicaID: r.replicaID}
 }
 
 // LogStorageRaftMuLocked returns the Replica's log storage.
diff --git a/pkg/kv/kvserver/replica_init.go b/pkg/kv/kvserver/replica_init.go
@@ -29,7 +29,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
 	"github.com/cockroachdb/cockroach/pkg/server/telemetry"
-	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/buildutil"
 	"github.com/cockroachdb/cockroach/pkg/util/envutil"
@@ -100,7 +99,7 @@ func newInitializedReplica(
 //
 // TODO(#94912): we actually have another initialization path which should be
 // refactored: Replica.initFromSnapshotLockedRaftMuLocked().
-func newUninitializedReplica(store *Store, id storage.FullReplicaID) (*Replica, error) {
+func newUninitializedReplica(store *Store, id roachpb.FullReplicaID) (*Replica, error) {
 	r := newUninitializedReplicaWithoutRaftGroup(store, id)
 	r.raftMu.Lock()
 	defer r.raftMu.Unlock()
@@ -117,7 +116,7 @@ func newUninitializedReplica(store *Store, id storage.FullReplicaID) (*Replica,
 // newUninitializedReplica() instead. This only exists for
 // newInitializedReplica() to avoid creating the Raft group twice (once when
 // creating the uninitialized replica, and once when initializing it).
-func newUninitializedReplicaWithoutRaftGroup(store *Store, id storage.FullReplicaID) *Replica {
+func newUninitializedReplicaWithoutRaftGroup(store *Store, id roachpb.FullReplicaID) *Replica {
 	uninitState := stateloader.UninitializedReplicaState(id.RangeID)
 	r := &Replica{
 		AmbientContext: store.cfg.AmbientCtx,
diff --git a/pkg/kv/kvserver/replica_raft.go b/pkg/kv/kvserver/replica_raft.go
@@ -2817,7 +2817,7 @@ func (r *Replica) acquireSplitLock(
 	ctx context.Context, split *roachpb.SplitTrigger,
 ) (func(), error) {
 	rightReplDesc, _ := split.RightDesc.GetReplicaDescriptor(r.StoreID())
-	rightRepl, _, err := r.store.getOrCreateReplica(ctx, storage.FullReplicaID{
+	rightRepl, _, err := r.store.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 		RangeID:   split.RightDesc.RangeID,
 		ReplicaID: rightReplDesc.ReplicaID,
 	}, nil /* creatingReplica */)
@@ -2853,7 +2853,7 @@ func (r *Replica) acquireMergeLock(
 	// complete, after which the replica will realize it has been destroyed and
 	// reject the snapshot.
 	rightReplDesc, _ := merge.RightDesc.GetReplicaDescriptor(r.StoreID())
-	rightRepl, _, err := r.store.getOrCreateReplica(ctx, storage.FullReplicaID{
+	rightRepl, _, err := r.store.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 		RangeID:   merge.RightDesc.RangeID,
 		ReplicaID: rightReplDesc.ReplicaID,
 	}, nil /* creatingReplica */)
diff --git a/pkg/kv/kvserver/snapshot_apply_prepare.go b/pkg/kv/kvserver/snapshot_apply_prepare.go
@@ -23,7 +23,7 @@ import (
 // snapWriteBuilder contains the data needed to prepare the on-disk state for a
 // snapshot.
 type snapWriteBuilder struct {
-	id storage.FullReplicaID
+	id roachpb.FullReplicaID
 
 	todoEng  storage.Engine
 	sl       stateloader.StateLoader
diff --git a/pkg/kv/kvserver/snapshot_apply_prepare_test.go b/pkg/kv/kvserver/snapshot_apply_prepare_test.go
@@ -69,7 +69,7 @@ func TestPrepareSnapApply(t *testing.T) {
 		}
 	}
 
-	id := storage.FullReplicaID{RangeID: 123, ReplicaID: 4}
+	id := roachpb.FullReplicaID{RangeID: 123, ReplicaID: 4}
 	descA := desc(101, "a", "b")
 	descB := desc(102, "b", "z")
 	createRangeData(t, eng, *descA)
diff --git a/pkg/kv/kvserver/store_create_replica.go b/pkg/kv/kvserver/store_create_replica.go
@@ -12,7 +12,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/kv/kvpb"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver/kvstorage"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
-	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
 	"github.com/cockroachdb/cockroach/pkg/util/retry"
 	"github.com/cockroachdb/errors"
@@ -52,7 +51,7 @@ var errRetry = errors.New("retry: orphaned replica")
 //
 // The caller must not hold the store's lock.
 func (s *Store) getOrCreateReplica(
-	ctx context.Context, id storage.FullReplicaID, creatingReplica *roachpb.ReplicaDescriptor,
+	ctx context.Context, id roachpb.FullReplicaID, creatingReplica *roachpb.ReplicaDescriptor,
 ) (_ *Replica, created bool, _ error) {
 	if id.ReplicaID == 0 {
 		log.Fatalf(ctx, "cannot construct a Replica for range %d with 0 id", id.RangeID)
@@ -85,7 +84,7 @@ func (s *Store) getOrCreateReplica(
 // removed. Returns errRetry error if the replica is in a transitional state and
 // its retrieval needs to be retried. Other errors are permanent.
 func (s *Store) tryGetReplica(
-	ctx context.Context, id storage.FullReplicaID, creatingReplica *roachpb.ReplicaDescriptor,
+	ctx context.Context, id roachpb.FullReplicaID, creatingReplica *roachpb.ReplicaDescriptor,
 ) (*Replica, error) {
 	repl, found := s.mu.replicasByRangeID.Load(id.RangeID)
 	if !found {
@@ -149,7 +148,7 @@ func (s *Store) tryGetReplica(
 // tryGetOrCreateReplica will likely succeed, hence the loop in
 // getOrCreateReplica.
 func (s *Store) tryGetOrCreateReplica(
-	ctx context.Context, id storage.FullReplicaID, creatingReplica *roachpb.ReplicaDescriptor,
+	ctx context.Context, id roachpb.FullReplicaID, creatingReplica *roachpb.ReplicaDescriptor,
 ) (_ *Replica, created bool, _ error) {
 	// The common case: look up an existing replica.
 	if repl, err := s.tryGetReplica(ctx, id, creatingReplica); err != nil {
diff --git a/pkg/kv/kvserver/store_raft.go b/pkg/kv/kvserver/store_raft.go
@@ -19,7 +19,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/raft/raftpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/rpc/rpcbase"
-	"github.com/cockroachdb/cockroach/pkg/storage"
 	"github.com/cockroachdb/cockroach/pkg/util/admission/admissionpb"
 	"github.com/cockroachdb/cockroach/pkg/util/grunning"
 	"github.com/cockroachdb/cockroach/pkg/util/log"
@@ -422,7 +421,7 @@ func (s *Store) withReplicaForRequest(
 	f func(context.Context, *Replica) *kvpb.Error,
 ) *kvpb.Error {
 	// Lazily create the replica.
-	r, _, err := s.getOrCreateReplica(ctx, storage.FullReplicaID{
+	r, _, err := s.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 		RangeID: req.RangeID, ReplicaID: req.ToReplica.ReplicaID,
 	}, &req.FromReplica)
 	if err != nil {
diff --git a/pkg/kv/kvserver/store_test.go b/pkg/kv/kvserver/store_test.go
@@ -897,7 +897,7 @@ func TestMarkReplicaInitialized(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	newID := storage.FullReplicaID{RangeID: 3, ReplicaID: 1}
+	newID := roachpb.FullReplicaID{RangeID: 3, ReplicaID: 1}
 	require.NoError(t, stateloader.Make(newID.RangeID).SetRaftReplicaID(
 		ctx, store.TODOEngine(), newID.ReplicaID))
 
@@ -2839,7 +2839,7 @@ func TestRaceOnTryGetOrCreateReplicas(t *testing.T) {
 		wg.Add(1)
 		go func(rid roachpb.ReplicaID) {
 			defer wg.Done()
-			if r, _, _ := s.getOrCreateReplica(ctx, storage.FullReplicaID{
+			if r, _, _ := s.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 				RangeID: 42, ReplicaID: rid,
 			}, &roachpb.ReplicaDescriptor{
 				NodeID:    2,
@@ -4092,7 +4092,7 @@ func TestManuallyEnqueueUninitializedReplica(t *testing.T) {
 	tc := testContext{}
 	tc.Start(ctx, t, stopper)
 
-	repl, _, _ := tc.store.getOrCreateReplica(ctx, storage.FullReplicaID{
+	repl, _, _ := tc.store.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 		RangeID: 42, ReplicaID: 7,
 	}, &roachpb.ReplicaDescriptor{
 		NodeID:    tc.store.NodeID(),
@@ -4118,7 +4118,7 @@ func TestStoreGetOrCreateReplicaWritesRaftReplicaID(t *testing.T) {
 	tc := testContext{}
 	tc.Start(ctx, t, stopper)
 
-	repl, created, err := tc.store.getOrCreateReplica(ctx, storage.FullReplicaID{
+	repl, created, err := tc.store.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 		RangeID: 42, ReplicaID: 7,
 	}, &roachpb.ReplicaDescriptor{
 		NodeID:    tc.store.NodeID(),
@@ -4184,7 +4184,7 @@ func TestSplitPreApplyInitializesTruncatedState(t *testing.T) {
 	rightDesc.InternalReplicas[0].ReplicaID++
 
 	// Create an uninitialized replica for the RHS. splitPreApply expects this.
-	_, _, err = store.getOrCreateReplica(ctx, storage.FullReplicaID{
+	_, _, err = store.getOrCreateReplica(ctx, roachpb.FullReplicaID{
 		RangeID:   rightDesc.RangeID,
 		ReplicaID: rightDesc.InternalReplicas[0].ReplicaID,
 	}, &rightDesc.InternalReplicas[0])
diff --git a/pkg/kv/kvserver/testing_knobs.go b/pkg/kv/kvserver/testing_knobs.go
@@ -89,7 +89,7 @@ type StoreTestingKnobs struct {
 	//
 	// TODO(pavelkalinnikov): have a more stable and less nuanced way of blocking
 	// the commands application flow for the entire store.
-	TestingAfterRaftLogSync func(storage.FullReplicaID)
+	TestingAfterRaftLogSync func(roachpb.FullReplicaID)
 
 	// TestingApplyCalledTwiceFilter is called before applying the results of a command on
 	// each replica assuming the command was cleared for application (i.e. no
diff --git a/pkg/roachpb/BUILD.bazel b/pkg/roachpb/BUILD.bazel
@@ -49,6 +49,7 @@ go_library(
         "@com_github_cockroachdb_apd_v3//:apd",
         "@com_github_cockroachdb_errors//:errors",
         "@com_github_cockroachdb_redact//:redact",
+        "@com_github_cockroachdb_redact//interfaces",
         "@com_github_golang_mock//gomock",  # keep
         "@org_golang_google_grpc//metadata",  # keep
     ],
diff --git a/pkg/roachpb/metadata.go b/pkg/roachpb/metadata.go
@@ -17,6 +17,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/util/humanizeutil"
 	"github.com/cockroachdb/errors"
 	"github.com/cockroachdb/redact"
+	"github.com/cockroachdb/redact/interfaces"
 )
 
 // NodeID is a custom type for a cockroach node ID. (not a raft node ID)
@@ -105,6 +106,25 @@ func (r ReplicaID) String() string {
 // SafeValue implements the redact.SafeValue interface.
 func (r ReplicaID) SafeValue() {}
 
+// FullReplicaID is a fully-qualified replica ID.
+type FullReplicaID struct {
+	// RangeID is the id of the range.
+	RangeID RangeID
+	// ReplicaID is the id of the replica.
+	ReplicaID ReplicaID
+}
+
+// SafeFormat implements redact.SafeFormatter. It prints as
+// r<rangeID>/<replicaID>.
+func (id FullReplicaID) SafeFormat(s interfaces.SafePrinter, _ rune) {
+	s.Printf("r%d/%d", id.RangeID, id.ReplicaID)
+}
+
+// String implements the fmt.Stringer interface.
+func (id FullReplicaID) String() string {
+	return redact.StringWithoutMarkers(id)
+}
+
 // Equals returns whether the Attributes lists are equivalent. Attributes lists
 // are treated as sets, meaning that ordering and duplicates are ignored.
 func (a Attributes) Equals(b Attributes) bool {
diff --git a/pkg/storage/BUILD.bazel b/pkg/storage/BUILD.bazel
@@ -108,7 +108,6 @@ go_library(
         "@com_github_cockroachdb_pebble//vfs",
         "@com_github_cockroachdb_pebble//wal",
         "@com_github_cockroachdb_redact//:redact",
-        "@com_github_cockroachdb_redact//interfaces",
         "@com_github_dustin_go_humanize//:go-humanize",
         "@com_github_elastic_gosigar//:gosigar",
         "@com_github_gogo_protobuf//proto",
diff --git a/pkg/storage/replicas_storage.go b/pkg/storage/replicas_storage.go
@@ -11,8 +11,6 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/raft/raftpb"
 	"github.com/cockroachdb/cockroach/pkg/roachpb"
 	"github.com/cockroachdb/cockroach/pkg/settings/cluster"
-	"github.com/cockroachdb/redact"
-	"github.com/cockroachdb/redact/interfaces"
 )
 
 // TODO(sumeer):
@@ -612,28 +610,9 @@ const (
 	DeletedReplica
 )
 
-// FullReplicaID is a fully-qualified replica ID.
-type FullReplicaID struct {
-	// RangeID is the id of the range.
-	RangeID roachpb.RangeID
-	// ReplicaID is the id of the replica.
-	ReplicaID roachpb.ReplicaID
-}
-
-// SafeFormat implements redact.SafeFormatter. It prints as
-// r<rangeID>/<replicaID>.
-func (id FullReplicaID) SafeFormat(s interfaces.SafePrinter, _ rune) {
-	s.Printf("r%d/%d", id.RangeID, id.ReplicaID)
-}
-
-// String formats a store for debug output.
-func (id FullReplicaID) String() string {
-	return redact.StringWithoutMarkers(id)
-}
-
 // ReplicaInfo provides the replica ID and state pair.
 type ReplicaInfo struct {
-	FullReplicaID
+	roachpb.FullReplicaID
 	// State of the replica.
 	State ReplicaState
 }
@@ -699,7 +678,7 @@ type RaftMutationBatch struct {
 // and so may not execute concurrently.
 type RangeStorage interface {
 	// FullReplicaID returns the FullReplicaID of this replica.
-	FullReplicaID() FullReplicaID
+	FullReplicaID() roachpb.FullReplicaID
 	// State returns the ReplicaState of this replica.
 	State() ReplicaState
 
@@ -851,7 +830,7 @@ type ReplicasStorage interface {
 	// to the caller to decide when to throw away a handle it may be holding
 	// (the handle is not really usable for doing anything once the range is
 	// deleted).
-	GetHandle(rr FullReplicaID) (RangeStorage, error)
+	GetHandle(rr roachpb.FullReplicaID) (RangeStorage, error)
 
 	// CreateUninitializedRange is used when rebalancing is used to add a range
 	// to this store, or a peer informs this store that it has a replica of a
@@ -871,7 +850,7 @@ type ReplicasStorage interface {
 	// to initialized via anything other than a call to SplitReplica (i.e., does
 	// not apply a snapshot), except when the LHS moves past the split using a
 	// snapshot, in which case the RHS can also then apply a snapshot.
-	CreateUninitializedRange(ctx context.Context, rr FullReplicaID) (RangeStorage, error)
+	CreateUninitializedRange(ctx context.Context, rr roachpb.FullReplicaID) (RangeStorage, error)
 
 	// SplitReplica is called to split range r into a LHS and RHS, where the RHS
 	// is represented by rhsRR. The smBatch specifies the state machine state to
@@ -917,7 +896,7 @@ type ReplicasStorage interface {
 	//
 	// Called below Raft -- this is being called when the split transaction commits.
 	SplitReplica(
-		ctx context.Context, r RangeStorage, rhsRR FullReplicaID, rhsSpan roachpb.RSpan,
+		ctx context.Context, r RangeStorage, rhsRR roachpb.FullReplicaID, rhsSpan roachpb.RSpan,
 		smBatch MutationBatch,
 	) (RangeStorage, error)
 

Original file line number	Diff line number	Diff line change
`@@ -388,8 +388,8 @@ type Replica struct {`
`388`	`388`	`}`
`389`	`389`
`390`	`390`	`// ID returns the FullReplicaID.`
`391`		`-func (r Replica) ID() storage.FullReplicaID {`
`392`		`- return storage.FullReplicaID{`
	`391`	`+func (r Replica) ID() roachpb.FullReplicaID {`
	`392`	`+ return roachpb.FullReplicaID{`
`393`	`393`	`RangeID: r.RangeID,`
`394`	`394`	`ReplicaID: r.ReplicaID,`
`395`	`395`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1096,8 +1096,8 @@ func (r *Replica) ReplicaID() roachpb.ReplicaID {`
`1096`	`1096`	`}`
`1097`	`1097`
`1098`	`1098`	`// ID returns the FullReplicaID for the Replica.`
`1099`		`-func (r *Replica) ID() storage.FullReplicaID {`
`1100`		`- return storage.FullReplicaID{RangeID: r.RangeID, ReplicaID: r.replicaID}`
	`1099`	`+func (r *Replica) ID() roachpb.FullReplicaID {`
	`1100`	`+ return roachpb.FullReplicaID{RangeID: r.RangeID, ReplicaID: r.replicaID}`
`1101`	`1101`	`}`
`1102`	`1102`
`1103`	`1103`	`// LogStorageRaftMuLocked returns the Replica's log storage.`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ func TestPrepareSnapApply(t *testing.T) {`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- id := storage.FullReplicaID{RangeID: 123, ReplicaID: 4}`
	`72`	`+ id := roachpb.FullReplicaID{RangeID: 123, ReplicaID: 4}`
`73`	`73`	`descA := desc(101, "a", "b")`
`74`	`74`	`descB := desc(102, "b", "z")`
`75`	`75`	`createRangeData(t, eng, *descA)`