Skip to content

Commit 4930b55

Browse files
kv,server: replace PerReplicaClient RPC client with adapter
gRPC and DRPC clients have different signatures. To unify them, a common interface was created for both types of clients, and replaced the gRPC and DRPC clients with adapters. Epic: CRDB-48923 Fixes:#148353 Release note: none
1 parent 0d81c7b commit 4930b55

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkg/kv/kvserver/client_raft_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4667,7 +4667,7 @@ func TestStoreRangeWaitForApplication(t *testing.T) {
46674667

46684668
atomic.StoreInt64(&filterRangeIDAtomic, int64(desc.RangeID))
46694669
type target struct {
4670-
client kvserver.PerReplicaClient
4670+
client kvserver.RPCPerReplicaClient
46714671
header kvserver.StoreRequestHeader
46724672
}
46734673

pkg/kv/kvserver/rpc_clients.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ func DialMultiRaftClient(
3030

3131
// DialPerReplicaClient establishes a DRPC connection if enabled; otherwise,
3232
// it falls back to gRPC. The established connection is used to create a
33-
// PerReplicaClient.
33+
// RPCPerReplicaClient.
3434
func DialPerReplicaClient(
3535
nd rpcbase.NodeDialer, ctx context.Context, nodeID roachpb.NodeID, class rpcbase.ConnectionClass,
36-
) (PerReplicaClient, error) {
36+
) (RPCPerReplicaClient, error) {
3737
if !rpcbase.TODODRPC {
3838
conn, err := nd.Dial(ctx, nodeID, class)
3939
if err != nil {
4040
return nil, err
4141
}
42-
return NewPerReplicaClient(conn), nil
42+
return NewGRPCPerReplicaClientAdapter(conn), nil
4343
}
4444
return nil, nil
4545
}

pkg/server/authserver/authentication_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -846,7 +846,7 @@ func TestGRPCAuthentication(t *testing.T) {
846846
return err
847847
}, true},
848848
{"perReplica", func(ctx context.Context, conn *grpc.ClientConn) error {
849-
_, err := kvserver.NewPerReplicaClient(conn).CollectChecksum(ctx, &kvserver.CollectChecksumRequest{})
849+
_, err := kvserver.NewGRPCPerReplicaClientAdapter(conn).CollectChecksum(ctx, &kvserver.CollectChecksumRequest{})
850850
return err
851851
}, true},
852852
{"raft", func(ctx context.Context, conn *grpc.ClientConn) error {

0 commit comments

Comments
 (0)