From 0a1cef610c08c338ac8511e2a6449fb52abe5cea Mon Sep 17 00:00:00 2001 From: Yury Frolov Date: Tue, 29 Oct 2024 17:58:36 +0500 Subject: [PATCH 1/2] Refactor protospecs --- balancer/provider/balancer.go | 6 +- cmd/coordctl/main.go | 4 +- cmd/spqrdump/main.go | 4 +- coordinator/provider/coordinator.go | 20 +- coordinator/provider/distributions.go | 20 +- coordinator/provider/keyranges.go | 5 +- coordinator/provider/router.go | 11 +- coordinator/provider/shards.go | 9 +- coordinator/provider/tasks.go | 12 +- coordinator/provider/topology.go | 8 +- pkg/coord/adapter.go | 16 +- pkg/protos/backend_connections.pb.go | 146 ++---- pkg/protos/backend_connections_grpc.pb.go | 13 +- pkg/protos/clients.pb.go | 166 +++--- pkg/protos/clients_grpc.pb.go | 13 +- pkg/protos/coordinator.pb.go | 511 +++---------------- pkg/protos/coordinator_grpc.pb.go | 63 +-- pkg/protos/distribution.pb.go | 587 ++++++---------------- pkg/protos/distribution_grpc.pb.go | 53 +- pkg/protos/key_range.pb.go | 506 ++++++++----------- pkg/protos/key_range_grpc.pb.go | 25 +- pkg/protos/pools.pb.go | 133 ++--- pkg/protos/pools_grpc.pb.go | 13 +- pkg/protos/router.pb.go | 314 +++--------- pkg/protos/router_grpc.pb.go | 33 +- pkg/protos/shard.pb.go | 244 +++------ pkg/protos/shard_grpc.pb.go | 33 +- pkg/protos/sharding_rules.pb.go | 250 +++------ pkg/protos/sharding_rules_grpc.pb.go | 21 +- pkg/protos/tasks.pb.go | 363 +++---------- pkg/protos/tasks_grpc.pb.go | 37 +- protos/backend_connections.proto | 8 +- protos/clients.proto | 8 +- protos/coordinator.proto | 25 +- protos/distribution.proto | 22 +- protos/key_range.proto | 11 +- protos/pools.proto | 7 +- protos/router.proto | 18 +- protos/shard.proto | 14 +- protos/sharding_rules.proto | 11 +- protos/tasks.proto | 13 +- router/grpc/qrouter.go | 67 ++- yacc/console/lex.go | 18 +- 43 files changed, 1197 insertions(+), 2664 deletions(-) diff --git a/balancer/provider/balancer.go b/balancer/provider/balancer.go index cc2b28797..e85e405be 100644 --- a/balancer/provider/balancer.go +++ b/balancer/provider/balancer.go @@ -608,7 +608,7 @@ func (b *BalancerImpl) getTasks(ctx context.Context, shardFrom *ShardMetrics, kr func (b *BalancerImpl) getCurrentTaskGroupFromQDB(ctx context.Context) (group *tasks.TaskGroup, err error) { tasksService := protos.NewTasksServiceClient(b.coordinatorConn) - resp, err := tasksService.GetTaskGroup(ctx, &protos.GetTaskGroupRequest{}) + resp, err := tasksService.GetTaskGroup(ctx, nil) if err != nil { return nil, err } @@ -623,7 +623,7 @@ func (b *BalancerImpl) syncTaskGroupWithQDB(ctx context.Context, group *tasks.Ta func (b *BalancerImpl) removeTaskGroupFromQDB(ctx context.Context) error { tasksService := protos.NewTasksServiceClient(b.coordinatorConn) - _, err := tasksService.RemoveTaskGroup(ctx, &protos.RemoveTaskGroupRequest{}) + _, err := tasksService.RemoveTaskGroup(ctx, nil) return err } @@ -709,7 +709,7 @@ func (b *BalancerImpl) executeTasks(ctx context.Context, group *tasks.TaskGroup) func (b *BalancerImpl) updateKeyRanges(ctx context.Context) error { keyRangeService := protos.NewKeyRangeServiceClient(b.coordinatorConn) distrService := protos.NewDistributionServiceClient(b.coordinatorConn) - keyRangesProto, err := keyRangeService.ListAllKeyRanges(ctx, &protos.ListAllKeyRangesRequest{}) + keyRangesProto, err := keyRangeService.ListAllKeyRanges(ctx, nil) if err != nil { return err } diff --git a/cmd/coordctl/main.go b/cmd/coordctl/main.go index 18aa4c803..3096cf939 100644 --- a/cmd/coordctl/main.go +++ b/cmd/coordctl/main.go @@ -109,7 +109,7 @@ var listRouterCmd = &cobra.Command{ } rCl := protos.NewRouterServiceClient(cc) - if resp, err := rCl.ListRouters(context.Background(), &protos.ListRoutersRequest{}); err == nil { + if resp, err := rCl.ListRouters(context.Background(), nil); err == nil { fmt.Printf("-------------------------------------\n") fmt.Printf("%d routers found\n", len(resp.Routers)) @@ -186,7 +186,7 @@ var listShardCmd = &cobra.Command{ } rCl := protos.NewShardServiceClient(cc) - if resp, err := rCl.ListShards(context.Background(), &protos.ListShardsRequest{}); err == nil { + if resp, err := rCl.ListShards(context.Background(), nil); err == nil { fmt.Printf("-------------------------------------\n") fmt.Printf("%d shards found\n", len(resp.Shards)) diff --git a/cmd/spqrdump/main.go b/cmd/spqrdump/main.go index f0d5a866d..7a2496b78 100644 --- a/cmd/spqrdump/main.go +++ b/cmd/spqrdump/main.go @@ -175,7 +175,7 @@ func DumpKeyRanges() error { rCl := protos.NewKeyRangeServiceClient(cc) dCl := protos.NewDistributionServiceClient(cc) - if keys, err := rCl.ListAllKeyRanges(context.Background(), &protos.ListAllKeyRangesRequest{}); err != nil { + if keys, err := rCl.ListAllKeyRanges(context.Background(), nil); err != nil { spqrlog.Zero.Error(). Err(err). Msg("failed to dump endpoint rules") @@ -204,7 +204,7 @@ func DumpDistributions() error { } rCl := protos.NewDistributionServiceClient(cc) - if dss, err := rCl.ListDistributions(context.Background(), &protos.ListDistributionsRequest{}); err != nil { + if dss, err := rCl.ListDistributions(context.Background(), nil); err != nil { spqrlog.Zero.Error(). Err(err). Msg("failed to dump endpoint distributions") diff --git a/coordinator/provider/coordinator.go b/coordinator/provider/coordinator.go index 9685829ad..dce89c421 100644 --- a/coordinator/provider/coordinator.go +++ b/coordinator/provider/coordinator.go @@ -87,7 +87,7 @@ func (ci grpcConnectionIterator) ClientPoolForeach(cb func(client client.ClientI rrClient := routerproto.NewClientInfoServiceClient(cc) spqrlog.Zero.Debug().Msg("fetch clients with grpc") - resp, err := rrClient.ListClients(ctx, &routerproto.ListClientsRequest{}) + resp, err := rrClient.ListClients(ctx, nil) if err != nil { spqrlog.Zero.Error().Msg("error fetching clients with grpc") return err @@ -128,7 +128,7 @@ func (ci grpcConnectionIterator) ForEach(cb func(sh shard.Shardinfo) error) erro rrBackConn := routerproto.NewBackendConnectionsServiceClient(cc) spqrlog.Zero.Debug().Msg("fetch clients with grpc") - resp, err := rrBackConn.ListBackendConnections(ctx, &routerproto.ListBackendConnectionsRequest{}) + resp, err := rrBackConn.ListBackendConnections(ctx, nil) if err != nil { spqrlog.Zero.Error().Msg("error fetching clients with grpc") return err @@ -151,7 +151,7 @@ func (ci grpcConnectionIterator) ForEachPool(cb func(p pool.Pool) error) error { rrBackConn := routerproto.NewPoolServiceClient(cc) spqrlog.Zero.Debug().Msg("fetch pools with grpc") - resp, err := rrBackConn.ListPools(ctx, &routerproto.ListPoolsRequest{}) + resp, err := rrBackConn.ListPools(ctx, nil) if err != nil { spqrlog.Zero.Error().Msg("error fetching pools with grpc") return err @@ -230,7 +230,7 @@ func (qc *qdbCoordinator) watchRouters(ctx context.Context) { rrClient := routerproto.NewTopologyServiceClient(cc) - resp, err := rrClient.GetRouterStatus(ctx, &routerproto.GetRouterStatusRequest{}) + resp, err := rrClient.GetRouterStatus(ctx, nil) if err != nil { return err } @@ -694,7 +694,7 @@ func (qc *qdbCoordinator) DropKeyRangeAll(ctx context.Context) error { if err := qc.traverseRouters(ctx, func(cc *grpc.ClientConn) error { cl := routerproto.NewKeyRangeServiceClient(cc) - resp, err := cl.DropAllKeyRanges(ctx, &routerproto.DropAllKeyRangesRequest{}) + resp, err := cl.DropAllKeyRanges(ctx, nil) spqrlog.Zero.Debug().Err(err). Interface("response", resp). Msg("drop key range response") @@ -987,7 +987,7 @@ func (qc *qdbCoordinator) SyncRouterMetadata(ctx context.Context, qRouter *topol if err != nil { return err } - resp, err := dsCl.ListDistributions(ctx, &routerproto.ListDistributionsRequest{}) + resp, err := dsCl.ListDistributions(ctx, nil) if err != nil { return err } @@ -1021,7 +1021,7 @@ func (qc *qdbCoordinator) SyncRouterMetadata(ctx context.Context, qRouter *topol if err != nil { return err } - if _, err = krClient.DropAllKeyRanges(ctx, &routerproto.DropAllKeyRangesRequest{}); err != nil { + if _, err = krClient.DropAllKeyRanges(ctx, nil); err != nil { return err } @@ -1051,7 +1051,7 @@ func (qc *qdbCoordinator) SyncRouterMetadata(ctx context.Context, qRouter *topol return err } - if resp, err := rCl.OpenRouter(ctx, &routerproto.OpenRouterRequest{}); err != nil { + if resp, err := rCl.OpenRouter(ctx, nil); err != nil { return err } else { spqrlog.Zero.Debug(). @@ -1084,7 +1084,7 @@ func (qc *qdbCoordinator) SyncRouterCoordinatorAddress(ctx context.Context, qRou return err } - if resp, err := rCl.OpenRouter(ctx, &routerproto.OpenRouterRequest{}); err != nil { + if resp, err := rCl.OpenRouter(ctx, nil); err != nil { return err } else { spqrlog.Zero.Debug(). @@ -1110,7 +1110,7 @@ func (qc *qdbCoordinator) RegisterRouter(ctx context.Context, r *topology.Router } defer conn.Close() cl := routerproto.NewTopologyServiceClient(conn) - _, err = cl.GetRouterStatus(ctx, &routerproto.GetRouterStatusRequest{}) + _, err = cl.GetRouterStatus(ctx, nil) if err != nil { return spqrerror.Newf(spqrerror.SPQR_CONNECTION_ERROR, "failed to ping router: %s", err) } diff --git a/coordinator/provider/distributions.go b/coordinator/provider/distributions.go index 5ca884ffb..e55146401 100644 --- a/coordinator/provider/distributions.go +++ b/coordinator/provider/distributions.go @@ -2,9 +2,11 @@ package provider import ( "context" + "github.com/pg-sharding/spqr/coordinator" "github.com/pg-sharding/spqr/pkg/models/distributions" protos "github.com/pg-sharding/spqr/pkg/protos" + "google.golang.org/protobuf/types/known/emptypb" ) type DistributionsServer struct { @@ -21,25 +23,25 @@ func NewDistributionServer(impl coordinator.Coordinator) *DistributionsServer { var _ protos.DistributionServiceServer = &DistributionsServer{} -func (d *DistributionsServer) CreateDistribution(ctx context.Context, req *protos.CreateDistributionRequest) (*protos.CreateDistributionReply, error) { +func (d *DistributionsServer) CreateDistribution(ctx context.Context, req *protos.CreateDistributionRequest) (*emptypb.Empty, error) { for _, ds := range req.Distributions { if err := d.impl.CreateDistribution(ctx, distributions.DistributionFromProto(ds)); err != nil { return nil, err } } - return &protos.CreateDistributionReply{}, nil + return nil, nil } -func (d *DistributionsServer) DropDistribution(ctx context.Context, req *protos.DropDistributionRequest) (*protos.DropDistributionReply, error) { +func (d *DistributionsServer) DropDistribution(ctx context.Context, req *protos.DropDistributionRequest) (*emptypb.Empty, error) { for _, id := range req.GetIds() { if err := d.impl.DropDistribution(ctx, id); err != nil { return nil, err } } - return &protos.DropDistributionReply{}, nil + return nil, nil } -func (d *DistributionsServer) ListDistributions(ctx context.Context, req *protos.ListDistributionsRequest) (*protos.ListDistributionsReply, error) { +func (d *DistributionsServer) ListDistributions(ctx context.Context, _ *emptypb.Empty) (*protos.ListDistributionsReply, error) { dss, err := d.impl.ListDistributions(ctx) if err != nil { return nil, err @@ -55,8 +57,8 @@ func (d *DistributionsServer) ListDistributions(ctx context.Context, req *protos }, nil } -func (d *DistributionsServer) AlterDistributionAttach(ctx context.Context, req *protos.AlterDistributionAttachRequest) (*protos.AlterDistributionAttachReply, error) { - return &protos.AlterDistributionAttachReply{}, d.impl.AlterDistributionAttach(ctx, req.GetId(), func() []*distributions.DistributedRelation { +func (d *DistributionsServer) AlterDistributionAttach(ctx context.Context, req *protos.AlterDistributionAttachRequest) (*emptypb.Empty, error) { + return nil, d.impl.AlterDistributionAttach(ctx, req.GetId(), func() []*distributions.DistributedRelation { res := make([]*distributions.DistributedRelation, len(req.GetRelations())) for i, rel := range req.GetRelations() { res[i] = distributions.DistributedRelationFromProto(rel) @@ -65,13 +67,13 @@ func (d *DistributionsServer) AlterDistributionAttach(ctx context.Context, req * }()) } -func (d *DistributionsServer) AlterDistributionDetach(ctx context.Context, req *protos.AlterDistributionDetachRequest) (*protos.AlterDistributionDetachReply, error) { +func (d *DistributionsServer) AlterDistributionDetach(ctx context.Context, req *protos.AlterDistributionDetachRequest) (*emptypb.Empty, error) { for _, rel := range req.GetRelNames() { if err := d.impl.AlterDistributionDetach(ctx, req.GetId(), rel); err != nil { return nil, err } } - return &protos.AlterDistributionDetachReply{}, nil + return nil, nil } func (d *DistributionsServer) GetDistribution(ctx context.Context, req *protos.GetDistributionRequest) (*protos.GetDistributionReply, error) { diff --git a/coordinator/provider/keyranges.go b/coordinator/provider/keyranges.go index eac497cec..062493c43 100644 --- a/coordinator/provider/keyranges.go +++ b/coordinator/provider/keyranges.go @@ -4,6 +4,7 @@ import ( "context" "github.com/pg-sharding/spqr/pkg/models/spqrerror" + "google.golang.org/protobuf/types/known/emptypb" "github.com/pg-sharding/spqr/coordinator" "github.com/pg-sharding/spqr/pkg/models/kr" @@ -17,7 +18,7 @@ type CoordinatorService struct { } // DropAllKeyRanges implements proto.KeyRangeServiceServer. -func (c *CoordinatorService) DropAllKeyRanges(ctx context.Context, request *protos.DropAllKeyRangesRequest) (*protos.DropAllKeyRangesResponse, error) { +func (c *CoordinatorService) DropAllKeyRanges(ctx context.Context, request *emptypb.Empty) (*protos.DropAllKeyRangesResponse, error) { err := c.impl.DropKeyRangeAll(ctx) if err != nil { return nil, err @@ -125,7 +126,7 @@ func (c *CoordinatorService) ListKeyRange(ctx context.Context, request *protos.L }, nil } -func (c *CoordinatorService) ListAllKeyRanges(ctx context.Context, _ *protos.ListAllKeyRangesRequest) (*protos.KeyRangeReply, error) { +func (c *CoordinatorService) ListAllKeyRanges(ctx context.Context, _ *emptypb.Empty) (*protos.KeyRangeReply, error) { krsDb, err := c.impl.ListAllKeyRanges(ctx) if err != nil { return nil, err diff --git a/coordinator/provider/router.go b/coordinator/provider/router.go index 7e6815d8d..0ef74704e 100644 --- a/coordinator/provider/router.go +++ b/coordinator/provider/router.go @@ -7,6 +7,7 @@ import ( "github.com/pg-sharding/spqr/pkg/models/topology" protos "github.com/pg-sharding/spqr/pkg/protos" "github.com/pg-sharding/spqr/pkg/spqrlog" + "google.golang.org/protobuf/types/known/emptypb" ) type RouterService struct { @@ -16,7 +17,7 @@ type RouterService struct { } // TODO : unit tests -func (r RouterService) ListRouters(ctx context.Context, request *protos.ListRoutersRequest) (*protos.ListRoutersReply, error) { +func (r RouterService) ListRouters(ctx context.Context, _ *emptypb.Empty) (*protos.ListRoutersReply, error) { routers, err := r.impl.ListRouters(ctx) if err != nil { return nil, err @@ -48,7 +49,7 @@ func (r RouterService) AddRouter(ctx context.Context, request *protos.AddRouterR } // TODO : unit tests -func (r RouterService) RemoveRouter(ctx context.Context, request *protos.RemoveRouterRequest) (*protos.RemoveRouterReply, error) { +func (r RouterService) RemoveRouter(ctx context.Context, request *protos.RemoveRouterRequest) (*emptypb.Empty, error) { spqrlog.Zero.Debug(). Str("router-id", request.Id). Msg("unregister router in coordinator") @@ -56,11 +57,11 @@ func (r RouterService) RemoveRouter(ctx context.Context, request *protos.RemoveR if err != nil { return nil, err } - return &protos.RemoveRouterReply{}, nil + return nil, nil } // TODO : unit tests -func (r RouterService) SyncMetadata(ctx context.Context, request *protos.SyncMetadataRequest) (*protos.SyncMetadataReply, error) { +func (r RouterService) SyncMetadata(ctx context.Context, request *protos.SyncMetadataRequest) (*emptypb.Empty, error) { spqrlog.Zero.Debug(). Str("router-id", request.Router.Id). Msg("sync router metadata in coordinator") @@ -68,7 +69,7 @@ func (r RouterService) SyncMetadata(ctx context.Context, request *protos.SyncMet if err != nil { return nil, err } - return &protos.SyncMetadataReply{}, nil + return nil, nil } var _ protos.RouterServiceServer = &RouterService{} diff --git a/coordinator/provider/shards.go b/coordinator/provider/shards.go index 42b3bf206..754ee4331 100644 --- a/coordinator/provider/shards.go +++ b/coordinator/provider/shards.go @@ -6,6 +6,7 @@ import ( routerproto "github.com/pg-sharding/spqr/pkg/protos" "github.com/pg-sharding/spqr/pkg/shard" "github.com/pg-sharding/spqr/pkg/txstatus" + "google.golang.org/protobuf/types/known/emptypb" "github.com/pg-sharding/spqr/coordinator" "github.com/pg-sharding/spqr/pkg/models/datashards" @@ -27,23 +28,23 @@ func NewShardServer(impl coordinator.Coordinator) *ShardServer { var _ protos.ShardServiceServer = &ShardServer{} // TODO : unit tests -func (s *ShardServer) AddDataShard(ctx context.Context, request *protos.AddShardRequest) (*protos.AddShardReply, error) { +func (s *ShardServer) AddDataShard(ctx context.Context, request *protos.AddShardRequest) (*emptypb.Empty, error) { newShard := request.GetShard() if err := s.impl.AddDataShard(ctx, datashards.DataShardFromProto(newShard)); err != nil { return nil, err } - return &protos.AddShardReply{}, nil + return nil, nil } -func (s *ShardServer) AddWorldShard(ctx context.Context, request *protos.AddWorldShardRequest) (*protos.AddShardReply, error) { +func (s *ShardServer) AddWorldShard(ctx context.Context, request *protos.AddWorldShardRequest) (*emptypb.Empty, error) { panic("implement me") } // TODO : unit tests // TODO: remove ShardRequest. -func (s *ShardServer) ListShards(ctx context.Context, _ *protos.ListShardsRequest) (*protos.ListShardsReply, error) { +func (s *ShardServer) ListShards(ctx context.Context, _ *emptypb.Empty) (*protos.ListShardsReply, error) { shardList, err := s.impl.ListShards(ctx) if err != nil { return nil, err diff --git a/coordinator/provider/tasks.go b/coordinator/provider/tasks.go index af78c712a..3c7f12c49 100644 --- a/coordinator/provider/tasks.go +++ b/coordinator/provider/tasks.go @@ -2,9 +2,11 @@ package provider import ( "context" + "github.com/pg-sharding/spqr/coordinator" "github.com/pg-sharding/spqr/pkg/models/tasks" protos "github.com/pg-sharding/spqr/pkg/protos" + "google.golang.org/protobuf/types/known/emptypb" ) type TasksServer struct { @@ -21,7 +23,7 @@ func NewTasksServer(impl coordinator.Coordinator) *TasksServer { var _ protos.TasksServiceServer = &TasksServer{} -func (t TasksServer) GetTaskGroup(ctx context.Context, _ *protos.GetTaskGroupRequest) (*protos.GetTaskGroupReply, error) { +func (t TasksServer) GetTaskGroup(ctx context.Context, _ *emptypb.Empty) (*protos.GetTaskGroupReply, error) { group, err := t.impl.GetTaskGroup(ctx) if err != nil { return nil, err @@ -29,11 +31,11 @@ func (t TasksServer) GetTaskGroup(ctx context.Context, _ *protos.GetTaskGroupReq return &protos.GetTaskGroupReply{TaskGroup: tasks.TaskGroupToProto(group)}, nil } -func (t TasksServer) WriteTaskGroup(ctx context.Context, request *protos.WriteTaskGroupRequest) (*protos.WriteTaskGroupReply, error) { +func (t TasksServer) WriteTaskGroup(ctx context.Context, request *protos.WriteTaskGroupRequest) (*emptypb.Empty, error) { err := t.impl.WriteTaskGroup(ctx, tasks.TaskGroupFromProto(request.TaskGroup)) - return &protos.WriteTaskGroupReply{}, err + return nil, err } -func (t TasksServer) RemoveTaskGroup(ctx context.Context, _ *protos.RemoveTaskGroupRequest) (*protos.RemoveTaskGroupReply, error) { - return &protos.RemoveTaskGroupReply{}, t.impl.RemoveTaskGroup(ctx) +func (t TasksServer) RemoveTaskGroup(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empty, error) { + return nil, t.impl.RemoveTaskGroup(ctx) } diff --git a/coordinator/provider/topology.go b/coordinator/provider/topology.go index e6c4630a2..7dd7cd16a 100644 --- a/coordinator/provider/topology.go +++ b/coordinator/provider/topology.go @@ -2,7 +2,9 @@ package provider import ( "context" + "github.com/pg-sharding/spqr/pkg/models/spqrerror" + "google.golang.org/protobuf/types/known/emptypb" "github.com/pg-sharding/spqr/coordinator" protos "github.com/pg-sharding/spqr/pkg/protos" @@ -15,17 +17,17 @@ type TopologyService struct { } // TODO : implement -func (r *TopologyService) OpenRouter(ctx context.Context, request *protos.OpenRouterRequest) (*protos.OpenRouterReply, error) { +func (r *TopologyService) OpenRouter(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empty, error) { return nil, spqrerror.New(spqrerror.SPQR_NOT_IMPLEMENTED, "OpenRouter method unimplemented") } // TODO : implement -func (r *TopologyService) CloseRouter(ctx context.Context, request *protos.CloseRouterRequest) (*protos.CloseRouterReply, error) { +func (r *TopologyService) CloseRouter(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empty, error) { return nil, spqrerror.New(spqrerror.SPQR_NOT_IMPLEMENTED, "CloseRouter method unimplemented") } // TODO : implement -func (r *TopologyService) UpdateCoordinator(ctx context.Context, in *protos.UpdateCoordinatorRequest) (*protos.UpdateCoordinatorResponse, error) { +func (r *TopologyService) UpdateCoordinator(ctx context.Context, in *protos.UpdateCoordinatorRequest) (*emptypb.Empty, error) { return nil, spqrerror.New(spqrerror.SPQR_NOT_IMPLEMENTED, "UpdateCoordinator method unimplemented") } diff --git a/pkg/coord/adapter.go b/pkg/coord/adapter.go index 229cbe147..a6076dc1c 100644 --- a/pkg/coord/adapter.go +++ b/pkg/coord/adapter.go @@ -144,7 +144,7 @@ func (a *Adapter) ListKeyRanges(ctx context.Context, distribution string) ([]*kr // - error: An error if listing all key ranges was unsuccessful. func (a *Adapter) ListAllKeyRanges(ctx context.Context) ([]*kr.KeyRange, error) { c := proto.NewKeyRangeServiceClient(a.conn) - reply, err := c.ListAllKeyRanges(ctx, &proto.ListAllKeyRangesRequest{}) + reply, err := c.ListAllKeyRanges(ctx, nil) if err != nil { return nil, err } @@ -386,7 +386,7 @@ func (a *Adapter) DropKeyRange(ctx context.Context, krid string) error { // - error: An error if the key range drop fails, otherwise nil. func (a *Adapter) DropKeyRangeAll(ctx context.Context) error { c := proto.NewKeyRangeServiceClient(a.conn) - _, err := c.DropAllKeyRanges(ctx, &proto.DropAllKeyRangesRequest{}) + _, err := c.DropAllKeyRanges(ctx, nil) return err } @@ -420,7 +420,7 @@ func (a *Adapter) RegisterRouter(ctx context.Context, r *topology.Router) error // - error: An error if listing routers fails, otherwise nil. func (a *Adapter) ListRouters(ctx context.Context) ([]*topology.Router, error) { c := proto.NewRouterServiceClient(a.conn) - resp, err := c.ListRouters(ctx, &proto.ListRoutersRequest{}) + resp, err := c.ListRouters(ctx, nil) if err != nil { return nil, err } @@ -541,7 +541,7 @@ func (a *Adapter) AddWorldShard(ctx context.Context, shard *datashards.DataShard // - error: An error if the retrieval of shards fails, otherwise nil. func (a *Adapter) ListShards(ctx context.Context) ([]*datashards.DataShard, error) { c := proto.NewShardServiceClient(a.conn) - resp, err := c.ListShards(ctx, &proto.ListShardsRequest{}) + resp, err := c.ListShards(ctx, nil) shards := resp.Shards var ds []*datashards.DataShard for _, shard := range shards { @@ -586,7 +586,7 @@ func (a *Adapter) GetShard(ctx context.Context, shardID string) (*datashards.Dat func (a *Adapter) ListDistributions(ctx context.Context) ([]*distributions.Distribution, error) { c := proto.NewDistributionServiceClient(a.conn) - resp, err := c.ListDistributions(ctx, &proto.ListDistributionsRequest{}) + resp, err := c.ListDistributions(ctx, nil) if err != nil { return nil, err } @@ -743,7 +743,7 @@ func (a *Adapter) GetRelationDistribution(ctx context.Context, id string) (*dist // - error: An error if the retrieval of the task group fails, otherwise nil. func (a *Adapter) GetTaskGroup(ctx context.Context) (*tasks.TaskGroup, error) { tasksService := proto.NewTasksServiceClient(a.conn) - res, err := tasksService.GetTaskGroup(ctx, &proto.GetTaskGroupRequest{}) + res, err := tasksService.GetTaskGroup(ctx, nil) if err != nil { return nil, err } @@ -775,7 +775,7 @@ func (a *Adapter) WriteTaskGroup(ctx context.Context, taskGroup *tasks.TaskGroup // - error: An error if the removal of the task group fails, otherwise nil. func (a *Adapter) RemoveTaskGroup(ctx context.Context) error { tasksService := proto.NewTasksServiceClient(a.conn) - _, err := tasksService.RemoveTaskGroup(ctx, &proto.RemoveTaskGroupRequest{}) + _, err := tasksService.RemoveTaskGroup(ctx, nil) return err } @@ -807,6 +807,6 @@ func (a *Adapter) UpdateCoordinator(ctx context.Context, address string) error { // - error: An error if the retrieval operation fails, otherwise nil. func (a *Adapter) GetCoordinator(ctx context.Context) (string, error) { c := proto.NewTopologyServiceClient(a.conn) - resp, err := c.GetCoordinator(ctx, &proto.GetCoordinatorRequest{}) + resp, err := c.GetCoordinator(ctx, nil) return resp.Address, err } diff --git a/pkg/protos/backend_connections.pb.go b/pkg/protos/backend_connections.pb.go index e56182b28..469d1e2e4 100644 --- a/pkg/protos/backend_connections.pb.go +++ b/pkg/protos/backend_connections.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -20,44 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type ListBackendConnectionsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListBackendConnectionsRequest) Reset() { - *x = ListBackendConnectionsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_backend_connections_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListBackendConnectionsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListBackendConnectionsRequest) ProtoMessage() {} - -func (x *ListBackendConnectionsRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_backend_connections_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListBackendConnectionsRequest.ProtoReflect.Descriptor instead. -func (*ListBackendConnectionsRequest) Descriptor() ([]byte, []int) { - return file_protos_backend_connections_proto_rawDescGZIP(), []int{0} -} - type ListBackendConntionsReply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -69,7 +32,7 @@ type ListBackendConntionsReply struct { func (x *ListBackendConntionsReply) Reset() { *x = ListBackendConntionsReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_backend_connections_proto_msgTypes[1] + mi := &file_protos_backend_connections_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -82,7 +45,7 @@ func (x *ListBackendConntionsReply) String() string { func (*ListBackendConntionsReply) ProtoMessage() {} func (x *ListBackendConntionsReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_backend_connections_proto_msgTypes[1] + mi := &file_protos_backend_connections_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -95,7 +58,7 @@ func (x *ListBackendConntionsReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ListBackendConntionsReply.ProtoReflect.Descriptor instead. func (*ListBackendConntionsReply) Descriptor() ([]byte, []int) { - return file_protos_backend_connections_proto_rawDescGZIP(), []int{1} + return file_protos_backend_connections_proto_rawDescGZIP(), []int{0} } func (x *ListBackendConntionsReply) GetConns() []*BackendConnectionsInfo { @@ -123,7 +86,7 @@ type BackendConnectionsInfo struct { func (x *BackendConnectionsInfo) Reset() { *x = BackendConnectionsInfo{} if protoimpl.UnsafeEnabled { - mi := &file_protos_backend_connections_proto_msgTypes[2] + mi := &file_protos_backend_connections_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -136,7 +99,7 @@ func (x *BackendConnectionsInfo) String() string { func (*BackendConnectionsInfo) ProtoMessage() {} func (x *BackendConnectionsInfo) ProtoReflect() protoreflect.Message { - mi := &file_protos_backend_connections_proto_msgTypes[2] + mi := &file_protos_backend_connections_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -149,7 +112,7 @@ func (x *BackendConnectionsInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use BackendConnectionsInfo.ProtoReflect.Descriptor instead. func (*BackendConnectionsInfo) Descriptor() ([]byte, []int) { - return file_protos_backend_connections_proto_rawDescGZIP(), []int{2} + return file_protos_backend_connections_proto_rawDescGZIP(), []int{1} } func (x *BackendConnectionsInfo) GetBackendConnectionId() uint64 { @@ -213,40 +176,39 @@ var File_protos_backend_connections_proto protoreflect.FileDescriptor var file_protos_backend_connections_proto_rawDesc = []byte{ 0x0a, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0x1f, 0x0a, 0x1d, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x4f, 0x0a, 0x19, 0x4c, 0x69, 0x73, - 0x74, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x32, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x6e, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x42, 0x61, 0x63, - 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x49, - 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x63, 0x6f, 0x6e, 0x6e, 0x73, 0x22, 0x88, 0x02, 0x0a, 0x16, 0x42, - 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x32, 0x0a, 0x15, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, - 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x13, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, - 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x68, 0x61, - 0x72, 0x64, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x73, 0x68, 0x61, 0x72, 0x64, 0x4b, 0x65, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, - 0x73, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, - 0x16, 0x0a, 0x06, 0x64, 0x62, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x06, 0x64, 0x62, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x79, 0x6e, 0x63, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x1b, 0x0a, 0x09, 0x74, - 0x78, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, - 0x74, 0x78, 0x53, 0x65, 0x72, 0x76, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x78, 0x5f, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x78, 0x53, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x32, 0x7d, 0x0a, 0x19, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, - 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x60, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, - 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, - 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, + 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4f, 0x0a, 0x19, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x79, 0x12, 0x32, 0x0a, 0x05, 0x63, 0x6f, 0x6e, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, + 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x52, + 0x05, 0x63, 0x6f, 0x6e, 0x6e, 0x73, 0x22, 0x88, 0x02, 0x0a, 0x16, 0x42, 0x61, 0x63, 0x6b, 0x65, + 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x49, 0x6e, 0x66, + 0x6f, 0x12, 0x32, 0x0a, 0x15, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, + 0x52, 0x13, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x24, 0x0a, 0x0e, 0x73, 0x68, 0x61, 0x72, 0x64, 0x5f, 0x6b, + 0x65, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, + 0x68, 0x61, 0x72, 0x64, 0x4b, 0x65, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x68, + 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, + 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x64, + 0x62, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x62, 0x6e, + 0x61, 0x6d, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x79, 0x6e, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x04, 0x73, 0x79, 0x6e, 0x63, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x78, 0x5f, 0x73, 0x65, + 0x72, 0x76, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x78, 0x53, 0x65, + 0x72, 0x76, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x78, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x74, 0x78, 0x53, 0x74, 0x61, 0x74, 0x75, + 0x73, 0x32, 0x70, 0x0a, 0x19, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x53, + 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, + 0x6e, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, + 0x1a, 0x1f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x42, 0x61, 0x63, 0x6b, + 0x65, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x6e, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x70, 0x6c, + 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -261,16 +223,16 @@ func file_protos_backend_connections_proto_rawDescGZIP() []byte { return file_protos_backend_connections_proto_rawDescData } -var file_protos_backend_connections_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_protos_backend_connections_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_protos_backend_connections_proto_goTypes = []interface{}{ - (*ListBackendConnectionsRequest)(nil), // 0: spqr.ListBackendConnectionsRequest - (*ListBackendConntionsReply)(nil), // 1: spqr.ListBackendConntionsReply - (*BackendConnectionsInfo)(nil), // 2: spqr.BackendConnectionsInfo + (*ListBackendConntionsReply)(nil), // 0: spqr.ListBackendConntionsReply + (*BackendConnectionsInfo)(nil), // 1: spqr.BackendConnectionsInfo + (*emptypb.Empty)(nil), // 2: google.protobuf.Empty } var file_protos_backend_connections_proto_depIdxs = []int32{ - 2, // 0: spqr.ListBackendConntionsReply.conns:type_name -> spqr.BackendConnectionsInfo - 0, // 1: spqr.BackendConnectionsService.ListBackendConnections:input_type -> spqr.ListBackendConnectionsRequest - 1, // 2: spqr.BackendConnectionsService.ListBackendConnections:output_type -> spqr.ListBackendConntionsReply + 1, // 0: spqr.ListBackendConntionsReply.conns:type_name -> spqr.BackendConnectionsInfo + 2, // 1: spqr.BackendConnectionsService.ListBackendConnections:input_type -> google.protobuf.Empty + 0, // 2: spqr.BackendConnectionsService.ListBackendConnections:output_type -> spqr.ListBackendConntionsReply 2, // [2:3] is the sub-list for method output_type 1, // [1:2] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -285,18 +247,6 @@ func file_protos_backend_connections_proto_init() { } if !protoimpl.UnsafeEnabled { file_protos_backend_connections_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListBackendConnectionsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_backend_connections_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListBackendConntionsReply); i { case 0: return &v.state @@ -308,7 +258,7 @@ func file_protos_backend_connections_proto_init() { return nil } } - file_protos_backend_connections_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_protos_backend_connections_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*BackendConnectionsInfo); i { case 0: return &v.state @@ -327,7 +277,7 @@ func file_protos_backend_connections_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_backend_connections_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 2, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/backend_connections_grpc.pb.go b/pkg/protos/backend_connections_grpc.pb.go index e0e57052f..9a580db0a 100644 --- a/pkg/protos/backend_connections_grpc.pb.go +++ b/pkg/protos/backend_connections_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -26,7 +27,7 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type BackendConnectionsServiceClient interface { - ListBackendConnections(ctx context.Context, in *ListBackendConnectionsRequest, opts ...grpc.CallOption) (*ListBackendConntionsReply, error) + ListBackendConnections(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListBackendConntionsReply, error) } type backendConnectionsServiceClient struct { @@ -37,7 +38,7 @@ func NewBackendConnectionsServiceClient(cc grpc.ClientConnInterface) BackendConn return &backendConnectionsServiceClient{cc} } -func (c *backendConnectionsServiceClient) ListBackendConnections(ctx context.Context, in *ListBackendConnectionsRequest, opts ...grpc.CallOption) (*ListBackendConntionsReply, error) { +func (c *backendConnectionsServiceClient) ListBackendConnections(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListBackendConntionsReply, error) { out := new(ListBackendConntionsReply) err := c.cc.Invoke(ctx, BackendConnectionsService_ListBackendConnections_FullMethodName, in, out, opts...) if err != nil { @@ -50,7 +51,7 @@ func (c *backendConnectionsServiceClient) ListBackendConnections(ctx context.Con // All implementations must embed UnimplementedBackendConnectionsServiceServer // for forward compatibility type BackendConnectionsServiceServer interface { - ListBackendConnections(context.Context, *ListBackendConnectionsRequest) (*ListBackendConntionsReply, error) + ListBackendConnections(context.Context, *emptypb.Empty) (*ListBackendConntionsReply, error) mustEmbedUnimplementedBackendConnectionsServiceServer() } @@ -58,7 +59,7 @@ type BackendConnectionsServiceServer interface { type UnimplementedBackendConnectionsServiceServer struct { } -func (UnimplementedBackendConnectionsServiceServer) ListBackendConnections(context.Context, *ListBackendConnectionsRequest) (*ListBackendConntionsReply, error) { +func (UnimplementedBackendConnectionsServiceServer) ListBackendConnections(context.Context, *emptypb.Empty) (*ListBackendConntionsReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListBackendConnections not implemented") } func (UnimplementedBackendConnectionsServiceServer) mustEmbedUnimplementedBackendConnectionsServiceServer() { @@ -76,7 +77,7 @@ func RegisterBackendConnectionsServiceServer(s grpc.ServiceRegistrar, srv Backen } func _BackendConnectionsService_ListBackendConnections_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListBackendConnectionsRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -88,7 +89,7 @@ func _BackendConnectionsService_ListBackendConnections_Handler(srv interface{}, FullMethod: BackendConnectionsService_ListBackendConnections_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(BackendConnectionsServiceServer).ListBackendConnections(ctx, req.(*ListBackendConnectionsRequest)) + return srv.(BackendConnectionsServiceServer).ListBackendConnections(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/clients.pb.go b/pkg/protos/clients.pb.go index 9fc25c575..402cd1caf 100644 --- a/pkg/protos/clients.pb.go +++ b/pkg/protos/clients.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -20,44 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type ListClientsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListClientsRequest) Reset() { - *x = ListClientsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_clients_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListClientsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListClientsRequest) ProtoMessage() {} - -func (x *ListClientsRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_clients_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListClientsRequest.ProtoReflect.Descriptor instead. -func (*ListClientsRequest) Descriptor() ([]byte, []int) { - return file_protos_clients_proto_rawDescGZIP(), []int{0} -} - type ListClientsReply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -69,7 +32,7 @@ type ListClientsReply struct { func (x *ListClientsReply) Reset() { *x = ListClientsReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_clients_proto_msgTypes[1] + mi := &file_protos_clients_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -82,7 +45,7 @@ func (x *ListClientsReply) String() string { func (*ListClientsReply) ProtoMessage() {} func (x *ListClientsReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_clients_proto_msgTypes[1] + mi := &file_protos_clients_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -95,7 +58,7 @@ func (x *ListClientsReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ListClientsReply.ProtoReflect.Descriptor instead. func (*ListClientsReply) Descriptor() ([]byte, []int) { - return file_protos_clients_proto_rawDescGZIP(), []int{1} + return file_protos_clients_proto_rawDescGZIP(), []int{0} } func (x *ListClientsReply) GetClients() []*ClientInfo { @@ -120,7 +83,7 @@ type ClientInfo struct { func (x *ClientInfo) Reset() { *x = ClientInfo{} if protoimpl.UnsafeEnabled { - mi := &file_protos_clients_proto_msgTypes[2] + mi := &file_protos_clients_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -133,7 +96,7 @@ func (x *ClientInfo) String() string { func (*ClientInfo) ProtoMessage() {} func (x *ClientInfo) ProtoReflect() protoreflect.Message { - mi := &file_protos_clients_proto_msgTypes[2] + mi := &file_protos_clients_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -146,7 +109,7 @@ func (x *ClientInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use ClientInfo.ProtoReflect.Descriptor instead. func (*ClientInfo) Descriptor() ([]byte, []int) { - return file_protos_clients_proto_rawDescGZIP(), []int{2} + return file_protos_clients_proto_rawDescGZIP(), []int{1} } func (x *ClientInfo) GetClientId() uint64 { @@ -195,7 +158,7 @@ type UsedShardInfo struct { func (x *UsedShardInfo) Reset() { *x = UsedShardInfo{} if protoimpl.UnsafeEnabled { - mi := &file_protos_clients_proto_msgTypes[3] + mi := &file_protos_clients_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -208,7 +171,7 @@ func (x *UsedShardInfo) String() string { func (*UsedShardInfo) ProtoMessage() {} func (x *UsedShardInfo) ProtoReflect() protoreflect.Message { - mi := &file_protos_clients_proto_msgTypes[3] + mi := &file_protos_clients_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -221,7 +184,7 @@ func (x *UsedShardInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use UsedShardInfo.ProtoReflect.Descriptor instead. func (*UsedShardInfo) Descriptor() ([]byte, []int) { - return file_protos_clients_proto_rawDescGZIP(), []int{3} + return file_protos_clients_proto_rawDescGZIP(), []int{2} } func (x *UsedShardInfo) GetInstance() *DBInstaceInfo { @@ -242,7 +205,7 @@ type DBInstaceInfo struct { func (x *DBInstaceInfo) Reset() { *x = DBInstaceInfo{} if protoimpl.UnsafeEnabled { - mi := &file_protos_clients_proto_msgTypes[4] + mi := &file_protos_clients_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -255,7 +218,7 @@ func (x *DBInstaceInfo) String() string { func (*DBInstaceInfo) ProtoMessage() {} func (x *DBInstaceInfo) ProtoReflect() protoreflect.Message { - mi := &file_protos_clients_proto_msgTypes[4] + mi := &file_protos_clients_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -268,7 +231,7 @@ func (x *DBInstaceInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use DBInstaceInfo.ProtoReflect.Descriptor instead. func (*DBInstaceInfo) Descriptor() ([]byte, []int) { - return file_protos_clients_proto_rawDescGZIP(), []int{4} + return file_protos_clients_proto_rawDescGZIP(), []int{3} } func (x *DBInstaceInfo) GetHostname() string { @@ -282,36 +245,37 @@ var File_protos_clients_proto protoreflect.FileDescriptor var file_protos_clients_proto_rawDesc = []byte{ 0x0a, 0x14, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0x14, 0x0a, 0x12, - 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x3e, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, - 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2a, 0x0a, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, - 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x43, - 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x73, 0x22, 0x9a, 0x01, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, - 0x6f, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x12, - 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, - 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x62, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x06, 0x64, 0x62, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x73, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x73, 0x6e, 0x61, - 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x55, 0x73, 0x65, 0x64, 0x53, 0x68, - 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, - 0x40, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, - 0x12, 0x2f, 0x0a, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x73, 0x74, - 0x61, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, - 0x65, 0x22, 0x2b, 0x0a, 0x0d, 0x44, 0x42, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x63, 0x65, 0x49, 0x6e, - 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0x56, - 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x53, 0x65, 0x72, 0x76, - 0x69, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, - 0x74, 0x73, 0x12, 0x18, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, - 0x69, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x52, - 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, + 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3e, 0x0a, 0x10, 0x4c, 0x69, 0x73, + 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2a, 0x0a, + 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, + 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x07, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x9a, 0x01, 0x0a, 0x0a, 0x43, 0x6c, + 0x69, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x62, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x62, 0x6e, 0x61, 0x6d, + 0x65, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x73, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x64, 0x73, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x06, 0x73, 0x68, 0x61, + 0x72, 0x64, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, + 0x2e, 0x55, 0x73, 0x65, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, + 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x40, 0x0a, 0x0d, 0x55, 0x73, 0x65, 0x64, 0x53, 0x68, + 0x61, 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x2f, 0x0a, 0x08, 0x69, 0x6e, 0x73, 0x74, 0x61, + 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, + 0x2e, 0x44, 0x42, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, + 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x22, 0x2b, 0x0a, 0x0d, 0x44, 0x42, 0x49, 0x6e, + 0x73, 0x74, 0x61, 0x63, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1a, 0x0a, 0x08, 0x68, 0x6f, 0x73, + 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x68, 0x6f, 0x73, + 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x32, 0x54, 0x0a, 0x11, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, + 0x6e, 0x66, 0x6f, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3f, 0x0a, 0x0b, 0x4c, 0x69, + 0x73, 0x74, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, + 0x79, 0x1a, 0x16, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x43, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, + 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( @@ -326,20 +290,20 @@ func file_protos_clients_proto_rawDescGZIP() []byte { return file_protos_clients_proto_rawDescData } -var file_protos_clients_proto_msgTypes = make([]protoimpl.MessageInfo, 5) +var file_protos_clients_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_protos_clients_proto_goTypes = []interface{}{ - (*ListClientsRequest)(nil), // 0: spqr.ListClientsRequest - (*ListClientsReply)(nil), // 1: spqr.ListClientsReply - (*ClientInfo)(nil), // 2: spqr.ClientInfo - (*UsedShardInfo)(nil), // 3: spqr.UsedShardInfo - (*DBInstaceInfo)(nil), // 4: spqr.DBInstaceInfo + (*ListClientsReply)(nil), // 0: spqr.ListClientsReply + (*ClientInfo)(nil), // 1: spqr.ClientInfo + (*UsedShardInfo)(nil), // 2: spqr.UsedShardInfo + (*DBInstaceInfo)(nil), // 3: spqr.DBInstaceInfo + (*emptypb.Empty)(nil), // 4: google.protobuf.Empty } var file_protos_clients_proto_depIdxs = []int32{ - 2, // 0: spqr.ListClientsReply.clients:type_name -> spqr.ClientInfo - 3, // 1: spqr.ClientInfo.shards:type_name -> spqr.UsedShardInfo - 4, // 2: spqr.UsedShardInfo.instance:type_name -> spqr.DBInstaceInfo - 0, // 3: spqr.ClientInfoService.ListClients:input_type -> spqr.ListClientsRequest - 1, // 4: spqr.ClientInfoService.ListClients:output_type -> spqr.ListClientsReply + 1, // 0: spqr.ListClientsReply.clients:type_name -> spqr.ClientInfo + 2, // 1: spqr.ClientInfo.shards:type_name -> spqr.UsedShardInfo + 3, // 2: spqr.UsedShardInfo.instance:type_name -> spqr.DBInstaceInfo + 4, // 3: spqr.ClientInfoService.ListClients:input_type -> google.protobuf.Empty + 0, // 4: spqr.ClientInfoService.ListClients:output_type -> spqr.ListClientsReply 4, // [4:5] is the sub-list for method output_type 3, // [3:4] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -354,18 +318,6 @@ func file_protos_clients_proto_init() { } if !protoimpl.UnsafeEnabled { file_protos_clients_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListClientsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_clients_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListClientsReply); i { case 0: return &v.state @@ -377,7 +329,7 @@ func file_protos_clients_proto_init() { return nil } } - file_protos_clients_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_protos_clients_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ClientInfo); i { case 0: return &v.state @@ -389,7 +341,7 @@ func file_protos_clients_proto_init() { return nil } } - file_protos_clients_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_protos_clients_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UsedShardInfo); i { case 0: return &v.state @@ -401,7 +353,7 @@ func file_protos_clients_proto_init() { return nil } } - file_protos_clients_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_protos_clients_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBInstaceInfo); i { case 0: return &v.state @@ -420,7 +372,7 @@ func file_protos_clients_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_clients_proto_rawDesc, NumEnums: 0, - NumMessages: 5, + NumMessages: 4, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/clients_grpc.pb.go b/pkg/protos/clients_grpc.pb.go index adfe60df6..6c62d27ff 100644 --- a/pkg/protos/clients_grpc.pb.go +++ b/pkg/protos/clients_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -26,7 +27,7 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ClientInfoServiceClient interface { - ListClients(ctx context.Context, in *ListClientsRequest, opts ...grpc.CallOption) (*ListClientsReply, error) + ListClients(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListClientsReply, error) } type clientInfoServiceClient struct { @@ -37,7 +38,7 @@ func NewClientInfoServiceClient(cc grpc.ClientConnInterface) ClientInfoServiceCl return &clientInfoServiceClient{cc} } -func (c *clientInfoServiceClient) ListClients(ctx context.Context, in *ListClientsRequest, opts ...grpc.CallOption) (*ListClientsReply, error) { +func (c *clientInfoServiceClient) ListClients(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListClientsReply, error) { out := new(ListClientsReply) err := c.cc.Invoke(ctx, ClientInfoService_ListClients_FullMethodName, in, out, opts...) if err != nil { @@ -50,7 +51,7 @@ func (c *clientInfoServiceClient) ListClients(ctx context.Context, in *ListClien // All implementations must embed UnimplementedClientInfoServiceServer // for forward compatibility type ClientInfoServiceServer interface { - ListClients(context.Context, *ListClientsRequest) (*ListClientsReply, error) + ListClients(context.Context, *emptypb.Empty) (*ListClientsReply, error) mustEmbedUnimplementedClientInfoServiceServer() } @@ -58,7 +59,7 @@ type ClientInfoServiceServer interface { type UnimplementedClientInfoServiceServer struct { } -func (UnimplementedClientInfoServiceServer) ListClients(context.Context, *ListClientsRequest) (*ListClientsReply, error) { +func (UnimplementedClientInfoServiceServer) ListClients(context.Context, *emptypb.Empty) (*ListClientsReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListClients not implemented") } func (UnimplementedClientInfoServiceServer) mustEmbedUnimplementedClientInfoServiceServer() {} @@ -75,7 +76,7 @@ func RegisterClientInfoServiceServer(s grpc.ServiceRegistrar, srv ClientInfoServ } func _ClientInfoService_ListClients_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListClientsRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -87,7 +88,7 @@ func _ClientInfoService_ListClients_Handler(srv interface{}, ctx context.Context FullMethod: ClientInfoService_ListClients_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ClientInfoServiceServer).ListClients(ctx, req.(*ListClientsRequest)) + return srv.(ClientInfoServiceServer).ListClients(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/coordinator.pb.go b/pkg/protos/coordinator.pb.go index 58ded64a5..66a91e49e 100644 --- a/pkg/protos/coordinator.pb.go +++ b/pkg/protos/coordinator.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -20,196 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type OpenRouterRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *OpenRouterRequest) Reset() { - *x = OpenRouterRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *OpenRouterRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*OpenRouterRequest) ProtoMessage() {} - -func (x *OpenRouterRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use OpenRouterRequest.ProtoReflect.Descriptor instead. -func (*OpenRouterRequest) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{0} -} - -type OpenRouterReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *OpenRouterReply) Reset() { - *x = OpenRouterReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *OpenRouterReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*OpenRouterReply) ProtoMessage() {} - -func (x *OpenRouterReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use OpenRouterReply.ProtoReflect.Descriptor instead. -func (*OpenRouterReply) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{1} -} - -type CloseRouterRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CloseRouterRequest) Reset() { - *x = CloseRouterRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CloseRouterRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CloseRouterRequest) ProtoMessage() {} - -func (x *CloseRouterRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CloseRouterRequest.ProtoReflect.Descriptor instead. -func (*CloseRouterRequest) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{2} -} - -type CloseRouterReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CloseRouterReply) Reset() { - *x = CloseRouterReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CloseRouterReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CloseRouterReply) ProtoMessage() {} - -func (x *CloseRouterReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CloseRouterReply.ProtoReflect.Descriptor instead. -func (*CloseRouterReply) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{3} -} - -type GetRouterStatusRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *GetRouterStatusRequest) Reset() { - *x = GetRouterStatusRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GetRouterStatusRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetRouterStatusRequest) ProtoMessage() {} - -func (x *GetRouterStatusRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GetRouterStatusRequest.ProtoReflect.Descriptor instead. -func (*GetRouterStatusRequest) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{4} -} - type GetRouterStatusReply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -221,7 +32,7 @@ type GetRouterStatusReply struct { func (x *GetRouterStatusReply) Reset() { *x = GetRouterStatusReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[5] + mi := &file_protos_coordinator_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -234,7 +45,7 @@ func (x *GetRouterStatusReply) String() string { func (*GetRouterStatusReply) ProtoMessage() {} func (x *GetRouterStatusReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[5] + mi := &file_protos_coordinator_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -247,7 +58,7 @@ func (x *GetRouterStatusReply) ProtoReflect() protoreflect.Message { // Deprecated: Use GetRouterStatusReply.ProtoReflect.Descriptor instead. func (*GetRouterStatusReply) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{5} + return file_protos_coordinator_proto_rawDescGZIP(), []int{0} } func (x *GetRouterStatusReply) GetStatus() RouterStatus { @@ -268,7 +79,7 @@ type UpdateCoordinatorRequest struct { func (x *UpdateCoordinatorRequest) Reset() { *x = UpdateCoordinatorRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[6] + mi := &file_protos_coordinator_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -281,7 +92,7 @@ func (x *UpdateCoordinatorRequest) String() string { func (*UpdateCoordinatorRequest) ProtoMessage() {} func (x *UpdateCoordinatorRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[6] + mi := &file_protos_coordinator_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -294,7 +105,7 @@ func (x *UpdateCoordinatorRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UpdateCoordinatorRequest.ProtoReflect.Descriptor instead. func (*UpdateCoordinatorRequest) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{6} + return file_protos_coordinator_proto_rawDescGZIP(), []int{1} } func (x *UpdateCoordinatorRequest) GetAddress() string { @@ -304,82 +115,6 @@ func (x *UpdateCoordinatorRequest) GetAddress() string { return "" } -type UpdateCoordinatorResponse struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *UpdateCoordinatorResponse) Reset() { - *x = UpdateCoordinatorResponse{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *UpdateCoordinatorResponse) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*UpdateCoordinatorResponse) ProtoMessage() {} - -func (x *UpdateCoordinatorResponse) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use UpdateCoordinatorResponse.ProtoReflect.Descriptor instead. -func (*UpdateCoordinatorResponse) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{7} -} - -type GetCoordinatorRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *GetCoordinatorRequest) Reset() { - *x = GetCoordinatorRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GetCoordinatorRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetCoordinatorRequest) ProtoMessage() {} - -func (x *GetCoordinatorRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GetCoordinatorRequest.ProtoReflect.Descriptor instead. -func (*GetCoordinatorRequest) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{8} -} - type GetCoordinatorResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -391,7 +126,7 @@ type GetCoordinatorResponse struct { func (x *GetCoordinatorResponse) Reset() { *x = GetCoordinatorResponse{} if protoimpl.UnsafeEnabled { - mi := &file_protos_coordinator_proto_msgTypes[9] + mi := &file_protos_coordinator_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -404,7 +139,7 @@ func (x *GetCoordinatorResponse) String() string { func (*GetCoordinatorResponse) ProtoMessage() {} func (x *GetCoordinatorResponse) ProtoReflect() protoreflect.Message { - mi := &file_protos_coordinator_proto_msgTypes[9] + mi := &file_protos_coordinator_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -417,7 +152,7 @@ func (x *GetCoordinatorResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use GetCoordinatorResponse.ProtoReflect.Descriptor instead. func (*GetCoordinatorResponse) Descriptor() ([]byte, []int) { - return file_protos_coordinator_proto_rawDescGZIP(), []int{9} + return file_protos_coordinator_proto_rawDescGZIP(), []int{2} } func (x *GetCoordinatorResponse) GetAddress() string { @@ -432,55 +167,45 @@ var File_protos_coordinator_proto protoreflect.FileDescriptor var file_protos_coordinator_proto_rawDesc = []byte{ 0x0a, 0x18, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, - 0x1a, 0x13, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x4f, 0x70, 0x65, 0x6e, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x11, 0x0a, 0x0f, 0x4f, 0x70, - 0x65, 0x6e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x14, 0x0a, - 0x12, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x18, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x22, 0x42, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, - 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2a, 0x0a, 0x06, 0x73, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, - 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x34, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, - 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x1b, 0x0a, 0x19, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x17, 0x0a, 0x15, 0x47, 0x65, 0x74, 0x43, - 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x22, 0x32, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, - 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, - 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x32, 0x8a, 0x03, 0x0a, 0x0f, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, - 0x67, 0x79, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x0a, 0x4f, 0x70, 0x65, - 0x6e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x17, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4f, - 0x70, 0x65, 0x6e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x15, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0f, 0x47, 0x65, 0x74, - 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, - 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, - 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x0b, 0x43, 0x6c, 0x6f, 0x73, - 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x18, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x43, - 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x16, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x56, 0x0a, 0x11, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, - 0x12, 0x1e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, - 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, - 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, - 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x1b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, + 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x13, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x22, 0x42, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, + 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2a, 0x0a, 0x06, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, + 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, + 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x34, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6f, - 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x32, 0x0a, 0x16, + 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x32, 0xf4, 0x02, 0x0a, 0x0f, 0x54, 0x6f, 0x70, 0x6f, 0x6c, 0x6f, 0x67, 0x79, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x0a, 0x4f, 0x70, 0x65, 0x6e, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x72, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, + 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, + 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3f, 0x0a, + 0x0b, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x4d, + 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, + 0x74, 0x6f, 0x72, 0x12, 0x1e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x65, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x48, 0x0a, + 0x0e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x12, + 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, + 0x65, 0x74, 0x43, 0x6f, 0x6f, 0x72, 0x64, 0x69, 0x6e, 0x61, 0x74, 0x6f, 0x72, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -495,37 +220,31 @@ func file_protos_coordinator_proto_rawDescGZIP() []byte { return file_protos_coordinator_proto_rawDescData } -var file_protos_coordinator_proto_msgTypes = make([]protoimpl.MessageInfo, 10) +var file_protos_coordinator_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_protos_coordinator_proto_goTypes = []interface{}{ - (*OpenRouterRequest)(nil), // 0: spqr.OpenRouterRequest - (*OpenRouterReply)(nil), // 1: spqr.OpenRouterReply - (*CloseRouterRequest)(nil), // 2: spqr.CloseRouterRequest - (*CloseRouterReply)(nil), // 3: spqr.CloseRouterReply - (*GetRouterStatusRequest)(nil), // 4: spqr.GetRouterStatusRequest - (*GetRouterStatusReply)(nil), // 5: spqr.GetRouterStatusReply - (*UpdateCoordinatorRequest)(nil), // 6: spqr.UpdateCoordinatorRequest - (*UpdateCoordinatorResponse)(nil), // 7: spqr.UpdateCoordinatorResponse - (*GetCoordinatorRequest)(nil), // 8: spqr.GetCoordinatorRequest - (*GetCoordinatorResponse)(nil), // 9: spqr.GetCoordinatorResponse - (RouterStatus)(0), // 10: spqr.RouterStatus + (*GetRouterStatusReply)(nil), // 0: spqr.GetRouterStatusReply + (*UpdateCoordinatorRequest)(nil), // 1: spqr.UpdateCoordinatorRequest + (*GetCoordinatorResponse)(nil), // 2: spqr.GetCoordinatorResponse + (RouterStatus)(0), // 3: spqr.RouterStatus + (*emptypb.Empty)(nil), // 4: google.protobuf.Empty } var file_protos_coordinator_proto_depIdxs = []int32{ - 10, // 0: spqr.GetRouterStatusReply.status:type_name -> spqr.RouterStatus - 0, // 1: spqr.TopologyService.OpenRouter:input_type -> spqr.OpenRouterRequest - 4, // 2: spqr.TopologyService.GetRouterStatus:input_type -> spqr.GetRouterStatusRequest - 2, // 3: spqr.TopologyService.CloseRouter:input_type -> spqr.CloseRouterRequest - 6, // 4: spqr.TopologyService.UpdateCoordinator:input_type -> spqr.UpdateCoordinatorRequest - 8, // 5: spqr.TopologyService.GetCoordinator:input_type -> spqr.GetCoordinatorRequest - 1, // 6: spqr.TopologyService.OpenRouter:output_type -> spqr.OpenRouterReply - 5, // 7: spqr.TopologyService.GetRouterStatus:output_type -> spqr.GetRouterStatusReply - 3, // 8: spqr.TopologyService.CloseRouter:output_type -> spqr.CloseRouterReply - 7, // 9: spqr.TopologyService.UpdateCoordinator:output_type -> spqr.UpdateCoordinatorResponse - 9, // 10: spqr.TopologyService.GetCoordinator:output_type -> spqr.GetCoordinatorResponse - 6, // [6:11] is the sub-list for method output_type - 1, // [1:6] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 3, // 0: spqr.GetRouterStatusReply.status:type_name -> spqr.RouterStatus + 4, // 1: spqr.TopologyService.OpenRouter:input_type -> google.protobuf.Empty + 4, // 2: spqr.TopologyService.GetRouterStatus:input_type -> google.protobuf.Empty + 4, // 3: spqr.TopologyService.CloseRouter:input_type -> google.protobuf.Empty + 1, // 4: spqr.TopologyService.UpdateCoordinator:input_type -> spqr.UpdateCoordinatorRequest + 4, // 5: spqr.TopologyService.GetCoordinator:input_type -> google.protobuf.Empty + 4, // 6: spqr.TopologyService.OpenRouter:output_type -> google.protobuf.Empty + 0, // 7: spqr.TopologyService.GetRouterStatus:output_type -> spqr.GetRouterStatusReply + 4, // 8: spqr.TopologyService.CloseRouter:output_type -> google.protobuf.Empty + 4, // 9: spqr.TopologyService.UpdateCoordinator:output_type -> google.protobuf.Empty + 2, // 10: spqr.TopologyService.GetCoordinator:output_type -> spqr.GetCoordinatorResponse + 6, // [6:11] is the sub-list for method output_type + 1, // [1:6] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name } func init() { file_protos_coordinator_proto_init() } @@ -536,66 +255,6 @@ func file_protos_coordinator_proto_init() { file_protos_router_proto_init() if !protoimpl.UnsafeEnabled { file_protos_coordinator_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpenRouterRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*OpenRouterReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CloseRouterRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CloseRouterReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetRouterStatusRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetRouterStatusReply); i { case 0: return &v.state @@ -607,7 +266,7 @@ func file_protos_coordinator_proto_init() { return nil } } - file_protos_coordinator_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_protos_coordinator_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UpdateCoordinatorRequest); i { case 0: return &v.state @@ -619,31 +278,7 @@ func file_protos_coordinator_proto_init() { return nil } } - file_protos_coordinator_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*UpdateCoordinatorResponse); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetCoordinatorRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_coordinator_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_protos_coordinator_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetCoordinatorResponse); i { case 0: return &v.state @@ -662,7 +297,7 @@ func file_protos_coordinator_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_coordinator_proto_rawDesc, NumEnums: 0, - NumMessages: 10, + NumMessages: 3, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/coordinator_grpc.pb.go b/pkg/protos/coordinator_grpc.pb.go index 746c6c83c..5428961cd 100644 --- a/pkg/protos/coordinator_grpc.pb.go +++ b/pkg/protos/coordinator_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -30,11 +31,11 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TopologyServiceClient interface { - OpenRouter(ctx context.Context, in *OpenRouterRequest, opts ...grpc.CallOption) (*OpenRouterReply, error) - GetRouterStatus(ctx context.Context, in *GetRouterStatusRequest, opts ...grpc.CallOption) (*GetRouterStatusReply, error) - CloseRouter(ctx context.Context, in *CloseRouterRequest, opts ...grpc.CallOption) (*CloseRouterReply, error) - UpdateCoordinator(ctx context.Context, in *UpdateCoordinatorRequest, opts ...grpc.CallOption) (*UpdateCoordinatorResponse, error) - GetCoordinator(ctx context.Context, in *GetCoordinatorRequest, opts ...grpc.CallOption) (*GetCoordinatorResponse, error) + OpenRouter(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) + GetRouterStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetRouterStatusReply, error) + CloseRouter(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) + UpdateCoordinator(ctx context.Context, in *UpdateCoordinatorRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + GetCoordinator(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetCoordinatorResponse, error) } type topologyServiceClient struct { @@ -45,8 +46,8 @@ func NewTopologyServiceClient(cc grpc.ClientConnInterface) TopologyServiceClient return &topologyServiceClient{cc} } -func (c *topologyServiceClient) OpenRouter(ctx context.Context, in *OpenRouterRequest, opts ...grpc.CallOption) (*OpenRouterReply, error) { - out := new(OpenRouterReply) +func (c *topologyServiceClient) OpenRouter(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TopologyService_OpenRouter_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -54,7 +55,7 @@ func (c *topologyServiceClient) OpenRouter(ctx context.Context, in *OpenRouterRe return out, nil } -func (c *topologyServiceClient) GetRouterStatus(ctx context.Context, in *GetRouterStatusRequest, opts ...grpc.CallOption) (*GetRouterStatusReply, error) { +func (c *topologyServiceClient) GetRouterStatus(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetRouterStatusReply, error) { out := new(GetRouterStatusReply) err := c.cc.Invoke(ctx, TopologyService_GetRouterStatus_FullMethodName, in, out, opts...) if err != nil { @@ -63,8 +64,8 @@ func (c *topologyServiceClient) GetRouterStatus(ctx context.Context, in *GetRout return out, nil } -func (c *topologyServiceClient) CloseRouter(ctx context.Context, in *CloseRouterRequest, opts ...grpc.CallOption) (*CloseRouterReply, error) { - out := new(CloseRouterReply) +func (c *topologyServiceClient) CloseRouter(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TopologyService_CloseRouter_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -72,8 +73,8 @@ func (c *topologyServiceClient) CloseRouter(ctx context.Context, in *CloseRouter return out, nil } -func (c *topologyServiceClient) UpdateCoordinator(ctx context.Context, in *UpdateCoordinatorRequest, opts ...grpc.CallOption) (*UpdateCoordinatorResponse, error) { - out := new(UpdateCoordinatorResponse) +func (c *topologyServiceClient) UpdateCoordinator(ctx context.Context, in *UpdateCoordinatorRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TopologyService_UpdateCoordinator_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -81,7 +82,7 @@ func (c *topologyServiceClient) UpdateCoordinator(ctx context.Context, in *Updat return out, nil } -func (c *topologyServiceClient) GetCoordinator(ctx context.Context, in *GetCoordinatorRequest, opts ...grpc.CallOption) (*GetCoordinatorResponse, error) { +func (c *topologyServiceClient) GetCoordinator(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetCoordinatorResponse, error) { out := new(GetCoordinatorResponse) err := c.cc.Invoke(ctx, TopologyService_GetCoordinator_FullMethodName, in, out, opts...) if err != nil { @@ -94,11 +95,11 @@ func (c *topologyServiceClient) GetCoordinator(ctx context.Context, in *GetCoord // All implementations must embed UnimplementedTopologyServiceServer // for forward compatibility type TopologyServiceServer interface { - OpenRouter(context.Context, *OpenRouterRequest) (*OpenRouterReply, error) - GetRouterStatus(context.Context, *GetRouterStatusRequest) (*GetRouterStatusReply, error) - CloseRouter(context.Context, *CloseRouterRequest) (*CloseRouterReply, error) - UpdateCoordinator(context.Context, *UpdateCoordinatorRequest) (*UpdateCoordinatorResponse, error) - GetCoordinator(context.Context, *GetCoordinatorRequest) (*GetCoordinatorResponse, error) + OpenRouter(context.Context, *emptypb.Empty) (*emptypb.Empty, error) + GetRouterStatus(context.Context, *emptypb.Empty) (*GetRouterStatusReply, error) + CloseRouter(context.Context, *emptypb.Empty) (*emptypb.Empty, error) + UpdateCoordinator(context.Context, *UpdateCoordinatorRequest) (*emptypb.Empty, error) + GetCoordinator(context.Context, *emptypb.Empty) (*GetCoordinatorResponse, error) mustEmbedUnimplementedTopologyServiceServer() } @@ -106,19 +107,19 @@ type TopologyServiceServer interface { type UnimplementedTopologyServiceServer struct { } -func (UnimplementedTopologyServiceServer) OpenRouter(context.Context, *OpenRouterRequest) (*OpenRouterReply, error) { +func (UnimplementedTopologyServiceServer) OpenRouter(context.Context, *emptypb.Empty) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method OpenRouter not implemented") } -func (UnimplementedTopologyServiceServer) GetRouterStatus(context.Context, *GetRouterStatusRequest) (*GetRouterStatusReply, error) { +func (UnimplementedTopologyServiceServer) GetRouterStatus(context.Context, *emptypb.Empty) (*GetRouterStatusReply, error) { return nil, status.Errorf(codes.Unimplemented, "method GetRouterStatus not implemented") } -func (UnimplementedTopologyServiceServer) CloseRouter(context.Context, *CloseRouterRequest) (*CloseRouterReply, error) { +func (UnimplementedTopologyServiceServer) CloseRouter(context.Context, *emptypb.Empty) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method CloseRouter not implemented") } -func (UnimplementedTopologyServiceServer) UpdateCoordinator(context.Context, *UpdateCoordinatorRequest) (*UpdateCoordinatorResponse, error) { +func (UnimplementedTopologyServiceServer) UpdateCoordinator(context.Context, *UpdateCoordinatorRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateCoordinator not implemented") } -func (UnimplementedTopologyServiceServer) GetCoordinator(context.Context, *GetCoordinatorRequest) (*GetCoordinatorResponse, error) { +func (UnimplementedTopologyServiceServer) GetCoordinator(context.Context, *emptypb.Empty) (*GetCoordinatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetCoordinator not implemented") } func (UnimplementedTopologyServiceServer) mustEmbedUnimplementedTopologyServiceServer() {} @@ -135,7 +136,7 @@ func RegisterTopologyServiceServer(s grpc.ServiceRegistrar, srv TopologyServiceS } func _TopologyService_OpenRouter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(OpenRouterRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -147,13 +148,13 @@ func _TopologyService_OpenRouter_Handler(srv interface{}, ctx context.Context, d FullMethod: TopologyService_OpenRouter_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TopologyServiceServer).OpenRouter(ctx, req.(*OpenRouterRequest)) + return srv.(TopologyServiceServer).OpenRouter(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _TopologyService_GetRouterStatus_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetRouterStatusRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -165,13 +166,13 @@ func _TopologyService_GetRouterStatus_Handler(srv interface{}, ctx context.Conte FullMethod: TopologyService_GetRouterStatus_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TopologyServiceServer).GetRouterStatus(ctx, req.(*GetRouterStatusRequest)) + return srv.(TopologyServiceServer).GetRouterStatus(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } func _TopologyService_CloseRouter_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(CloseRouterRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -183,7 +184,7 @@ func _TopologyService_CloseRouter_Handler(srv interface{}, ctx context.Context, FullMethod: TopologyService_CloseRouter_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TopologyServiceServer).CloseRouter(ctx, req.(*CloseRouterRequest)) + return srv.(TopologyServiceServer).CloseRouter(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -207,7 +208,7 @@ func _TopologyService_UpdateCoordinator_Handler(srv interface{}, ctx context.Con } func _TopologyService_GetCoordinator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetCoordinatorRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -219,7 +220,7 @@ func _TopologyService_GetCoordinator_Handler(srv interface{}, ctx context.Contex FullMethod: TopologyService_GetCoordinator_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TopologyServiceServer).GetCoordinator(ctx, req.(*GetCoordinatorRequest)) + return srv.(TopologyServiceServer).GetCoordinator(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/distribution.pb.go b/pkg/protos/distribution.pb.go index 3d9595abf..853af6e04 100644 --- a/pkg/protos/distribution.pb.go +++ b/pkg/protos/distribution.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -248,82 +249,6 @@ func (x *CreateDistributionRequest) GetDistributions() []*Distribution { return nil } -type CreateDistributionReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *CreateDistributionReply) Reset() { - *x = CreateDistributionReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[4] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *CreateDistributionReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*CreateDistributionReply) ProtoMessage() {} - -func (x *CreateDistributionReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[4] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use CreateDistributionReply.ProtoReflect.Descriptor instead. -func (*CreateDistributionReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{4} -} - -type ListDistributionsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListDistributionsRequest) Reset() { - *x = ListDistributionsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListDistributionsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListDistributionsRequest) ProtoMessage() {} - -func (x *ListDistributionsRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListDistributionsRequest.ProtoReflect.Descriptor instead. -func (*ListDistributionsRequest) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{5} -} - type ListDistributionsReply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -335,7 +260,7 @@ type ListDistributionsReply struct { func (x *ListDistributionsReply) Reset() { *x = ListDistributionsReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[6] + mi := &file_protos_distribution_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -348,7 +273,7 @@ func (x *ListDistributionsReply) String() string { func (*ListDistributionsReply) ProtoMessage() {} func (x *ListDistributionsReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[6] + mi := &file_protos_distribution_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -361,7 +286,7 @@ func (x *ListDistributionsReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ListDistributionsReply.ProtoReflect.Descriptor instead. func (*ListDistributionsReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{6} + return file_protos_distribution_proto_rawDescGZIP(), []int{4} } func (x *ListDistributionsReply) GetDistributions() []*Distribution { @@ -382,7 +307,7 @@ type DropDistributionRequest struct { func (x *DropDistributionRequest) Reset() { *x = DropDistributionRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[7] + mi := &file_protos_distribution_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -395,7 +320,7 @@ func (x *DropDistributionRequest) String() string { func (*DropDistributionRequest) ProtoMessage() {} func (x *DropDistributionRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[7] + mi := &file_protos_distribution_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -408,7 +333,7 @@ func (x *DropDistributionRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DropDistributionRequest.ProtoReflect.Descriptor instead. func (*DropDistributionRequest) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{7} + return file_protos_distribution_proto_rawDescGZIP(), []int{5} } func (x *DropDistributionRequest) GetIds() []string { @@ -418,44 +343,6 @@ func (x *DropDistributionRequest) GetIds() []string { return nil } -type DropDistributionReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *DropDistributionReply) Reset() { - *x = DropDistributionReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DropDistributionReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DropDistributionReply) ProtoMessage() {} - -func (x *DropDistributionReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DropDistributionReply.ProtoReflect.Descriptor instead. -func (*DropDistributionReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{8} -} - type AlterDistributionAttachRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -469,7 +356,7 @@ type AlterDistributionAttachRequest struct { func (x *AlterDistributionAttachRequest) Reset() { *x = AlterDistributionAttachRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[9] + mi := &file_protos_distribution_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -482,7 +369,7 @@ func (x *AlterDistributionAttachRequest) String() string { func (*AlterDistributionAttachRequest) ProtoMessage() {} func (x *AlterDistributionAttachRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[9] + mi := &file_protos_distribution_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -495,7 +382,7 @@ func (x *AlterDistributionAttachRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AlterDistributionAttachRequest.ProtoReflect.Descriptor instead. func (*AlterDistributionAttachRequest) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{9} + return file_protos_distribution_proto_rawDescGZIP(), []int{6} } func (x *AlterDistributionAttachRequest) GetId() string { @@ -519,44 +406,6 @@ func (x *AlterDistributionAttachRequest) GetRelations() []*DistributedRelation { return nil } -type AlterDistributionAttachReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *AlterDistributionAttachReply) Reset() { - *x = AlterDistributionAttachReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[10] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AlterDistributionAttachReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AlterDistributionAttachReply) ProtoMessage() {} - -func (x *AlterDistributionAttachReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[10] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AlterDistributionAttachReply.ProtoReflect.Descriptor instead. -func (*AlterDistributionAttachReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{10} -} - type AlterDistributionDetachRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -569,7 +418,7 @@ type AlterDistributionDetachRequest struct { func (x *AlterDistributionDetachRequest) Reset() { *x = AlterDistributionDetachRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[11] + mi := &file_protos_distribution_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -582,7 +431,7 @@ func (x *AlterDistributionDetachRequest) String() string { func (*AlterDistributionDetachRequest) ProtoMessage() {} func (x *AlterDistributionDetachRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[11] + mi := &file_protos_distribution_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -595,7 +444,7 @@ func (x *AlterDistributionDetachRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AlterDistributionDetachRequest.ProtoReflect.Descriptor instead. func (*AlterDistributionDetachRequest) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{11} + return file_protos_distribution_proto_rawDescGZIP(), []int{7} } func (x *AlterDistributionDetachRequest) GetId() string { @@ -612,44 +461,6 @@ func (x *AlterDistributionDetachRequest) GetRelNames() []string { return nil } -type AlterDistributionDetachReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *AlterDistributionDetachReply) Reset() { - *x = AlterDistributionDetachReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[12] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AlterDistributionDetachReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AlterDistributionDetachReply) ProtoMessage() {} - -func (x *AlterDistributionDetachReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[12] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AlterDistributionDetachReply.ProtoReflect.Descriptor instead. -func (*AlterDistributionDetachReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{12} -} - type GetDistributionRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -661,7 +472,7 @@ type GetDistributionRequest struct { func (x *GetDistributionRequest) Reset() { *x = GetDistributionRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[13] + mi := &file_protos_distribution_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -674,7 +485,7 @@ func (x *GetDistributionRequest) String() string { func (*GetDistributionRequest) ProtoMessage() {} func (x *GetDistributionRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[13] + mi := &file_protos_distribution_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -687,7 +498,7 @@ func (x *GetDistributionRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetDistributionRequest.ProtoReflect.Descriptor instead. func (*GetDistributionRequest) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{13} + return file_protos_distribution_proto_rawDescGZIP(), []int{8} } func (x *GetDistributionRequest) GetId() string { @@ -708,7 +519,7 @@ type GetDistributionReply struct { func (x *GetDistributionReply) Reset() { *x = GetDistributionReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[14] + mi := &file_protos_distribution_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -721,7 +532,7 @@ func (x *GetDistributionReply) String() string { func (*GetDistributionReply) ProtoMessage() {} func (x *GetDistributionReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[14] + mi := &file_protos_distribution_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -734,7 +545,7 @@ func (x *GetDistributionReply) ProtoReflect() protoreflect.Message { // Deprecated: Use GetDistributionReply.ProtoReflect.Descriptor instead. func (*GetDistributionReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{14} + return file_protos_distribution_proto_rawDescGZIP(), []int{9} } func (x *GetDistributionReply) GetDistribution() *Distribution { @@ -755,7 +566,7 @@ type GetRelationDistributionRequest struct { func (x *GetRelationDistributionRequest) Reset() { *x = GetRelationDistributionRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[15] + mi := &file_protos_distribution_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -768,7 +579,7 @@ func (x *GetRelationDistributionRequest) String() string { func (*GetRelationDistributionRequest) ProtoMessage() {} func (x *GetRelationDistributionRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[15] + mi := &file_protos_distribution_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -781,7 +592,7 @@ func (x *GetRelationDistributionRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetRelationDistributionRequest.ProtoReflect.Descriptor instead. func (*GetRelationDistributionRequest) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{15} + return file_protos_distribution_proto_rawDescGZIP(), []int{10} } func (x *GetRelationDistributionRequest) GetId() string { @@ -802,7 +613,7 @@ type GetRelationDistributionReply struct { func (x *GetRelationDistributionReply) Reset() { *x = GetRelationDistributionReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_distribution_proto_msgTypes[16] + mi := &file_protos_distribution_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -815,7 +626,7 @@ func (x *GetRelationDistributionReply) String() string { func (*GetRelationDistributionReply) ProtoMessage() {} func (x *GetRelationDistributionReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_distribution_proto_msgTypes[16] + mi := &file_protos_distribution_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -828,7 +639,7 @@ func (x *GetRelationDistributionReply) ProtoReflect() protoreflect.Message { // Deprecated: Use GetRelationDistributionReply.ProtoReflect.Descriptor instead. func (*GetRelationDistributionReply) Descriptor() ([]byte, []int) { - return file_protos_distribution_proto_rawDescGZIP(), []int{16} + return file_protos_distribution_proto_rawDescGZIP(), []int{11} } func (x *GetRelationDistributionReply) GetDistribution() *Distribution { @@ -843,125 +654,115 @@ var File_protos_distribution_proto protoreflect.FileDescriptor var file_protos_distribution_proto_rawDesc = []byte{ 0x0a, 0x19, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, - 0x72, 0x22, 0x52, 0x0a, 0x14, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x4b, 0x65, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, - 0x75, 0x6d, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, - 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x9f, 0x01, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, - 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, - 0x65, 0x12, 0x44, 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x70, 0x71, - 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, - 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x2e, 0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x08, 0x52, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x52, - 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x79, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, - 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x09, 0x72, 0x65, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x52, - 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x22, 0x55, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x38, 0x0a, 0x0d, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, - 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, - 0x65, 0x70, 0x6c, 0x79, 0x22, 0x1a, 0x0a, 0x18, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x22, 0x52, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x38, 0x0a, 0x0d, 0x64, 0x69, - 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2b, 0x0a, 0x17, 0x44, 0x72, 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, - 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, - 0x73, 0x22, 0x17, 0x0a, 0x15, 0x44, 0x72, 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x8b, 0x01, 0x0a, 0x1e, 0x41, - 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, - 0x0b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, - 0x37, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, - 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x1e, 0x0a, 0x1c, 0x41, 0x6c, 0x74, 0x65, + 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x52, + 0x0a, 0x14, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, + 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x22, + 0x0a, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, + 0x6f, 0x6e, 0x22, 0x9f, 0x01, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x44, + 0x0a, 0x0f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, + 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, + 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x4b, 0x65, 0x79, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x0f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x2e, 0x0a, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, + 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, + 0x52, 0x12, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x79, 0x0a, 0x0c, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, + 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, + 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0x55, 0x0a, 0x19, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0d, + 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, + 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x52, 0x0a, 0x16, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, + 0x12, 0x38, 0x0a, 0x0d, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, + 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0d, 0x64, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x2b, 0x0a, 0x17, 0x44, 0x72, + 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x22, 0x8b, 0x01, 0x0a, 0x1e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x74, 0x74, - 0x61, 0x63, 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x4c, 0x0a, 0x1e, 0x41, 0x6c, 0x74, 0x65, - 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, - 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, - 0x6c, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0x1e, 0x0a, 0x1c, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, - 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x63, - 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x28, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x4e, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, - 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x22, 0x30, 0x0a, 0x1e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, - 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x22, 0x56, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, - 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x64, 0x69, - 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x98, 0x05, 0x0a, 0x13, 0x44, - 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x12, 0x56, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, - 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x50, 0x0a, 0x10, 0x44, 0x72, - 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, - 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, - 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x11, - 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x12, 0x1e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, - 0x00, 0x12, 0x65, 0x0a, 0x17, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, - 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x12, 0x24, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, - 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x74, 0x74, 0x61, 0x63, - 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x65, 0x0a, 0x17, 0x41, 0x6c, 0x74, 0x65, - 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, - 0x61, 0x63, 0x68, 0x12, 0x24, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, - 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, - 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x63, 0x68, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, - 0x4d, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, - 0x6f, 0x6e, 0x12, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x6f, + 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x0b, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x37, 0x0a, 0x09, + 0x72, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x65, 0x64, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x22, 0x4c, 0x0a, 0x1e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x63, 0x68, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x6c, 0x4e, 0x61, + 0x6d, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x6c, 0x4e, 0x61, + 0x6d, 0x65, 0x73, 0x22, 0x28, 0x0a, 0x16, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, + 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4e, 0x0a, + 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, + 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x36, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x30, 0x0a, + 0x1e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, + 0x56, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, + 0x36, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, + 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0xec, 0x04, 0x0a, 0x13, 0x44, 0x69, 0x73, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, + 0x4f, 0x0a, 0x12, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x43, 0x72, 0x65, + 0x61, 0x74, 0x65, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, + 0x12, 0x4b, 0x0a, 0x10, 0x44, 0x72, 0x6f, 0x70, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, + 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x4b, 0x0a, + 0x11, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1c, 0x2e, 0x73, 0x70, 0x71, + 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, + 0x6f, 0x6e, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x59, 0x0a, 0x17, 0x41, 0x6c, + 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, + 0x74, 0x74, 0x61, 0x63, 0x68, 0x12, 0x24, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x6c, 0x74, + 0x65, 0x72, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x41, 0x74, + 0x74, 0x61, 0x63, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, + 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x59, 0x0a, 0x17, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x63, 0x68, + 0x12, 0x24, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x6c, 0x74, 0x65, 0x72, 0x44, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x74, 0x61, 0x63, 0x68, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, + 0x12, 0x4d, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, + 0x65, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x73, 0x70, 0x71, + 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x69, 0x73, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x65, - 0x0a, 0x17, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, - 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x22, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x1a, 0x22, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x52, 0x65, 0x6c, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, + 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -976,25 +777,21 @@ func file_protos_distribution_proto_rawDescGZIP() []byte { return file_protos_distribution_proto_rawDescData } -var file_protos_distribution_proto_msgTypes = make([]protoimpl.MessageInfo, 17) +var file_protos_distribution_proto_msgTypes = make([]protoimpl.MessageInfo, 12) var file_protos_distribution_proto_goTypes = []interface{}{ (*DistributionKeyEntry)(nil), // 0: spqr.DistributionKeyEntry (*DistributedRelation)(nil), // 1: spqr.DistributedRelation (*Distribution)(nil), // 2: spqr.Distribution (*CreateDistributionRequest)(nil), // 3: spqr.CreateDistributionRequest - (*CreateDistributionReply)(nil), // 4: spqr.CreateDistributionReply - (*ListDistributionsRequest)(nil), // 5: spqr.ListDistributionsRequest - (*ListDistributionsReply)(nil), // 6: spqr.ListDistributionsReply - (*DropDistributionRequest)(nil), // 7: spqr.DropDistributionRequest - (*DropDistributionReply)(nil), // 8: spqr.DropDistributionReply - (*AlterDistributionAttachRequest)(nil), // 9: spqr.AlterDistributionAttachRequest - (*AlterDistributionAttachReply)(nil), // 10: spqr.AlterDistributionAttachReply - (*AlterDistributionDetachRequest)(nil), // 11: spqr.AlterDistributionDetachRequest - (*AlterDistributionDetachReply)(nil), // 12: spqr.AlterDistributionDetachReply - (*GetDistributionRequest)(nil), // 13: spqr.GetDistributionRequest - (*GetDistributionReply)(nil), // 14: spqr.GetDistributionReply - (*GetRelationDistributionRequest)(nil), // 15: spqr.GetRelationDistributionRequest - (*GetRelationDistributionReply)(nil), // 16: spqr.GetRelationDistributionReply + (*ListDistributionsReply)(nil), // 4: spqr.ListDistributionsReply + (*DropDistributionRequest)(nil), // 5: spqr.DropDistributionRequest + (*AlterDistributionAttachRequest)(nil), // 6: spqr.AlterDistributionAttachRequest + (*AlterDistributionDetachRequest)(nil), // 7: spqr.AlterDistributionDetachRequest + (*GetDistributionRequest)(nil), // 8: spqr.GetDistributionRequest + (*GetDistributionReply)(nil), // 9: spqr.GetDistributionReply + (*GetRelationDistributionRequest)(nil), // 10: spqr.GetRelationDistributionRequest + (*GetRelationDistributionReply)(nil), // 11: spqr.GetRelationDistributionReply + (*emptypb.Empty)(nil), // 12: google.protobuf.Empty } var file_protos_distribution_proto_depIdxs = []int32{ 0, // 0: spqr.DistributedRelation.distributionKey:type_name -> spqr.DistributionKeyEntry @@ -1005,19 +802,19 @@ var file_protos_distribution_proto_depIdxs = []int32{ 2, // 5: spqr.GetDistributionReply.distribution:type_name -> spqr.Distribution 2, // 6: spqr.GetRelationDistributionReply.distribution:type_name -> spqr.Distribution 3, // 7: spqr.DistributionService.CreateDistribution:input_type -> spqr.CreateDistributionRequest - 7, // 8: spqr.DistributionService.DropDistribution:input_type -> spqr.DropDistributionRequest - 5, // 9: spqr.DistributionService.ListDistributions:input_type -> spqr.ListDistributionsRequest - 9, // 10: spqr.DistributionService.AlterDistributionAttach:input_type -> spqr.AlterDistributionAttachRequest - 11, // 11: spqr.DistributionService.AlterDistributionDetach:input_type -> spqr.AlterDistributionDetachRequest - 13, // 12: spqr.DistributionService.GetDistribution:input_type -> spqr.GetDistributionRequest - 15, // 13: spqr.DistributionService.GetRelationDistribution:input_type -> spqr.GetRelationDistributionRequest - 4, // 14: spqr.DistributionService.CreateDistribution:output_type -> spqr.CreateDistributionReply - 8, // 15: spqr.DistributionService.DropDistribution:output_type -> spqr.DropDistributionReply - 6, // 16: spqr.DistributionService.ListDistributions:output_type -> spqr.ListDistributionsReply - 10, // 17: spqr.DistributionService.AlterDistributionAttach:output_type -> spqr.AlterDistributionAttachReply - 12, // 18: spqr.DistributionService.AlterDistributionDetach:output_type -> spqr.AlterDistributionDetachReply - 14, // 19: spqr.DistributionService.GetDistribution:output_type -> spqr.GetDistributionReply - 16, // 20: spqr.DistributionService.GetRelationDistribution:output_type -> spqr.GetRelationDistributionReply + 5, // 8: spqr.DistributionService.DropDistribution:input_type -> spqr.DropDistributionRequest + 12, // 9: spqr.DistributionService.ListDistributions:input_type -> google.protobuf.Empty + 6, // 10: spqr.DistributionService.AlterDistributionAttach:input_type -> spqr.AlterDistributionAttachRequest + 7, // 11: spqr.DistributionService.AlterDistributionDetach:input_type -> spqr.AlterDistributionDetachRequest + 8, // 12: spqr.DistributionService.GetDistribution:input_type -> spqr.GetDistributionRequest + 10, // 13: spqr.DistributionService.GetRelationDistribution:input_type -> spqr.GetRelationDistributionRequest + 12, // 14: spqr.DistributionService.CreateDistribution:output_type -> google.protobuf.Empty + 12, // 15: spqr.DistributionService.DropDistribution:output_type -> google.protobuf.Empty + 4, // 16: spqr.DistributionService.ListDistributions:output_type -> spqr.ListDistributionsReply + 12, // 17: spqr.DistributionService.AlterDistributionAttach:output_type -> google.protobuf.Empty + 12, // 18: spqr.DistributionService.AlterDistributionDetach:output_type -> google.protobuf.Empty + 9, // 19: spqr.DistributionService.GetDistribution:output_type -> spqr.GetDistributionReply + 11, // 20: spqr.DistributionService.GetRelationDistribution:output_type -> spqr.GetRelationDistributionReply 14, // [14:21] is the sub-list for method output_type 7, // [7:14] is the sub-list for method input_type 7, // [7:7] is the sub-list for extension type_name @@ -1080,30 +877,6 @@ func file_protos_distribution_proto_init() { } } file_protos_distribution_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*CreateDistributionReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_distribution_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListDistributionsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_distribution_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListDistributionsReply); i { case 0: return &v.state @@ -1115,7 +888,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DropDistributionRequest); i { case 0: return &v.state @@ -1127,19 +900,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DropDistributionReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_distribution_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AlterDistributionAttachRequest); i { case 0: return &v.state @@ -1151,19 +912,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AlterDistributionAttachReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_distribution_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AlterDistributionDetachRequest); i { case 0: return &v.state @@ -1175,19 +924,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AlterDistributionDetachReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_distribution_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetDistributionRequest); i { case 0: return &v.state @@ -1199,7 +936,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetDistributionReply); i { case 0: return &v.state @@ -1211,7 +948,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetRelationDistributionRequest); i { case 0: return &v.state @@ -1223,7 +960,7 @@ func file_protos_distribution_proto_init() { return nil } } - file_protos_distribution_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_protos_distribution_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetRelationDistributionReply); i { case 0: return &v.state @@ -1242,7 +979,7 @@ func file_protos_distribution_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_distribution_proto_rawDesc, NumEnums: 0, - NumMessages: 17, + NumMessages: 12, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/distribution_grpc.pb.go b/pkg/protos/distribution_grpc.pb.go index e9d849318..3fd8a755e 100644 --- a/pkg/protos/distribution_grpc.pb.go +++ b/pkg/protos/distribution_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -32,11 +33,11 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type DistributionServiceClient interface { - CreateDistribution(ctx context.Context, in *CreateDistributionRequest, opts ...grpc.CallOption) (*CreateDistributionReply, error) - DropDistribution(ctx context.Context, in *DropDistributionRequest, opts ...grpc.CallOption) (*DropDistributionReply, error) - ListDistributions(ctx context.Context, in *ListDistributionsRequest, opts ...grpc.CallOption) (*ListDistributionsReply, error) - AlterDistributionAttach(ctx context.Context, in *AlterDistributionAttachRequest, opts ...grpc.CallOption) (*AlterDistributionAttachReply, error) - AlterDistributionDetach(ctx context.Context, in *AlterDistributionDetachRequest, opts ...grpc.CallOption) (*AlterDistributionDetachReply, error) + CreateDistribution(ctx context.Context, in *CreateDistributionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + DropDistribution(ctx context.Context, in *DropDistributionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + ListDistributions(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListDistributionsReply, error) + AlterDistributionAttach(ctx context.Context, in *AlterDistributionAttachRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + AlterDistributionDetach(ctx context.Context, in *AlterDistributionDetachRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) GetDistribution(ctx context.Context, in *GetDistributionRequest, opts ...grpc.CallOption) (*GetDistributionReply, error) GetRelationDistribution(ctx context.Context, in *GetRelationDistributionRequest, opts ...grpc.CallOption) (*GetRelationDistributionReply, error) } @@ -49,8 +50,8 @@ func NewDistributionServiceClient(cc grpc.ClientConnInterface) DistributionServi return &distributionServiceClient{cc} } -func (c *distributionServiceClient) CreateDistribution(ctx context.Context, in *CreateDistributionRequest, opts ...grpc.CallOption) (*CreateDistributionReply, error) { - out := new(CreateDistributionReply) +func (c *distributionServiceClient) CreateDistribution(ctx context.Context, in *CreateDistributionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, DistributionService_CreateDistribution_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -58,8 +59,8 @@ func (c *distributionServiceClient) CreateDistribution(ctx context.Context, in * return out, nil } -func (c *distributionServiceClient) DropDistribution(ctx context.Context, in *DropDistributionRequest, opts ...grpc.CallOption) (*DropDistributionReply, error) { - out := new(DropDistributionReply) +func (c *distributionServiceClient) DropDistribution(ctx context.Context, in *DropDistributionRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, DistributionService_DropDistribution_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -67,7 +68,7 @@ func (c *distributionServiceClient) DropDistribution(ctx context.Context, in *Dr return out, nil } -func (c *distributionServiceClient) ListDistributions(ctx context.Context, in *ListDistributionsRequest, opts ...grpc.CallOption) (*ListDistributionsReply, error) { +func (c *distributionServiceClient) ListDistributions(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListDistributionsReply, error) { out := new(ListDistributionsReply) err := c.cc.Invoke(ctx, DistributionService_ListDistributions_FullMethodName, in, out, opts...) if err != nil { @@ -76,8 +77,8 @@ func (c *distributionServiceClient) ListDistributions(ctx context.Context, in *L return out, nil } -func (c *distributionServiceClient) AlterDistributionAttach(ctx context.Context, in *AlterDistributionAttachRequest, opts ...grpc.CallOption) (*AlterDistributionAttachReply, error) { - out := new(AlterDistributionAttachReply) +func (c *distributionServiceClient) AlterDistributionAttach(ctx context.Context, in *AlterDistributionAttachRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, DistributionService_AlterDistributionAttach_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -85,8 +86,8 @@ func (c *distributionServiceClient) AlterDistributionAttach(ctx context.Context, return out, nil } -func (c *distributionServiceClient) AlterDistributionDetach(ctx context.Context, in *AlterDistributionDetachRequest, opts ...grpc.CallOption) (*AlterDistributionDetachReply, error) { - out := new(AlterDistributionDetachReply) +func (c *distributionServiceClient) AlterDistributionDetach(ctx context.Context, in *AlterDistributionDetachRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, DistributionService_AlterDistributionDetach_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -116,11 +117,11 @@ func (c *distributionServiceClient) GetRelationDistribution(ctx context.Context, // All implementations must embed UnimplementedDistributionServiceServer // for forward compatibility type DistributionServiceServer interface { - CreateDistribution(context.Context, *CreateDistributionRequest) (*CreateDistributionReply, error) - DropDistribution(context.Context, *DropDistributionRequest) (*DropDistributionReply, error) - ListDistributions(context.Context, *ListDistributionsRequest) (*ListDistributionsReply, error) - AlterDistributionAttach(context.Context, *AlterDistributionAttachRequest) (*AlterDistributionAttachReply, error) - AlterDistributionDetach(context.Context, *AlterDistributionDetachRequest) (*AlterDistributionDetachReply, error) + CreateDistribution(context.Context, *CreateDistributionRequest) (*emptypb.Empty, error) + DropDistribution(context.Context, *DropDistributionRequest) (*emptypb.Empty, error) + ListDistributions(context.Context, *emptypb.Empty) (*ListDistributionsReply, error) + AlterDistributionAttach(context.Context, *AlterDistributionAttachRequest) (*emptypb.Empty, error) + AlterDistributionDetach(context.Context, *AlterDistributionDetachRequest) (*emptypb.Empty, error) GetDistribution(context.Context, *GetDistributionRequest) (*GetDistributionReply, error) GetRelationDistribution(context.Context, *GetRelationDistributionRequest) (*GetRelationDistributionReply, error) mustEmbedUnimplementedDistributionServiceServer() @@ -130,19 +131,19 @@ type DistributionServiceServer interface { type UnimplementedDistributionServiceServer struct { } -func (UnimplementedDistributionServiceServer) CreateDistribution(context.Context, *CreateDistributionRequest) (*CreateDistributionReply, error) { +func (UnimplementedDistributionServiceServer) CreateDistribution(context.Context, *CreateDistributionRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method CreateDistribution not implemented") } -func (UnimplementedDistributionServiceServer) DropDistribution(context.Context, *DropDistributionRequest) (*DropDistributionReply, error) { +func (UnimplementedDistributionServiceServer) DropDistribution(context.Context, *DropDistributionRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DropDistribution not implemented") } -func (UnimplementedDistributionServiceServer) ListDistributions(context.Context, *ListDistributionsRequest) (*ListDistributionsReply, error) { +func (UnimplementedDistributionServiceServer) ListDistributions(context.Context, *emptypb.Empty) (*ListDistributionsReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListDistributions not implemented") } -func (UnimplementedDistributionServiceServer) AlterDistributionAttach(context.Context, *AlterDistributionAttachRequest) (*AlterDistributionAttachReply, error) { +func (UnimplementedDistributionServiceServer) AlterDistributionAttach(context.Context, *AlterDistributionAttachRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method AlterDistributionAttach not implemented") } -func (UnimplementedDistributionServiceServer) AlterDistributionDetach(context.Context, *AlterDistributionDetachRequest) (*AlterDistributionDetachReply, error) { +func (UnimplementedDistributionServiceServer) AlterDistributionDetach(context.Context, *AlterDistributionDetachRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method AlterDistributionDetach not implemented") } func (UnimplementedDistributionServiceServer) GetDistribution(context.Context, *GetDistributionRequest) (*GetDistributionReply, error) { @@ -201,7 +202,7 @@ func _DistributionService_DropDistribution_Handler(srv interface{}, ctx context. } func _DistributionService_ListDistributions_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListDistributionsRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -213,7 +214,7 @@ func _DistributionService_ListDistributions_Handler(srv interface{}, ctx context FullMethod: DistributionService_ListDistributions_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(DistributionServiceServer).ListDistributions(ctx, req.(*ListDistributionsRequest)) + return srv.(DistributionServiceServer).ListDistributions(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/key_range.pb.go b/pkg/protos/key_range.pb.go index 9756d9fcf..b06dbabd7 100644 --- a/pkg/protos/key_range.pb.go +++ b/pkg/protos/key_range.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -232,44 +233,6 @@ func (x *ListKeyRangeRequest) GetDistribution() string { return "" } -type ListAllKeyRangesRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListAllKeyRangesRequest) Reset() { - *x = ListAllKeyRangesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListAllKeyRangesRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListAllKeyRangesRequest) ProtoMessage() {} - -func (x *ListAllKeyRangesRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListAllKeyRangesRequest.ProtoReflect.Descriptor instead. -func (*ListAllKeyRangesRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{3} -} - type CreateKeyRangeRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -281,7 +244,7 @@ type CreateKeyRangeRequest struct { func (x *CreateKeyRangeRequest) Reset() { *x = CreateKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[4] + mi := &file_protos_key_range_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -294,7 +257,7 @@ func (x *CreateKeyRangeRequest) String() string { func (*CreateKeyRangeRequest) ProtoMessage() {} func (x *CreateKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[4] + mi := &file_protos_key_range_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -307,7 +270,7 @@ func (x *CreateKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use CreateKeyRangeRequest.ProtoReflect.Descriptor instead. func (*CreateKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{4} + return file_protos_key_range_proto_rawDescGZIP(), []int{3} } func (x *CreateKeyRangeRequest) GetKeyRangeInfo() *KeyRangeInfo { @@ -331,7 +294,7 @@ type SplitKeyRangeRequest struct { func (x *SplitKeyRangeRequest) Reset() { *x = SplitKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[5] + mi := &file_protos_key_range_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -344,7 +307,7 @@ func (x *SplitKeyRangeRequest) String() string { func (*SplitKeyRangeRequest) ProtoMessage() {} func (x *SplitKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[5] + mi := &file_protos_key_range_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -357,7 +320,7 @@ func (x *SplitKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SplitKeyRangeRequest.ProtoReflect.Descriptor instead. func (*SplitKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{5} + return file_protos_key_range_proto_rawDescGZIP(), []int{4} } func (x *SplitKeyRangeRequest) GetNewId() string { @@ -400,7 +363,7 @@ type MergeKeyRangeRequest struct { func (x *MergeKeyRangeRequest) Reset() { *x = MergeKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[6] + mi := &file_protos_key_range_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -413,7 +376,7 @@ func (x *MergeKeyRangeRequest) String() string { func (*MergeKeyRangeRequest) ProtoMessage() {} func (x *MergeKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[6] + mi := &file_protos_key_range_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -426,7 +389,7 @@ func (x *MergeKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MergeKeyRangeRequest.ProtoReflect.Descriptor instead. func (*MergeKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{6} + return file_protos_key_range_proto_rawDescGZIP(), []int{5} } func (x *MergeKeyRangeRequest) GetBaseId() string { @@ -455,7 +418,7 @@ type MoveKeyRangeRequest struct { func (x *MoveKeyRangeRequest) Reset() { *x = MoveKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[7] + mi := &file_protos_key_range_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -468,7 +431,7 @@ func (x *MoveKeyRangeRequest) String() string { func (*MoveKeyRangeRequest) ProtoMessage() {} func (x *MoveKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[7] + mi := &file_protos_key_range_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -481,7 +444,7 @@ func (x *MoveKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use MoveKeyRangeRequest.ProtoReflect.Descriptor instead. func (*MoveKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{7} + return file_protos_key_range_proto_rawDescGZIP(), []int{6} } func (x *MoveKeyRangeRequest) GetId() string { @@ -509,7 +472,7 @@ type DropKeyRangeRequest struct { func (x *DropKeyRangeRequest) Reset() { *x = DropKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[8] + mi := &file_protos_key_range_proto_msgTypes[7] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -522,7 +485,7 @@ func (x *DropKeyRangeRequest) String() string { func (*DropKeyRangeRequest) ProtoMessage() {} func (x *DropKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[8] + mi := &file_protos_key_range_proto_msgTypes[7] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -535,7 +498,7 @@ func (x *DropKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DropKeyRangeRequest.ProtoReflect.Descriptor instead. func (*DropKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{8} + return file_protos_key_range_proto_rawDescGZIP(), []int{7} } func (x *DropKeyRangeRequest) GetId() []string { @@ -545,44 +508,6 @@ func (x *DropKeyRangeRequest) GetId() []string { return nil } -type DropAllKeyRangesRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *DropAllKeyRangesRequest) Reset() { - *x = DropAllKeyRangesRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[9] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DropAllKeyRangesRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DropAllKeyRangesRequest) ProtoMessage() {} - -func (x *DropAllKeyRangesRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[9] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DropAllKeyRangesRequest.ProtoReflect.Descriptor instead. -func (*DropAllKeyRangesRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{9} -} - type DropAllKeyRangesResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -594,7 +519,7 @@ type DropAllKeyRangesResponse struct { func (x *DropAllKeyRangesResponse) Reset() { *x = DropAllKeyRangesResponse{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[10] + mi := &file_protos_key_range_proto_msgTypes[8] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -607,7 +532,7 @@ func (x *DropAllKeyRangesResponse) String() string { func (*DropAllKeyRangesResponse) ProtoMessage() {} func (x *DropAllKeyRangesResponse) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[10] + mi := &file_protos_key_range_proto_msgTypes[8] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -620,7 +545,7 @@ func (x *DropAllKeyRangesResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use DropAllKeyRangesResponse.ProtoReflect.Descriptor instead. func (*DropAllKeyRangesResponse) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{10} + return file_protos_key_range_proto_rawDescGZIP(), []int{8} } func (x *DropAllKeyRangesResponse) GetKeyRange() []*KeyRangeInfo { @@ -641,7 +566,7 @@ type LockKeyRangeRequest struct { func (x *LockKeyRangeRequest) Reset() { *x = LockKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[11] + mi := &file_protos_key_range_proto_msgTypes[9] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -654,7 +579,7 @@ func (x *LockKeyRangeRequest) String() string { func (*LockKeyRangeRequest) ProtoMessage() {} func (x *LockKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[11] + mi := &file_protos_key_range_proto_msgTypes[9] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -667,7 +592,7 @@ func (x *LockKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use LockKeyRangeRequest.ProtoReflect.Descriptor instead. func (*LockKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{11} + return file_protos_key_range_proto_rawDescGZIP(), []int{9} } func (x *LockKeyRangeRequest) GetId() []string { @@ -688,7 +613,7 @@ type UnlockKeyRangeRequest struct { func (x *UnlockKeyRangeRequest) Reset() { *x = UnlockKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[12] + mi := &file_protos_key_range_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -701,7 +626,7 @@ func (x *UnlockKeyRangeRequest) String() string { func (*UnlockKeyRangeRequest) ProtoMessage() {} func (x *UnlockKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[12] + mi := &file_protos_key_range_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -714,7 +639,7 @@ func (x *UnlockKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use UnlockKeyRangeRequest.ProtoReflect.Descriptor instead. func (*UnlockKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{12} + return file_protos_key_range_proto_rawDescGZIP(), []int{10} } func (x *UnlockKeyRangeRequest) GetId() []string { @@ -735,7 +660,7 @@ type KeyRangeReply struct { func (x *KeyRangeReply) Reset() { *x = KeyRangeReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[13] + mi := &file_protos_key_range_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -748,7 +673,7 @@ func (x *KeyRangeReply) String() string { func (*KeyRangeReply) ProtoMessage() {} func (x *KeyRangeReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[13] + mi := &file_protos_key_range_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -761,7 +686,7 @@ func (x *KeyRangeReply) ProtoReflect() protoreflect.Message { // Deprecated: Use KeyRangeReply.ProtoReflect.Descriptor instead. func (*KeyRangeReply) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{13} + return file_protos_key_range_proto_rawDescGZIP(), []int{11} } func (x *KeyRangeReply) GetKeyRangesInfo() []*KeyRangeInfo { @@ -782,7 +707,7 @@ type ModifyReply struct { func (x *ModifyReply) Reset() { *x = ModifyReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[14] + mi := &file_protos_key_range_proto_msgTypes[12] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -795,7 +720,7 @@ func (x *ModifyReply) String() string { func (*ModifyReply) ProtoMessage() {} func (x *ModifyReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[14] + mi := &file_protos_key_range_proto_msgTypes[12] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -808,7 +733,7 @@ func (x *ModifyReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ModifyReply.ProtoReflect.Descriptor instead. func (*ModifyReply) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{14} + return file_protos_key_range_proto_rawDescGZIP(), []int{12} } func (x *ModifyReply) GetOperationId() string { @@ -829,7 +754,7 @@ type ResolveKeyRangeRequest struct { func (x *ResolveKeyRangeRequest) Reset() { *x = ResolveKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[15] + mi := &file_protos_key_range_proto_msgTypes[13] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -842,7 +767,7 @@ func (x *ResolveKeyRangeRequest) String() string { func (*ResolveKeyRangeRequest) ProtoMessage() {} func (x *ResolveKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[15] + mi := &file_protos_key_range_proto_msgTypes[13] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -855,7 +780,7 @@ func (x *ResolveKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ResolveKeyRangeRequest.ProtoReflect.Descriptor instead. func (*ResolveKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{15} + return file_protos_key_range_proto_rawDescGZIP(), []int{13} } func (x *ResolveKeyRangeRequest) GetBound() string { @@ -876,7 +801,7 @@ type ResolveKeyRangeReply struct { func (x *ResolveKeyRangeReply) Reset() { *x = ResolveKeyRangeReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[16] + mi := &file_protos_key_range_proto_msgTypes[14] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -889,7 +814,7 @@ func (x *ResolveKeyRangeReply) String() string { func (*ResolveKeyRangeReply) ProtoMessage() {} func (x *ResolveKeyRangeReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[16] + mi := &file_protos_key_range_proto_msgTypes[14] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -902,7 +827,7 @@ func (x *ResolveKeyRangeReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ResolveKeyRangeReply.ProtoReflect.Descriptor instead. func (*ResolveKeyRangeReply) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{16} + return file_protos_key_range_proto_rawDescGZIP(), []int{14} } func (x *ResolveKeyRangeReply) GetKeyRangeD() []string { @@ -923,7 +848,7 @@ type GetKeyRangeRequest struct { func (x *GetKeyRangeRequest) Reset() { *x = GetKeyRangeRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_key_range_proto_msgTypes[17] + mi := &file_protos_key_range_proto_msgTypes[15] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -936,7 +861,7 @@ func (x *GetKeyRangeRequest) String() string { func (*GetKeyRangeRequest) ProtoMessage() {} func (x *GetKeyRangeRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_key_range_proto_msgTypes[17] + mi := &file_protos_key_range_proto_msgTypes[15] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -949,7 +874,7 @@ func (x *GetKeyRangeRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use GetKeyRangeRequest.ProtoReflect.Descriptor instead. func (*GetKeyRangeRequest) Descriptor() ([]byte, []int) { - return file_protos_key_range_proto_rawDescGZIP(), []int{17} + return file_protos_key_range_proto_rawDescGZIP(), []int{15} } func (x *GetKeyRangeRequest) GetIds() []string { @@ -963,93 +888,91 @@ var File_protos_key_range_proto protoreflect.FileDescriptor var file_protos_key_range_proto_rawDesc = []byte{ 0x0a, 0x16, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, - 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0x27, - 0x0a, 0x0d, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x12, - 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, - 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x22, 0x8f, 0x01, 0x0a, 0x0c, 0x4b, 0x65, 0x79, 0x52, - 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x29, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, - 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, - 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x05, 0x62, 0x6f, - 0x75, 0x6e, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6b, 0x72, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x68, 0x61, 0x72, 0x64, - 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, - 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, - 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x39, 0x0a, 0x13, 0x4c, 0x69, 0x73, - 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, - 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, - 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x19, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x4b, - 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, - 0x51, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0e, 0x6b, 0x65, 0x79, 0x5f, - 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, - 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, - 0x66, 0x6f, 0x22, 0x7f, 0x0a, 0x14, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, - 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x15, 0x0a, 0x06, 0x6e, 0x65, - 0x77, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x65, 0x77, 0x49, - 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, - 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, - 0x63, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x5f, 0x6c, 0x65, - 0x66, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x4c, - 0x65, 0x66, 0x74, 0x22, 0x52, 0x0a, 0x14, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x52, - 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x62, - 0x61, 0x73, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x62, 0x61, - 0x73, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x61, 0x67, - 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x70, 0x70, 0x65, - 0x6e, 0x64, 0x61, 0x67, 0x65, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x13, 0x4d, 0x6f, 0x76, 0x65, 0x4b, - 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, - 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1c, - 0x0a, 0x09, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x22, 0x25, 0x0a, 0x13, - 0x44, 0x72, 0x6f, 0x70, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x22, 0x19, 0x0a, 0x17, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, 0x4b, 0x65, - 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x4b, - 0x0a, 0x18, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x6b, 0x65, - 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, - 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, - 0x6f, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x25, 0x0a, 0x13, 0x4c, + 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, + 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x27, 0x0a, 0x0d, 0x4b, + 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x73, 0x22, 0x8f, 0x01, 0x0a, 0x0c, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x29, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x75, 0x6e, 0x64, 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, + 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x72, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, + 0x6b, 0x72, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x12, 0x26, + 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, + 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x39, 0x0a, 0x13, 0x4c, 0x69, 0x73, 0x74, 0x4b, 0x65, + 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, + 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, + 0x6e, 0x22, 0x51, 0x0a, 0x15, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, + 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x38, 0x0a, 0x0e, 0x6b, 0x65, + 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, + 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x7f, 0x0a, 0x14, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x4b, 0x65, 0x79, + 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x15, 0x0a, 0x06, + 0x6e, 0x65, 0x77, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x65, + 0x77, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x75, + 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x70, 0x6c, 0x69, 0x74, 0x5f, + 0x6c, 0x65, 0x66, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x73, 0x70, 0x6c, 0x69, + 0x74, 0x4c, 0x65, 0x66, 0x74, 0x22, 0x52, 0x0a, 0x14, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x4b, 0x65, + 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, + 0x07, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, + 0x62, 0x61, 0x73, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, + 0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x70, + 0x70, 0x65, 0x6e, 0x64, 0x61, 0x67, 0x65, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x13, 0x4d, 0x6f, 0x76, + 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x6f, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x22, 0x25, + 0x0a, 0x13, 0x44, 0x72, 0x6f, 0x70, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, + 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x18, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, + 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x2f, 0x0a, 0x09, 0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x22, 0x25, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x27, 0x0a, 0x15, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x22, 0x27, 0x0a, 0x15, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, - 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, - 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x0d, 0x4b, - 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x3a, 0x0a, 0x0f, - 0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, - 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0d, 0x6b, 0x65, 0x79, 0x52, 0x61, - 0x6e, 0x67, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x30, 0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, - 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, 0x0a, 0x0c, 0x6f, 0x70, 0x65, 0x72, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, - 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x2e, 0x0a, 0x16, 0x52, 0x65, - 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x22, 0x36, 0x0a, 0x14, 0x52, 0x65, - 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x12, 0x1e, 0x0a, 0x0b, 0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, - 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x44, 0x22, 0x26, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, 0x73, 0x2a, 0x2b, 0x0a, 0x0e, 0x4b, 0x65, - 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a, 0x06, - 0x4c, 0x4f, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x56, 0x41, 0x49, - 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x32, 0xcd, 0x06, 0x0a, 0x0f, 0x4b, 0x65, 0x79, 0x52, - 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x0b, 0x47, - 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x18, 0x2e, 0x73, 0x70, 0x71, - 0x72, 0x2e, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, - 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0c, 0x4c, - 0x69, 0x73, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x2e, 0x73, 0x70, - 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, - 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x48, 0x0a, - 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, - 0x73, 0x12, 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, - 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x69, 0x64, 0x22, 0x4b, 0x0a, 0x0d, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, + 0x70, 0x6c, 0x79, 0x12, 0x3a, 0x0a, 0x0f, 0x6b, 0x65, 0x79, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, + 0x73, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, + 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, + 0x52, 0x0d, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x49, 0x6e, 0x66, 0x6f, 0x22, + 0x30, 0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, + 0x0a, 0x0c, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, + 0x64, 0x22, 0x2e, 0x0a, 0x16, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x62, + 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, + 0x64, 0x22, 0x36, 0x0a, 0x14, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x1e, 0x0a, 0x0b, 0x6b, 0x65, 0x79, + 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, + 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x22, 0x26, 0x0a, 0x12, 0x47, 0x65, 0x74, + 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, + 0x10, 0x0a, 0x03, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x03, 0x69, 0x64, + 0x73, 0x2a, 0x2b, 0x0a, 0x0e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, + 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a, 0x06, 0x4c, 0x4f, 0x43, 0x4b, 0x45, 0x44, 0x10, 0x00, 0x12, + 0x0d, 0x0a, 0x09, 0x41, 0x56, 0x41, 0x49, 0x4c, 0x41, 0x42, 0x4c, 0x45, 0x10, 0x01, 0x32, 0xbf, + 0x06, 0x0a, 0x0f, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, + 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x12, 0x18, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x4b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, + 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4b, 0x65, + 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, + 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, + 0x6c, 0x79, 0x22, 0x00, 0x12, 0x41, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x6c, 0x6c, 0x4b, + 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x0c, 0x4c, 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, @@ -1063,35 +986,35 @@ var file_protos_key_range_proto_rawDesc = []byte{ 0x72, 0x6f, 0x70, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, - 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x53, 0x0a, 0x10, 0x44, + 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4c, 0x0a, 0x10, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x12, - 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, 0x4b, 0x65, - 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1e, - 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, 0x4b, 0x65, 0x79, - 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, - 0x12, 0x42, 0x0a, 0x0e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, - 0x67, 0x65, 0x12, 0x1b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, - 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x11, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x4b, 0x65, 0x79, - 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x70, 0x6c, - 0x69, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x1a, 0x11, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, - 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, 0x0d, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x4b, - 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, - 0x65, 0x72, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3e, 0x0a, 0x0c, 0x4d, 0x6f, 0x76, 0x65, - 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, - 0x4d, 0x6f, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, - 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x6f, - 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1c, 0x2e, 0x73, 0x70, - 0x71, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, - 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, + 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x1e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, + 0x72, 0x6f, 0x70, 0x41, 0x6c, 0x6c, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0e, 0x55, 0x6e, 0x6c, + 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1b, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, + 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x40, 0x0a, + 0x0d, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1a, + 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x4b, 0x65, 0x79, 0x52, 0x61, + 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, 0x70, 0x71, + 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, + 0x40, 0x0a, 0x0d, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, + 0x12, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x4b, 0x65, 0x79, + 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, + 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, + 0x00, 0x12, 0x3e, 0x0a, 0x0c, 0x4d, 0x6f, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, + 0x65, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x4b, 0x65, 0x79, + 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x11, 0x2e, 0x73, + 0x70, 0x71, 0x72, 0x2e, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, + 0x00, 0x12, 0x4d, 0x0a, 0x0f, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x12, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, + 0x6c, 0x76, 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, + 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x76, + 0x65, 0x4b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, + 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1107,57 +1030,56 @@ func file_protos_key_range_proto_rawDescGZIP() []byte { } var file_protos_key_range_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_protos_key_range_proto_msgTypes = make([]protoimpl.MessageInfo, 18) +var file_protos_key_range_proto_msgTypes = make([]protoimpl.MessageInfo, 16) var file_protos_key_range_proto_goTypes = []interface{}{ (KeyRangeStatus)(0), // 0: spqr.KeyRangeStatus (*KeyRangeBound)(nil), // 1: spqr.KeyRangeBound (*KeyRangeInfo)(nil), // 2: spqr.KeyRangeInfo (*ListKeyRangeRequest)(nil), // 3: spqr.ListKeyRangeRequest - (*ListAllKeyRangesRequest)(nil), // 4: spqr.ListAllKeyRangesRequest - (*CreateKeyRangeRequest)(nil), // 5: spqr.CreateKeyRangeRequest - (*SplitKeyRangeRequest)(nil), // 6: spqr.SplitKeyRangeRequest - (*MergeKeyRangeRequest)(nil), // 7: spqr.MergeKeyRangeRequest - (*MoveKeyRangeRequest)(nil), // 8: spqr.MoveKeyRangeRequest - (*DropKeyRangeRequest)(nil), // 9: spqr.DropKeyRangeRequest - (*DropAllKeyRangesRequest)(nil), // 10: spqr.DropAllKeyRangesRequest - (*DropAllKeyRangesResponse)(nil), // 11: spqr.DropAllKeyRangesResponse - (*LockKeyRangeRequest)(nil), // 12: spqr.LockKeyRangeRequest - (*UnlockKeyRangeRequest)(nil), // 13: spqr.UnlockKeyRangeRequest - (*KeyRangeReply)(nil), // 14: spqr.KeyRangeReply - (*ModifyReply)(nil), // 15: spqr.ModifyReply - (*ResolveKeyRangeRequest)(nil), // 16: spqr.ResolveKeyRangeRequest - (*ResolveKeyRangeReply)(nil), // 17: spqr.ResolveKeyRangeReply - (*GetKeyRangeRequest)(nil), // 18: spqr.GetKeyRangeRequest + (*CreateKeyRangeRequest)(nil), // 4: spqr.CreateKeyRangeRequest + (*SplitKeyRangeRequest)(nil), // 5: spqr.SplitKeyRangeRequest + (*MergeKeyRangeRequest)(nil), // 6: spqr.MergeKeyRangeRequest + (*MoveKeyRangeRequest)(nil), // 7: spqr.MoveKeyRangeRequest + (*DropKeyRangeRequest)(nil), // 8: spqr.DropKeyRangeRequest + (*DropAllKeyRangesResponse)(nil), // 9: spqr.DropAllKeyRangesResponse + (*LockKeyRangeRequest)(nil), // 10: spqr.LockKeyRangeRequest + (*UnlockKeyRangeRequest)(nil), // 11: spqr.UnlockKeyRangeRequest + (*KeyRangeReply)(nil), // 12: spqr.KeyRangeReply + (*ModifyReply)(nil), // 13: spqr.ModifyReply + (*ResolveKeyRangeRequest)(nil), // 14: spqr.ResolveKeyRangeRequest + (*ResolveKeyRangeReply)(nil), // 15: spqr.ResolveKeyRangeReply + (*GetKeyRangeRequest)(nil), // 16: spqr.GetKeyRangeRequest + (*emptypb.Empty)(nil), // 17: google.protobuf.Empty } var file_protos_key_range_proto_depIdxs = []int32{ 1, // 0: spqr.KeyRangeInfo.bound:type_name -> spqr.KeyRangeBound 2, // 1: spqr.CreateKeyRangeRequest.key_range_info:type_name -> spqr.KeyRangeInfo 2, // 2: spqr.DropAllKeyRangesResponse.key_range:type_name -> spqr.KeyRangeInfo 2, // 3: spqr.KeyRangeReply.key_ranges_info:type_name -> spqr.KeyRangeInfo - 18, // 4: spqr.KeyRangeService.GetKeyRange:input_type -> spqr.GetKeyRangeRequest + 16, // 4: spqr.KeyRangeService.GetKeyRange:input_type -> spqr.GetKeyRangeRequest 3, // 5: spqr.KeyRangeService.ListKeyRange:input_type -> spqr.ListKeyRangeRequest - 4, // 6: spqr.KeyRangeService.ListAllKeyRanges:input_type -> spqr.ListAllKeyRangesRequest - 12, // 7: spqr.KeyRangeService.LockKeyRange:input_type -> spqr.LockKeyRangeRequest - 5, // 8: spqr.KeyRangeService.CreateKeyRange:input_type -> spqr.CreateKeyRangeRequest - 9, // 9: spqr.KeyRangeService.DropKeyRange:input_type -> spqr.DropKeyRangeRequest - 10, // 10: spqr.KeyRangeService.DropAllKeyRanges:input_type -> spqr.DropAllKeyRangesRequest - 13, // 11: spqr.KeyRangeService.UnlockKeyRange:input_type -> spqr.UnlockKeyRangeRequest - 6, // 12: spqr.KeyRangeService.SplitKeyRange:input_type -> spqr.SplitKeyRangeRequest - 7, // 13: spqr.KeyRangeService.MergeKeyRange:input_type -> spqr.MergeKeyRangeRequest - 8, // 14: spqr.KeyRangeService.MoveKeyRange:input_type -> spqr.MoveKeyRangeRequest - 16, // 15: spqr.KeyRangeService.ResolveKeyRange:input_type -> spqr.ResolveKeyRangeRequest - 14, // 16: spqr.KeyRangeService.GetKeyRange:output_type -> spqr.KeyRangeReply - 14, // 17: spqr.KeyRangeService.ListKeyRange:output_type -> spqr.KeyRangeReply - 14, // 18: spqr.KeyRangeService.ListAllKeyRanges:output_type -> spqr.KeyRangeReply - 15, // 19: spqr.KeyRangeService.LockKeyRange:output_type -> spqr.ModifyReply - 15, // 20: spqr.KeyRangeService.CreateKeyRange:output_type -> spqr.ModifyReply - 15, // 21: spqr.KeyRangeService.DropKeyRange:output_type -> spqr.ModifyReply - 11, // 22: spqr.KeyRangeService.DropAllKeyRanges:output_type -> spqr.DropAllKeyRangesResponse - 15, // 23: spqr.KeyRangeService.UnlockKeyRange:output_type -> spqr.ModifyReply - 15, // 24: spqr.KeyRangeService.SplitKeyRange:output_type -> spqr.ModifyReply - 15, // 25: spqr.KeyRangeService.MergeKeyRange:output_type -> spqr.ModifyReply - 15, // 26: spqr.KeyRangeService.MoveKeyRange:output_type -> spqr.ModifyReply - 17, // 27: spqr.KeyRangeService.ResolveKeyRange:output_type -> spqr.ResolveKeyRangeReply + 17, // 6: spqr.KeyRangeService.ListAllKeyRanges:input_type -> google.protobuf.Empty + 10, // 7: spqr.KeyRangeService.LockKeyRange:input_type -> spqr.LockKeyRangeRequest + 4, // 8: spqr.KeyRangeService.CreateKeyRange:input_type -> spqr.CreateKeyRangeRequest + 8, // 9: spqr.KeyRangeService.DropKeyRange:input_type -> spqr.DropKeyRangeRequest + 17, // 10: spqr.KeyRangeService.DropAllKeyRanges:input_type -> google.protobuf.Empty + 11, // 11: spqr.KeyRangeService.UnlockKeyRange:input_type -> spqr.UnlockKeyRangeRequest + 5, // 12: spqr.KeyRangeService.SplitKeyRange:input_type -> spqr.SplitKeyRangeRequest + 6, // 13: spqr.KeyRangeService.MergeKeyRange:input_type -> spqr.MergeKeyRangeRequest + 7, // 14: spqr.KeyRangeService.MoveKeyRange:input_type -> spqr.MoveKeyRangeRequest + 14, // 15: spqr.KeyRangeService.ResolveKeyRange:input_type -> spqr.ResolveKeyRangeRequest + 12, // 16: spqr.KeyRangeService.GetKeyRange:output_type -> spqr.KeyRangeReply + 12, // 17: spqr.KeyRangeService.ListKeyRange:output_type -> spqr.KeyRangeReply + 12, // 18: spqr.KeyRangeService.ListAllKeyRanges:output_type -> spqr.KeyRangeReply + 13, // 19: spqr.KeyRangeService.LockKeyRange:output_type -> spqr.ModifyReply + 13, // 20: spqr.KeyRangeService.CreateKeyRange:output_type -> spqr.ModifyReply + 13, // 21: spqr.KeyRangeService.DropKeyRange:output_type -> spqr.ModifyReply + 9, // 22: spqr.KeyRangeService.DropAllKeyRanges:output_type -> spqr.DropAllKeyRangesResponse + 13, // 23: spqr.KeyRangeService.UnlockKeyRange:output_type -> spqr.ModifyReply + 13, // 24: spqr.KeyRangeService.SplitKeyRange:output_type -> spqr.ModifyReply + 13, // 25: spqr.KeyRangeService.MergeKeyRange:output_type -> spqr.ModifyReply + 13, // 26: spqr.KeyRangeService.MoveKeyRange:output_type -> spqr.ModifyReply + 15, // 27: spqr.KeyRangeService.ResolveKeyRange:output_type -> spqr.ResolveKeyRangeReply 16, // [16:28] is the sub-list for method output_type 4, // [4:16] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -1208,18 +1130,6 @@ func file_protos_key_range_proto_init() { } } file_protos_key_range_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListAllKeyRangesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_key_range_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*CreateKeyRangeRequest); i { case 0: return &v.state @@ -1231,7 +1141,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SplitKeyRangeRequest); i { case 0: return &v.state @@ -1243,7 +1153,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MergeKeyRangeRequest); i { case 0: return &v.state @@ -1255,7 +1165,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*MoveKeyRangeRequest); i { case 0: return &v.state @@ -1267,7 +1177,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DropKeyRangeRequest); i { case 0: return &v.state @@ -1279,19 +1189,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DropAllKeyRangesRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_key_range_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DropAllKeyRangesResponse); i { case 0: return &v.state @@ -1303,7 +1201,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*LockKeyRangeRequest); i { case 0: return &v.state @@ -1315,7 +1213,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*UnlockKeyRangeRequest); i { case 0: return &v.state @@ -1327,7 +1225,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*KeyRangeReply); i { case 0: return &v.state @@ -1339,7 +1237,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ModifyReply); i { case 0: return &v.state @@ -1351,7 +1249,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ResolveKeyRangeRequest); i { case 0: return &v.state @@ -1363,7 +1261,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ResolveKeyRangeReply); i { case 0: return &v.state @@ -1375,7 +1273,7 @@ func file_protos_key_range_proto_init() { return nil } } - file_protos_key_range_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} { + file_protos_key_range_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetKeyRangeRequest); i { case 0: return &v.state @@ -1394,7 +1292,7 @@ func file_protos_key_range_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_key_range_proto_rawDesc, NumEnums: 1, - NumMessages: 18, + NumMessages: 16, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/key_range_grpc.pb.go b/pkg/protos/key_range_grpc.pb.go index 4f71d275d..42821e717 100644 --- a/pkg/protos/key_range_grpc.pb.go +++ b/pkg/protos/key_range_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -39,11 +40,11 @@ const ( type KeyRangeServiceClient interface { GetKeyRange(ctx context.Context, in *GetKeyRangeRequest, opts ...grpc.CallOption) (*KeyRangeReply, error) ListKeyRange(ctx context.Context, in *ListKeyRangeRequest, opts ...grpc.CallOption) (*KeyRangeReply, error) - ListAllKeyRanges(ctx context.Context, in *ListAllKeyRangesRequest, opts ...grpc.CallOption) (*KeyRangeReply, error) + ListAllKeyRanges(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*KeyRangeReply, error) LockKeyRange(ctx context.Context, in *LockKeyRangeRequest, opts ...grpc.CallOption) (*ModifyReply, error) CreateKeyRange(ctx context.Context, in *CreateKeyRangeRequest, opts ...grpc.CallOption) (*ModifyReply, error) DropKeyRange(ctx context.Context, in *DropKeyRangeRequest, opts ...grpc.CallOption) (*ModifyReply, error) - DropAllKeyRanges(ctx context.Context, in *DropAllKeyRangesRequest, opts ...grpc.CallOption) (*DropAllKeyRangesResponse, error) + DropAllKeyRanges(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*DropAllKeyRangesResponse, error) UnlockKeyRange(ctx context.Context, in *UnlockKeyRangeRequest, opts ...grpc.CallOption) (*ModifyReply, error) SplitKeyRange(ctx context.Context, in *SplitKeyRangeRequest, opts ...grpc.CallOption) (*ModifyReply, error) MergeKeyRange(ctx context.Context, in *MergeKeyRangeRequest, opts ...grpc.CallOption) (*ModifyReply, error) @@ -77,7 +78,7 @@ func (c *keyRangeServiceClient) ListKeyRange(ctx context.Context, in *ListKeyRan return out, nil } -func (c *keyRangeServiceClient) ListAllKeyRanges(ctx context.Context, in *ListAllKeyRangesRequest, opts ...grpc.CallOption) (*KeyRangeReply, error) { +func (c *keyRangeServiceClient) ListAllKeyRanges(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*KeyRangeReply, error) { out := new(KeyRangeReply) err := c.cc.Invoke(ctx, KeyRangeService_ListAllKeyRanges_FullMethodName, in, out, opts...) if err != nil { @@ -113,7 +114,7 @@ func (c *keyRangeServiceClient) DropKeyRange(ctx context.Context, in *DropKeyRan return out, nil } -func (c *keyRangeServiceClient) DropAllKeyRanges(ctx context.Context, in *DropAllKeyRangesRequest, opts ...grpc.CallOption) (*DropAllKeyRangesResponse, error) { +func (c *keyRangeServiceClient) DropAllKeyRanges(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*DropAllKeyRangesResponse, error) { out := new(DropAllKeyRangesResponse) err := c.cc.Invoke(ctx, KeyRangeService_DropAllKeyRanges_FullMethodName, in, out, opts...) if err != nil { @@ -173,11 +174,11 @@ func (c *keyRangeServiceClient) ResolveKeyRange(ctx context.Context, in *Resolve type KeyRangeServiceServer interface { GetKeyRange(context.Context, *GetKeyRangeRequest) (*KeyRangeReply, error) ListKeyRange(context.Context, *ListKeyRangeRequest) (*KeyRangeReply, error) - ListAllKeyRanges(context.Context, *ListAllKeyRangesRequest) (*KeyRangeReply, error) + ListAllKeyRanges(context.Context, *emptypb.Empty) (*KeyRangeReply, error) LockKeyRange(context.Context, *LockKeyRangeRequest) (*ModifyReply, error) CreateKeyRange(context.Context, *CreateKeyRangeRequest) (*ModifyReply, error) DropKeyRange(context.Context, *DropKeyRangeRequest) (*ModifyReply, error) - DropAllKeyRanges(context.Context, *DropAllKeyRangesRequest) (*DropAllKeyRangesResponse, error) + DropAllKeyRanges(context.Context, *emptypb.Empty) (*DropAllKeyRangesResponse, error) UnlockKeyRange(context.Context, *UnlockKeyRangeRequest) (*ModifyReply, error) SplitKeyRange(context.Context, *SplitKeyRangeRequest) (*ModifyReply, error) MergeKeyRange(context.Context, *MergeKeyRangeRequest) (*ModifyReply, error) @@ -196,7 +197,7 @@ func (UnimplementedKeyRangeServiceServer) GetKeyRange(context.Context, *GetKeyRa func (UnimplementedKeyRangeServiceServer) ListKeyRange(context.Context, *ListKeyRangeRequest) (*KeyRangeReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListKeyRange not implemented") } -func (UnimplementedKeyRangeServiceServer) ListAllKeyRanges(context.Context, *ListAllKeyRangesRequest) (*KeyRangeReply, error) { +func (UnimplementedKeyRangeServiceServer) ListAllKeyRanges(context.Context, *emptypb.Empty) (*KeyRangeReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListAllKeyRanges not implemented") } func (UnimplementedKeyRangeServiceServer) LockKeyRange(context.Context, *LockKeyRangeRequest) (*ModifyReply, error) { @@ -208,7 +209,7 @@ func (UnimplementedKeyRangeServiceServer) CreateKeyRange(context.Context, *Creat func (UnimplementedKeyRangeServiceServer) DropKeyRange(context.Context, *DropKeyRangeRequest) (*ModifyReply, error) { return nil, status.Errorf(codes.Unimplemented, "method DropKeyRange not implemented") } -func (UnimplementedKeyRangeServiceServer) DropAllKeyRanges(context.Context, *DropAllKeyRangesRequest) (*DropAllKeyRangesResponse, error) { +func (UnimplementedKeyRangeServiceServer) DropAllKeyRanges(context.Context, *emptypb.Empty) (*DropAllKeyRangesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method DropAllKeyRanges not implemented") } func (UnimplementedKeyRangeServiceServer) UnlockKeyRange(context.Context, *UnlockKeyRangeRequest) (*ModifyReply, error) { @@ -276,7 +277,7 @@ func _KeyRangeService_ListKeyRange_Handler(srv interface{}, ctx context.Context, } func _KeyRangeService_ListAllKeyRanges_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListAllKeyRangesRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -288,7 +289,7 @@ func _KeyRangeService_ListAllKeyRanges_Handler(srv interface{}, ctx context.Cont FullMethod: KeyRangeService_ListAllKeyRanges_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(KeyRangeServiceServer).ListAllKeyRanges(ctx, req.(*ListAllKeyRangesRequest)) + return srv.(KeyRangeServiceServer).ListAllKeyRanges(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -348,7 +349,7 @@ func _KeyRangeService_DropKeyRange_Handler(srv interface{}, ctx context.Context, } func _KeyRangeService_DropAllKeyRanges_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(DropAllKeyRangesRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -360,7 +361,7 @@ func _KeyRangeService_DropAllKeyRanges_Handler(srv interface{}, ctx context.Cont FullMethod: KeyRangeService_DropAllKeyRanges_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(KeyRangeServiceServer).DropAllKeyRanges(ctx, req.(*DropAllKeyRangesRequest)) + return srv.(KeyRangeServiceServer).DropAllKeyRanges(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/pools.pb.go b/pkg/protos/pools.pb.go index 71ab2d6e0..c18855b8a 100644 --- a/pkg/protos/pools.pb.go +++ b/pkg/protos/pools.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -20,44 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -type ListPoolsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListPoolsRequest) Reset() { - *x = ListPoolsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_pools_proto_msgTypes[0] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListPoolsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListPoolsRequest) ProtoMessage() {} - -func (x *ListPoolsRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_pools_proto_msgTypes[0] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListPoolsRequest.ProtoReflect.Descriptor instead. -func (*ListPoolsRequest) Descriptor() ([]byte, []int) { - return file_protos_pools_proto_rawDescGZIP(), []int{0} -} - type ListPoolsResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -69,7 +32,7 @@ type ListPoolsResponse struct { func (x *ListPoolsResponse) Reset() { *x = ListPoolsResponse{} if protoimpl.UnsafeEnabled { - mi := &file_protos_pools_proto_msgTypes[1] + mi := &file_protos_pools_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -82,7 +45,7 @@ func (x *ListPoolsResponse) String() string { func (*ListPoolsResponse) ProtoMessage() {} func (x *ListPoolsResponse) ProtoReflect() protoreflect.Message { - mi := &file_protos_pools_proto_msgTypes[1] + mi := &file_protos_pools_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -95,7 +58,7 @@ func (x *ListPoolsResponse) ProtoReflect() protoreflect.Message { // Deprecated: Use ListPoolsResponse.ProtoReflect.Descriptor instead. func (*ListPoolsResponse) Descriptor() ([]byte, []int) { - return file_protos_pools_proto_rawDescGZIP(), []int{1} + return file_protos_pools_proto_rawDescGZIP(), []int{0} } func (x *ListPoolsResponse) GetPools() []*PoolInfo { @@ -123,7 +86,7 @@ type PoolInfo struct { func (x *PoolInfo) Reset() { *x = PoolInfo{} if protoimpl.UnsafeEnabled { - mi := &file_protos_pools_proto_msgTypes[2] + mi := &file_protos_pools_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -136,7 +99,7 @@ func (x *PoolInfo) String() string { func (*PoolInfo) ProtoMessage() {} func (x *PoolInfo) ProtoReflect() protoreflect.Message { - mi := &file_protos_pools_proto_msgTypes[2] + mi := &file_protos_pools_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -149,7 +112,7 @@ func (x *PoolInfo) ProtoReflect() protoreflect.Message { // Deprecated: Use PoolInfo.ProtoReflect.Descriptor instead. func (*PoolInfo) Descriptor() ([]byte, []int) { - return file_protos_pools_proto_rawDescGZIP(), []int{2} + return file_protos_pools_proto_rawDescGZIP(), []int{1} } func (x *PoolInfo) GetId() string { @@ -212,32 +175,32 @@ var File_protos_pools_proto protoreflect.FileDescriptor var file_protos_pools_proto_rawDesc = []byte{ 0x0a, 0x12, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0x12, 0x0a, 0x10, 0x4c, 0x69, - 0x73, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x39, - 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x05, 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x22, 0xd2, 0x01, 0x0a, 0x08, 0x50, 0x6f, - 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x44, 0x42, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x44, 0x42, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x73, 0x72, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x73, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, - 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x49, 0x64, - 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, - 0x03, 0x52, 0x0d, 0x49, 0x64, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, - 0x12, 0x1c, 0x0a, 0x09, 0x51, 0x75, 0x65, 0x75, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x09, 0x51, 0x75, 0x65, 0x75, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1e, - 0x0a, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0x4d, - 0x0a, 0x0b, 0x50, 0x6f, 0x6f, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3e, 0x0a, - 0x09, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x73, 0x12, 0x16, 0x2e, 0x73, 0x70, 0x71, - 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, - 0x6f, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x0c, 0x5a, - 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x39, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x50, + 0x6f, 0x6f, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x24, 0x0a, 0x05, + 0x70, 0x6f, 0x6f, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x70, 0x6f, 0x6f, + 0x6c, 0x73, 0x22, 0xd2, 0x01, 0x0a, 0x08, 0x50, 0x6f, 0x6f, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, + 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x64, 0x12, + 0x0e, 0x0a, 0x02, 0x44, 0x42, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x44, 0x42, 0x12, + 0x10, 0x0a, 0x03, 0x55, 0x73, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x55, 0x73, + 0x72, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x6f, 0x73, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x04, 0x48, 0x6f, 0x73, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x49, 0x64, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x43, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x49, 0x64, 0x6c, 0x65, + 0x43, 0x6f, 0x6e, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x51, 0x75, 0x65, + 0x75, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x51, 0x75, + 0x65, 0x75, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x52, 0x6f, 0x75, + 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0x4d, 0x0a, 0x0b, 0x50, 0x6f, 0x6f, 0x6c, 0x53, + 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3e, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, + 0x6f, 0x6c, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x17, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6f, 0x6c, 0x73, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -252,16 +215,16 @@ func file_protos_pools_proto_rawDescGZIP() []byte { return file_protos_pools_proto_rawDescData } -var file_protos_pools_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_protos_pools_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_protos_pools_proto_goTypes = []interface{}{ - (*ListPoolsRequest)(nil), // 0: spqr.ListPoolsRequest - (*ListPoolsResponse)(nil), // 1: spqr.ListPoolsResponse - (*PoolInfo)(nil), // 2: spqr.PoolInfo + (*ListPoolsResponse)(nil), // 0: spqr.ListPoolsResponse + (*PoolInfo)(nil), // 1: spqr.PoolInfo + (*emptypb.Empty)(nil), // 2: google.protobuf.Empty } var file_protos_pools_proto_depIdxs = []int32{ - 2, // 0: spqr.ListPoolsResponse.pools:type_name -> spqr.PoolInfo - 0, // 1: spqr.PoolService.ListPools:input_type -> spqr.ListPoolsRequest - 1, // 2: spqr.PoolService.ListPools:output_type -> spqr.ListPoolsResponse + 1, // 0: spqr.ListPoolsResponse.pools:type_name -> spqr.PoolInfo + 2, // 1: spqr.PoolService.ListPools:input_type -> google.protobuf.Empty + 0, // 2: spqr.PoolService.ListPools:output_type -> spqr.ListPoolsResponse 2, // [2:3] is the sub-list for method output_type 1, // [1:2] is the sub-list for method input_type 1, // [1:1] is the sub-list for extension type_name @@ -276,18 +239,6 @@ func file_protos_pools_proto_init() { } if !protoimpl.UnsafeEnabled { file_protos_pools_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListPoolsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_pools_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListPoolsResponse); i { case 0: return &v.state @@ -299,7 +250,7 @@ func file_protos_pools_proto_init() { return nil } } - file_protos_pools_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + file_protos_pools_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*PoolInfo); i { case 0: return &v.state @@ -318,7 +269,7 @@ func file_protos_pools_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_pools_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 2, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/pools_grpc.pb.go b/pkg/protos/pools_grpc.pb.go index d42a0d026..3267db17a 100644 --- a/pkg/protos/pools_grpc.pb.go +++ b/pkg/protos/pools_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -26,7 +27,7 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type PoolServiceClient interface { - ListPools(ctx context.Context, in *ListPoolsRequest, opts ...grpc.CallOption) (*ListPoolsResponse, error) + ListPools(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListPoolsResponse, error) } type poolServiceClient struct { @@ -37,7 +38,7 @@ func NewPoolServiceClient(cc grpc.ClientConnInterface) PoolServiceClient { return &poolServiceClient{cc} } -func (c *poolServiceClient) ListPools(ctx context.Context, in *ListPoolsRequest, opts ...grpc.CallOption) (*ListPoolsResponse, error) { +func (c *poolServiceClient) ListPools(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListPoolsResponse, error) { out := new(ListPoolsResponse) err := c.cc.Invoke(ctx, PoolService_ListPools_FullMethodName, in, out, opts...) if err != nil { @@ -50,7 +51,7 @@ func (c *poolServiceClient) ListPools(ctx context.Context, in *ListPoolsRequest, // All implementations must embed UnimplementedPoolServiceServer // for forward compatibility type PoolServiceServer interface { - ListPools(context.Context, *ListPoolsRequest) (*ListPoolsResponse, error) + ListPools(context.Context, *emptypb.Empty) (*ListPoolsResponse, error) mustEmbedUnimplementedPoolServiceServer() } @@ -58,7 +59,7 @@ type PoolServiceServer interface { type UnimplementedPoolServiceServer struct { } -func (UnimplementedPoolServiceServer) ListPools(context.Context, *ListPoolsRequest) (*ListPoolsResponse, error) { +func (UnimplementedPoolServiceServer) ListPools(context.Context, *emptypb.Empty) (*ListPoolsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method ListPools not implemented") } func (UnimplementedPoolServiceServer) mustEmbedUnimplementedPoolServiceServer() {} @@ -75,7 +76,7 @@ func RegisterPoolServiceServer(s grpc.ServiceRegistrar, srv PoolServiceServer) { } func _PoolService_ListPools_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListPoolsRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -87,7 +88,7 @@ func _PoolService_ListPools_Handler(srv interface{}, ctx context.Context, dec fu FullMethod: PoolService_ListPools_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(PoolServiceServer).ListPools(ctx, req.(*ListPoolsRequest)) + return srv.(PoolServiceServer).ListPools(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/router.pb.go b/pkg/protos/router.pb.go index 6d6c2491b..5c6bef579 100644 --- a/pkg/protos/router.pb.go +++ b/pkg/protos/router.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -129,44 +130,6 @@ func (x *Router) GetStatus() RouterStatus { return RouterStatus_CLOSED } -type ListRoutersRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListRoutersRequest) Reset() { - *x = ListRoutersRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[1] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListRoutersRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListRoutersRequest) ProtoMessage() {} - -func (x *ListRoutersRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[1] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListRoutersRequest.ProtoReflect.Descriptor instead. -func (*ListRoutersRequest) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{1} -} - type ListRoutersReply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -178,7 +141,7 @@ type ListRoutersReply struct { func (x *ListRoutersReply) Reset() { *x = ListRoutersReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[2] + mi := &file_protos_router_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -191,7 +154,7 @@ func (x *ListRoutersReply) String() string { func (*ListRoutersReply) ProtoMessage() {} func (x *ListRoutersReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[2] + mi := &file_protos_router_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -204,7 +167,7 @@ func (x *ListRoutersReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ListRoutersReply.ProtoReflect.Descriptor instead. func (*ListRoutersReply) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{2} + return file_protos_router_proto_rawDescGZIP(), []int{1} } func (x *ListRoutersReply) GetRouters() []*Router { @@ -225,7 +188,7 @@ type AddRouterRequest struct { func (x *AddRouterRequest) Reset() { *x = AddRouterRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[3] + mi := &file_protos_router_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -238,7 +201,7 @@ func (x *AddRouterRequest) String() string { func (*AddRouterRequest) ProtoMessage() {} func (x *AddRouterRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[3] + mi := &file_protos_router_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -251,7 +214,7 @@ func (x *AddRouterRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AddRouterRequest.ProtoReflect.Descriptor instead. func (*AddRouterRequest) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{3} + return file_protos_router_proto_rawDescGZIP(), []int{2} } func (x *AddRouterRequest) GetRouter() *Router { @@ -272,7 +235,7 @@ type AddRouterReply struct { func (x *AddRouterReply) Reset() { *x = AddRouterReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[4] + mi := &file_protos_router_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -285,7 +248,7 @@ func (x *AddRouterReply) String() string { func (*AddRouterReply) ProtoMessage() {} func (x *AddRouterReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[4] + mi := &file_protos_router_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -298,7 +261,7 @@ func (x *AddRouterReply) ProtoReflect() protoreflect.Message { // Deprecated: Use AddRouterReply.ProtoReflect.Descriptor instead. func (*AddRouterReply) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{4} + return file_protos_router_proto_rawDescGZIP(), []int{3} } func (x *AddRouterReply) GetId() string { @@ -319,7 +282,7 @@ type RemoveRouterRequest struct { func (x *RemoveRouterRequest) Reset() { *x = RemoveRouterRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[5] + mi := &file_protos_router_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -332,7 +295,7 @@ func (x *RemoveRouterRequest) String() string { func (*RemoveRouterRequest) ProtoMessage() {} func (x *RemoveRouterRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[5] + mi := &file_protos_router_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -345,7 +308,7 @@ func (x *RemoveRouterRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use RemoveRouterRequest.ProtoReflect.Descriptor instead. func (*RemoveRouterRequest) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{5} + return file_protos_router_proto_rawDescGZIP(), []int{4} } func (x *RemoveRouterRequest) GetId() string { @@ -355,44 +318,6 @@ func (x *RemoveRouterRequest) GetId() string { return "" } -type RemoveRouterReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *RemoveRouterReply) Reset() { - *x = RemoveRouterReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RemoveRouterReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RemoveRouterReply) ProtoMessage() {} - -func (x *RemoveRouterReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RemoveRouterReply.ProtoReflect.Descriptor instead. -func (*RemoveRouterReply) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{6} -} - type SyncMetadataRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -404,7 +329,7 @@ type SyncMetadataRequest struct { func (x *SyncMetadataRequest) Reset() { *x = SyncMetadataRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[7] + mi := &file_protos_router_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -417,7 +342,7 @@ func (x *SyncMetadataRequest) String() string { func (*SyncMetadataRequest) ProtoMessage() {} func (x *SyncMetadataRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[7] + mi := &file_protos_router_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -430,7 +355,7 @@ func (x *SyncMetadataRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use SyncMetadataRequest.ProtoReflect.Descriptor instead. func (*SyncMetadataRequest) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{7} + return file_protos_router_proto_rawDescGZIP(), []int{5} } func (x *SyncMetadataRequest) GetRouter() *Router { @@ -440,97 +365,56 @@ func (x *SyncMetadataRequest) GetRouter() *Router { return nil } -type SyncMetadataReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *SyncMetadataReply) Reset() { - *x = SyncMetadataReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_router_proto_msgTypes[8] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *SyncMetadataReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*SyncMetadataReply) ProtoMessage() {} - -func (x *SyncMetadataReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_router_proto_msgTypes[8] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use SyncMetadataReply.ProtoReflect.Descriptor instead. -func (*SyncMetadataReply) Descriptor() ([]byte, []int) { - return file_protos_router_proto_rawDescGZIP(), []int{8} -} - var File_protos_router_proto protoreflect.FileDescriptor var file_protos_router_proto_rawDesc = []byte{ 0x0a, 0x13, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0x5e, 0x0a, 0x06, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, - 0x2a, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, - 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, - 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x14, 0x0a, 0x12, 0x4c, - 0x69, 0x73, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x22, 0x3a, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x07, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x72, 0x52, 0x07, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x22, 0x38, 0x0a, - 0x10, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, - 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x22, 0x20, 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x52, 0x6f, - 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x25, 0x0a, 0x13, 0x52, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, + 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5e, 0x0a, 0x06, 0x52, 0x6f, 0x75, 0x74, + 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, + 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a, 0x06, + 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x12, 0x2e, 0x73, + 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, + 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x3a, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x26, 0x0a, 0x07, + 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x07, 0x72, 0x6f, 0x75, + 0x74, 0x65, 0x72, 0x73, 0x22, 0x38, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, + 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x22, 0x20, + 0x0a, 0x0e, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x22, 0x13, 0x0a, 0x11, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x3b, 0x0a, 0x13, 0x53, 0x79, 0x6e, 0x63, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, 0x0a, 0x06, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, - 0x65, 0x72, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x79, 0x6e, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x2a, 0x26, 0x0a, 0x0c, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x72, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x4c, 0x4f, 0x53, 0x45, - 0x44, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x50, 0x45, 0x4e, 0x45, 0x44, 0x10, 0x01, 0x32, - 0x9b, 0x02, 0x0a, 0x0d, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, - 0x65, 0x12, 0x41, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, - 0x12, 0x18, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x72, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x73, 0x70, 0x71, - 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x70, - 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3b, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x72, 0x12, 0x16, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, - 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, - 0x00, 0x12, 0x44, 0x0a, 0x0c, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, - 0x72, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, + 0x22, 0x25, 0x0a, 0x13, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x3b, 0x0a, 0x13, 0x53, 0x79, 0x6e, 0x63, 0x4d, + 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x24, + 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, + 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x06, 0x72, 0x6f, + 0x75, 0x74, 0x65, 0x72, 0x2a, 0x26, 0x0a, 0x0c, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x12, 0x0a, 0x0a, 0x06, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x44, 0x10, 0x00, + 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x50, 0x45, 0x4e, 0x45, 0x44, 0x10, 0x01, 0x32, 0x97, 0x02, 0x0a, + 0x0d, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3f, + 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x12, 0x16, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, + 0x3b, 0x0a, 0x09, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x16, 0x2e, 0x73, + 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x14, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x52, + 0x6f, 0x75, 0x74, 0x65, 0x72, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x43, 0x0a, 0x0c, + 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x44, 0x0a, 0x0c, 0x53, 0x79, 0x6e, 0x63, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, - 0x79, 0x6e, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x4d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, - 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, + 0x00, 0x12, 0x43, 0x0a, 0x0c, 0x53, 0x79, 0x6e, 0x63, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, + 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, + 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -546,32 +430,30 @@ func file_protos_router_proto_rawDescGZIP() []byte { } var file_protos_router_proto_enumTypes = make([]protoimpl.EnumInfo, 1) -var file_protos_router_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_protos_router_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_protos_router_proto_goTypes = []interface{}{ (RouterStatus)(0), // 0: spqr.RouterStatus (*Router)(nil), // 1: spqr.Router - (*ListRoutersRequest)(nil), // 2: spqr.ListRoutersRequest - (*ListRoutersReply)(nil), // 3: spqr.ListRoutersReply - (*AddRouterRequest)(nil), // 4: spqr.AddRouterRequest - (*AddRouterReply)(nil), // 5: spqr.AddRouterReply - (*RemoveRouterRequest)(nil), // 6: spqr.RemoveRouterRequest - (*RemoveRouterReply)(nil), // 7: spqr.RemoveRouterReply - (*SyncMetadataRequest)(nil), // 8: spqr.SyncMetadataRequest - (*SyncMetadataReply)(nil), // 9: spqr.SyncMetadataReply + (*ListRoutersReply)(nil), // 2: spqr.ListRoutersReply + (*AddRouterRequest)(nil), // 3: spqr.AddRouterRequest + (*AddRouterReply)(nil), // 4: spqr.AddRouterReply + (*RemoveRouterRequest)(nil), // 5: spqr.RemoveRouterRequest + (*SyncMetadataRequest)(nil), // 6: spqr.SyncMetadataRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_protos_router_proto_depIdxs = []int32{ 0, // 0: spqr.Router.status:type_name -> spqr.RouterStatus 1, // 1: spqr.ListRoutersReply.routers:type_name -> spqr.Router 1, // 2: spqr.AddRouterRequest.router:type_name -> spqr.Router 1, // 3: spqr.SyncMetadataRequest.router:type_name -> spqr.Router - 2, // 4: spqr.RouterService.ListRouters:input_type -> spqr.ListRoutersRequest - 4, // 5: spqr.RouterService.AddRouter:input_type -> spqr.AddRouterRequest - 6, // 6: spqr.RouterService.RemoveRouter:input_type -> spqr.RemoveRouterRequest - 8, // 7: spqr.RouterService.SyncMetadata:input_type -> spqr.SyncMetadataRequest - 3, // 8: spqr.RouterService.ListRouters:output_type -> spqr.ListRoutersReply - 5, // 9: spqr.RouterService.AddRouter:output_type -> spqr.AddRouterReply - 7, // 10: spqr.RouterService.RemoveRouter:output_type -> spqr.RemoveRouterReply - 9, // 11: spqr.RouterService.SyncMetadata:output_type -> spqr.SyncMetadataReply + 7, // 4: spqr.RouterService.ListRouters:input_type -> google.protobuf.Empty + 3, // 5: spqr.RouterService.AddRouter:input_type -> spqr.AddRouterRequest + 5, // 6: spqr.RouterService.RemoveRouter:input_type -> spqr.RemoveRouterRequest + 6, // 7: spqr.RouterService.SyncMetadata:input_type -> spqr.SyncMetadataRequest + 2, // 8: spqr.RouterService.ListRouters:output_type -> spqr.ListRoutersReply + 4, // 9: spqr.RouterService.AddRouter:output_type -> spqr.AddRouterReply + 7, // 10: spqr.RouterService.RemoveRouter:output_type -> google.protobuf.Empty + 7, // 11: spqr.RouterService.SyncMetadata:output_type -> google.protobuf.Empty 8, // [8:12] is the sub-list for method output_type 4, // [4:8] is the sub-list for method input_type 4, // [4:4] is the sub-list for extension type_name @@ -598,18 +480,6 @@ func file_protos_router_proto_init() { } } file_protos_router_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListRoutersRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_router_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListRoutersReply); i { case 0: return &v.state @@ -621,7 +491,7 @@ func file_protos_router_proto_init() { return nil } } - file_protos_router_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + file_protos_router_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AddRouterRequest); i { case 0: return &v.state @@ -633,7 +503,7 @@ func file_protos_router_proto_init() { return nil } } - file_protos_router_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_protos_router_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AddRouterReply); i { case 0: return &v.state @@ -645,7 +515,7 @@ func file_protos_router_proto_init() { return nil } } - file_protos_router_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_protos_router_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*RemoveRouterRequest); i { case 0: return &v.state @@ -657,19 +527,7 @@ func file_protos_router_proto_init() { return nil } } - file_protos_router_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveRouterReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_router_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { + file_protos_router_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*SyncMetadataRequest); i { case 0: return &v.state @@ -681,18 +539,6 @@ func file_protos_router_proto_init() { return nil } } - file_protos_router_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SyncMetadataReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -700,7 +546,7 @@ func file_protos_router_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_router_proto_rawDesc, NumEnums: 1, - NumMessages: 9, + NumMessages: 6, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/router_grpc.pb.go b/pkg/protos/router_grpc.pb.go index 5ec475396..e34f22dc6 100644 --- a/pkg/protos/router_grpc.pb.go +++ b/pkg/protos/router_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -29,10 +30,10 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type RouterServiceClient interface { - ListRouters(ctx context.Context, in *ListRoutersRequest, opts ...grpc.CallOption) (*ListRoutersReply, error) + ListRouters(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListRoutersReply, error) AddRouter(ctx context.Context, in *AddRouterRequest, opts ...grpc.CallOption) (*AddRouterReply, error) - RemoveRouter(ctx context.Context, in *RemoveRouterRequest, opts ...grpc.CallOption) (*RemoveRouterReply, error) - SyncMetadata(ctx context.Context, in *SyncMetadataRequest, opts ...grpc.CallOption) (*SyncMetadataReply, error) + RemoveRouter(ctx context.Context, in *RemoveRouterRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + SyncMetadata(ctx context.Context, in *SyncMetadataRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) } type routerServiceClient struct { @@ -43,7 +44,7 @@ func NewRouterServiceClient(cc grpc.ClientConnInterface) RouterServiceClient { return &routerServiceClient{cc} } -func (c *routerServiceClient) ListRouters(ctx context.Context, in *ListRoutersRequest, opts ...grpc.CallOption) (*ListRoutersReply, error) { +func (c *routerServiceClient) ListRouters(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListRoutersReply, error) { out := new(ListRoutersReply) err := c.cc.Invoke(ctx, RouterService_ListRouters_FullMethodName, in, out, opts...) if err != nil { @@ -61,8 +62,8 @@ func (c *routerServiceClient) AddRouter(ctx context.Context, in *AddRouterReques return out, nil } -func (c *routerServiceClient) RemoveRouter(ctx context.Context, in *RemoveRouterRequest, opts ...grpc.CallOption) (*RemoveRouterReply, error) { - out := new(RemoveRouterReply) +func (c *routerServiceClient) RemoveRouter(ctx context.Context, in *RemoveRouterRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, RouterService_RemoveRouter_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -70,8 +71,8 @@ func (c *routerServiceClient) RemoveRouter(ctx context.Context, in *RemoveRouter return out, nil } -func (c *routerServiceClient) SyncMetadata(ctx context.Context, in *SyncMetadataRequest, opts ...grpc.CallOption) (*SyncMetadataReply, error) { - out := new(SyncMetadataReply) +func (c *routerServiceClient) SyncMetadata(ctx context.Context, in *SyncMetadataRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, RouterService_SyncMetadata_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -83,10 +84,10 @@ func (c *routerServiceClient) SyncMetadata(ctx context.Context, in *SyncMetadata // All implementations must embed UnimplementedRouterServiceServer // for forward compatibility type RouterServiceServer interface { - ListRouters(context.Context, *ListRoutersRequest) (*ListRoutersReply, error) + ListRouters(context.Context, *emptypb.Empty) (*ListRoutersReply, error) AddRouter(context.Context, *AddRouterRequest) (*AddRouterReply, error) - RemoveRouter(context.Context, *RemoveRouterRequest) (*RemoveRouterReply, error) - SyncMetadata(context.Context, *SyncMetadataRequest) (*SyncMetadataReply, error) + RemoveRouter(context.Context, *RemoveRouterRequest) (*emptypb.Empty, error) + SyncMetadata(context.Context, *SyncMetadataRequest) (*emptypb.Empty, error) mustEmbedUnimplementedRouterServiceServer() } @@ -94,16 +95,16 @@ type RouterServiceServer interface { type UnimplementedRouterServiceServer struct { } -func (UnimplementedRouterServiceServer) ListRouters(context.Context, *ListRoutersRequest) (*ListRoutersReply, error) { +func (UnimplementedRouterServiceServer) ListRouters(context.Context, *emptypb.Empty) (*ListRoutersReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListRouters not implemented") } func (UnimplementedRouterServiceServer) AddRouter(context.Context, *AddRouterRequest) (*AddRouterReply, error) { return nil, status.Errorf(codes.Unimplemented, "method AddRouter not implemented") } -func (UnimplementedRouterServiceServer) RemoveRouter(context.Context, *RemoveRouterRequest) (*RemoveRouterReply, error) { +func (UnimplementedRouterServiceServer) RemoveRouter(context.Context, *RemoveRouterRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveRouter not implemented") } -func (UnimplementedRouterServiceServer) SyncMetadata(context.Context, *SyncMetadataRequest) (*SyncMetadataReply, error) { +func (UnimplementedRouterServiceServer) SyncMetadata(context.Context, *SyncMetadataRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method SyncMetadata not implemented") } func (UnimplementedRouterServiceServer) mustEmbedUnimplementedRouterServiceServer() {} @@ -120,7 +121,7 @@ func RegisterRouterServiceServer(s grpc.ServiceRegistrar, srv RouterServiceServe } func _RouterService_ListRouters_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListRoutersRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -132,7 +133,7 @@ func _RouterService_ListRouters_Handler(srv interface{}, ctx context.Context, de FullMethod: RouterService_ListRouters_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(RouterServiceServer).ListRouters(ctx, req.(*ListRoutersRequest)) + return srv.(RouterServiceServer).ListRouters(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/shard.pb.go b/pkg/protos/shard.pb.go index a279fd968..b1e7ce694 100644 --- a/pkg/protos/shard.pb.go +++ b/pkg/protos/shard.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -177,44 +178,6 @@ func (x *ShardReply) GetShard() *Shard { return nil } -type ListShardsRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *ListShardsRequest) Reset() { - *x = ListShardsRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_shard_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *ListShardsRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*ListShardsRequest) ProtoMessage() {} - -func (x *ListShardsRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_shard_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use ListShardsRequest.ProtoReflect.Descriptor instead. -func (*ListShardsRequest) Descriptor() ([]byte, []int) { - return file_protos_shard_proto_rawDescGZIP(), []int{3} -} - type ShardRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -226,7 +189,7 @@ type ShardRequest struct { func (x *ShardRequest) Reset() { *x = ShardRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_shard_proto_msgTypes[4] + mi := &file_protos_shard_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -239,7 +202,7 @@ func (x *ShardRequest) String() string { func (*ShardRequest) ProtoMessage() {} func (x *ShardRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_shard_proto_msgTypes[4] + mi := &file_protos_shard_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -252,7 +215,7 @@ func (x *ShardRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ShardRequest.ProtoReflect.Descriptor instead. func (*ShardRequest) Descriptor() ([]byte, []int) { - return file_protos_shard_proto_rawDescGZIP(), []int{4} + return file_protos_shard_proto_rawDescGZIP(), []int{3} } func (x *ShardRequest) GetId() string { @@ -273,7 +236,7 @@ type ListShardsReply struct { func (x *ListShardsReply) Reset() { *x = ListShardsReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_shard_proto_msgTypes[5] + mi := &file_protos_shard_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -286,7 +249,7 @@ func (x *ListShardsReply) String() string { func (*ListShardsReply) ProtoMessage() {} func (x *ListShardsReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_shard_proto_msgTypes[5] + mi := &file_protos_shard_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -299,7 +262,7 @@ func (x *ListShardsReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ListShardsReply.ProtoReflect.Descriptor instead. func (*ListShardsReply) Descriptor() ([]byte, []int) { - return file_protos_shard_proto_rawDescGZIP(), []int{5} + return file_protos_shard_proto_rawDescGZIP(), []int{4} } func (x *ListShardsReply) GetShards() []*Shard { @@ -320,7 +283,7 @@ type AddShardRequest struct { func (x *AddShardRequest) Reset() { *x = AddShardRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_shard_proto_msgTypes[6] + mi := &file_protos_shard_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -333,7 +296,7 @@ func (x *AddShardRequest) String() string { func (*AddShardRequest) ProtoMessage() {} func (x *AddShardRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_shard_proto_msgTypes[6] + mi := &file_protos_shard_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -346,7 +309,7 @@ func (x *AddShardRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AddShardRequest.ProtoReflect.Descriptor instead. func (*AddShardRequest) Descriptor() ([]byte, []int) { - return file_protos_shard_proto_rawDescGZIP(), []int{6} + return file_protos_shard_proto_rawDescGZIP(), []int{5} } func (x *AddShardRequest) GetShard() *Shard { @@ -356,44 +319,6 @@ func (x *AddShardRequest) GetShard() *Shard { return nil } -type AddShardReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *AddShardReply) Reset() { - *x = AddShardReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_shard_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AddShardReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AddShardReply) ProtoMessage() {} - -func (x *AddShardReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_shard_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AddShardReply.ProtoReflect.Descriptor instead. -func (*AddShardReply) Descriptor() ([]byte, []int) { - return file_protos_shard_proto_rawDescGZIP(), []int{7} -} - type AddWorldShardRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -405,7 +330,7 @@ type AddWorldShardRequest struct { func (x *AddWorldShardRequest) Reset() { *x = AddWorldShardRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_shard_proto_msgTypes[8] + mi := &file_protos_shard_proto_msgTypes[6] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -418,7 +343,7 @@ func (x *AddWorldShardRequest) String() string { func (*AddWorldShardRequest) ProtoMessage() {} func (x *AddWorldShardRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_shard_proto_msgTypes[8] + mi := &file_protos_shard_proto_msgTypes[6] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -431,7 +356,7 @@ func (x *AddWorldShardRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use AddWorldShardRequest.ProtoReflect.Descriptor instead. func (*AddWorldShardRequest) Descriptor() ([]byte, []int) { - return file_protos_shard_proto_rawDescGZIP(), []int{8} + return file_protos_shard_proto_rawDescGZIP(), []int{6} } func (x *AddWorldShardRequest) GetShard() *Shard { @@ -445,49 +370,49 @@ var File_protos_shard_proto protoreflect.FileDescriptor var file_protos_shard_proto_rawDesc = []byte{ 0x0a, 0x12, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0x2d, 0x0a, 0x05, 0x53, 0x68, - 0x61, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x2d, 0x0a, 0x05, 0x53, 0x68, 0x61, 0x72, 0x64, + 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, + 0x12, 0x14, 0x0a, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, + 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x22, 0x31, 0x0a, 0x09, 0x53, 0x68, 0x61, 0x72, 0x64, 0x49, + 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, - 0x28, 0x09, 0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x22, 0x31, 0x0a, 0x09, 0x53, 0x68, 0x61, - 0x72, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x18, - 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x22, 0x2f, 0x0a, 0x0a, - 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x73, 0x68, - 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x13, 0x0a, - 0x11, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x22, 0x1e, 0x0a, 0x0c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, - 0x69, 0x64, 0x22, 0x36, 0x0a, 0x0f, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, - 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x23, 0x0a, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, - 0x72, 0x64, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x41, 0x64, - 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, - 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, - 0x22, 0x0f, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, - 0x79, 0x22, 0x39, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x53, 0x68, 0x61, - 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x05, 0x73, 0x68, 0x61, - 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, - 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x32, 0x84, 0x02, 0x0a, - 0x0c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x3e, 0x0a, - 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x12, 0x17, 0x2e, 0x73, 0x70, - 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x15, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, - 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x3c, 0x0a, - 0x0c, 0x41, 0x64, 0x64, 0x44, 0x61, 0x74, 0x61, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x15, 0x2e, - 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x53, - 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0d, 0x41, - 0x64, 0x64, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x53, 0x68, 0x61, 0x72, - 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x13, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, - 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, - 0x32, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x12, 0x2e, 0x73, 0x70, - 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x10, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, - 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x28, 0x09, 0x52, 0x05, 0x68, 0x6f, 0x73, 0x74, 0x73, 0x22, 0x2f, 0x0a, 0x0a, 0x53, 0x68, 0x61, + 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, + 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x1e, 0x0a, 0x0c, 0x53, 0x68, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0x36, 0x0a, 0x0f, 0x4c, 0x69, + 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x23, 0x0a, + 0x06, 0x73, 0x68, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x06, 0x73, 0x68, 0x61, 0x72, + 0x64, 0x73, 0x22, 0x34, 0x0a, 0x0f, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x21, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, + 0x64, 0x52, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x22, 0x39, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x57, + 0x6f, 0x72, 0x6c, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x12, 0x21, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x72, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x05, 0x73, 0x68, + 0x61, 0x72, 0x64, 0x32, 0x89, 0x02, 0x0a, 0x0c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x3d, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, + 0x64, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x15, 0x2e, 0x73, 0x70, 0x71, + 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x73, 0x52, 0x65, 0x70, 0x6c, + 0x79, 0x22, 0x00, 0x12, 0x3f, 0x0a, 0x0c, 0x41, 0x64, 0x64, 0x44, 0x61, 0x74, 0x61, 0x53, 0x68, + 0x61, 0x72, 0x64, 0x12, 0x15, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x53, 0x68, + 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, + 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, + 0x74, 0x79, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x0d, 0x41, 0x64, 0x64, 0x57, 0x6f, 0x72, 0x6c, 0x64, + 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, + 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, 0x12, 0x32, 0x0a, 0x08, 0x47, + 0x65, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x12, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, + 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, + 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -502,30 +427,29 @@ func file_protos_shard_proto_rawDescGZIP() []byte { return file_protos_shard_proto_rawDescData } -var file_protos_shard_proto_msgTypes = make([]protoimpl.MessageInfo, 9) +var file_protos_shard_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_protos_shard_proto_goTypes = []interface{}{ (*Shard)(nil), // 0: spqr.Shard (*ShardInfo)(nil), // 1: spqr.ShardInfo (*ShardReply)(nil), // 2: spqr.ShardReply - (*ListShardsRequest)(nil), // 3: spqr.ListShardsRequest - (*ShardRequest)(nil), // 4: spqr.ShardRequest - (*ListShardsReply)(nil), // 5: spqr.ListShardsReply - (*AddShardRequest)(nil), // 6: spqr.AddShardRequest - (*AddShardReply)(nil), // 7: spqr.AddShardReply - (*AddWorldShardRequest)(nil), // 8: spqr.AddWorldShardRequest + (*ShardRequest)(nil), // 3: spqr.ShardRequest + (*ListShardsReply)(nil), // 4: spqr.ListShardsReply + (*AddShardRequest)(nil), // 5: spqr.AddShardRequest + (*AddWorldShardRequest)(nil), // 6: spqr.AddWorldShardRequest + (*emptypb.Empty)(nil), // 7: google.protobuf.Empty } var file_protos_shard_proto_depIdxs = []int32{ 0, // 0: spqr.ShardReply.shard:type_name -> spqr.Shard 0, // 1: spqr.ListShardsReply.shards:type_name -> spqr.Shard 0, // 2: spqr.AddShardRequest.shard:type_name -> spqr.Shard 0, // 3: spqr.AddWorldShardRequest.shard:type_name -> spqr.Shard - 3, // 4: spqr.ShardService.ListShards:input_type -> spqr.ListShardsRequest - 6, // 5: spqr.ShardService.AddDataShard:input_type -> spqr.AddShardRequest - 8, // 6: spqr.ShardService.AddWorldShard:input_type -> spqr.AddWorldShardRequest - 4, // 7: spqr.ShardService.GetShard:input_type -> spqr.ShardRequest - 5, // 8: spqr.ShardService.ListShards:output_type -> spqr.ListShardsReply - 7, // 9: spqr.ShardService.AddDataShard:output_type -> spqr.AddShardReply - 7, // 10: spqr.ShardService.AddWorldShard:output_type -> spqr.AddShardReply + 7, // 4: spqr.ShardService.ListShards:input_type -> google.protobuf.Empty + 5, // 5: spqr.ShardService.AddDataShard:input_type -> spqr.AddShardRequest + 6, // 6: spqr.ShardService.AddWorldShard:input_type -> spqr.AddWorldShardRequest + 3, // 7: spqr.ShardService.GetShard:input_type -> spqr.ShardRequest + 4, // 8: spqr.ShardService.ListShards:output_type -> spqr.ListShardsReply + 7, // 9: spqr.ShardService.AddDataShard:output_type -> google.protobuf.Empty + 7, // 10: spqr.ShardService.AddWorldShard:output_type -> google.protobuf.Empty 2, // 11: spqr.ShardService.GetShard:output_type -> spqr.ShardReply 8, // [8:12] is the sub-list for method output_type 4, // [4:8] is the sub-list for method input_type @@ -577,18 +501,6 @@ func file_protos_shard_proto_init() { } } file_protos_shard_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ListShardsRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_shard_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ShardRequest); i { case 0: return &v.state @@ -600,7 +512,7 @@ func file_protos_shard_proto_init() { return nil } } - file_protos_shard_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_protos_shard_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListShardsReply); i { case 0: return &v.state @@ -612,7 +524,7 @@ func file_protos_shard_proto_init() { return nil } } - file_protos_shard_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_protos_shard_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AddShardRequest); i { case 0: return &v.state @@ -624,19 +536,7 @@ func file_protos_shard_proto_init() { return nil } } - file_protos_shard_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AddShardReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_shard_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} { + file_protos_shard_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*AddWorldShardRequest); i { case 0: return &v.state @@ -655,7 +555,7 @@ func file_protos_shard_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_shard_proto_rawDesc, NumEnums: 0, - NumMessages: 9, + NumMessages: 7, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/shard_grpc.pb.go b/pkg/protos/shard_grpc.pb.go index f65a69ccf..d7f1d85da 100644 --- a/pkg/protos/shard_grpc.pb.go +++ b/pkg/protos/shard_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -29,9 +30,9 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ShardServiceClient interface { - ListShards(ctx context.Context, in *ListShardsRequest, opts ...grpc.CallOption) (*ListShardsReply, error) - AddDataShard(ctx context.Context, in *AddShardRequest, opts ...grpc.CallOption) (*AddShardReply, error) - AddWorldShard(ctx context.Context, in *AddWorldShardRequest, opts ...grpc.CallOption) (*AddShardReply, error) + ListShards(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListShardsReply, error) + AddDataShard(ctx context.Context, in *AddShardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + AddWorldShard(ctx context.Context, in *AddWorldShardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) GetShard(ctx context.Context, in *ShardRequest, opts ...grpc.CallOption) (*ShardReply, error) } @@ -43,7 +44,7 @@ func NewShardServiceClient(cc grpc.ClientConnInterface) ShardServiceClient { return &shardServiceClient{cc} } -func (c *shardServiceClient) ListShards(ctx context.Context, in *ListShardsRequest, opts ...grpc.CallOption) (*ListShardsReply, error) { +func (c *shardServiceClient) ListShards(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*ListShardsReply, error) { out := new(ListShardsReply) err := c.cc.Invoke(ctx, ShardService_ListShards_FullMethodName, in, out, opts...) if err != nil { @@ -52,8 +53,8 @@ func (c *shardServiceClient) ListShards(ctx context.Context, in *ListShardsReque return out, nil } -func (c *shardServiceClient) AddDataShard(ctx context.Context, in *AddShardRequest, opts ...grpc.CallOption) (*AddShardReply, error) { - out := new(AddShardReply) +func (c *shardServiceClient) AddDataShard(ctx context.Context, in *AddShardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, ShardService_AddDataShard_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -61,8 +62,8 @@ func (c *shardServiceClient) AddDataShard(ctx context.Context, in *AddShardReque return out, nil } -func (c *shardServiceClient) AddWorldShard(ctx context.Context, in *AddWorldShardRequest, opts ...grpc.CallOption) (*AddShardReply, error) { - out := new(AddShardReply) +func (c *shardServiceClient) AddWorldShard(ctx context.Context, in *AddWorldShardRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, ShardService_AddWorldShard_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -83,9 +84,9 @@ func (c *shardServiceClient) GetShard(ctx context.Context, in *ShardRequest, opt // All implementations must embed UnimplementedShardServiceServer // for forward compatibility type ShardServiceServer interface { - ListShards(context.Context, *ListShardsRequest) (*ListShardsReply, error) - AddDataShard(context.Context, *AddShardRequest) (*AddShardReply, error) - AddWorldShard(context.Context, *AddWorldShardRequest) (*AddShardReply, error) + ListShards(context.Context, *emptypb.Empty) (*ListShardsReply, error) + AddDataShard(context.Context, *AddShardRequest) (*emptypb.Empty, error) + AddWorldShard(context.Context, *AddWorldShardRequest) (*emptypb.Empty, error) GetShard(context.Context, *ShardRequest) (*ShardReply, error) mustEmbedUnimplementedShardServiceServer() } @@ -94,13 +95,13 @@ type ShardServiceServer interface { type UnimplementedShardServiceServer struct { } -func (UnimplementedShardServiceServer) ListShards(context.Context, *ListShardsRequest) (*ListShardsReply, error) { +func (UnimplementedShardServiceServer) ListShards(context.Context, *emptypb.Empty) (*ListShardsReply, error) { return nil, status.Errorf(codes.Unimplemented, "method ListShards not implemented") } -func (UnimplementedShardServiceServer) AddDataShard(context.Context, *AddShardRequest) (*AddShardReply, error) { +func (UnimplementedShardServiceServer) AddDataShard(context.Context, *AddShardRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method AddDataShard not implemented") } -func (UnimplementedShardServiceServer) AddWorldShard(context.Context, *AddWorldShardRequest) (*AddShardReply, error) { +func (UnimplementedShardServiceServer) AddWorldShard(context.Context, *AddWorldShardRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method AddWorldShard not implemented") } func (UnimplementedShardServiceServer) GetShard(context.Context, *ShardRequest) (*ShardReply, error) { @@ -120,7 +121,7 @@ func RegisterShardServiceServer(s grpc.ServiceRegistrar, srv ShardServiceServer) } func _ShardService_ListShards_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(ListShardsRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -132,7 +133,7 @@ func _ShardService_ListShards_Handler(srv interface{}, ctx context.Context, dec FullMethod: ShardService_ListShards_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ShardServiceServer).ListShards(ctx, req.(*ListShardsRequest)) + return srv.(ShardServiceServer).ListShards(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/pkg/protos/sharding_rules.pb.go b/pkg/protos/sharding_rules.pb.go index 1171ab5b4..2131d5ca2 100644 --- a/pkg/protos/sharding_rules.pb.go +++ b/pkg/protos/sharding_rules.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -205,44 +206,6 @@ func (x *AddShardingRuleRequest) GetRules() []*ShardingRule { return nil } -type AddShardingRuleReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *AddShardingRuleReply) Reset() { - *x = AddShardingRuleReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_sharding_rules_proto_msgTypes[3] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *AddShardingRuleReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*AddShardingRuleReply) ProtoMessage() {} - -func (x *AddShardingRuleReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_sharding_rules_proto_msgTypes[3] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use AddShardingRuleReply.ProtoReflect.Descriptor instead. -func (*AddShardingRuleReply) Descriptor() ([]byte, []int) { - return file_protos_sharding_rules_proto_rawDescGZIP(), []int{3} -} - type ListShardingRuleRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -254,7 +217,7 @@ type ListShardingRuleRequest struct { func (x *ListShardingRuleRequest) Reset() { *x = ListShardingRuleRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_sharding_rules_proto_msgTypes[4] + mi := &file_protos_sharding_rules_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -267,7 +230,7 @@ func (x *ListShardingRuleRequest) String() string { func (*ListShardingRuleRequest) ProtoMessage() {} func (x *ListShardingRuleRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_sharding_rules_proto_msgTypes[4] + mi := &file_protos_sharding_rules_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -280,7 +243,7 @@ func (x *ListShardingRuleRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use ListShardingRuleRequest.ProtoReflect.Descriptor instead. func (*ListShardingRuleRequest) Descriptor() ([]byte, []int) { - return file_protos_sharding_rules_proto_rawDescGZIP(), []int{4} + return file_protos_sharding_rules_proto_rawDescGZIP(), []int{3} } func (x *ListShardingRuleRequest) GetDistribution() string { @@ -301,7 +264,7 @@ type ListShardingRuleReply struct { func (x *ListShardingRuleReply) Reset() { *x = ListShardingRuleReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_sharding_rules_proto_msgTypes[5] + mi := &file_protos_sharding_rules_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -314,7 +277,7 @@ func (x *ListShardingRuleReply) String() string { func (*ListShardingRuleReply) ProtoMessage() {} func (x *ListShardingRuleReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_sharding_rules_proto_msgTypes[5] + mi := &file_protos_sharding_rules_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -327,7 +290,7 @@ func (x *ListShardingRuleReply) ProtoReflect() protoreflect.Message { // Deprecated: Use ListShardingRuleReply.ProtoReflect.Descriptor instead. func (*ListShardingRuleReply) Descriptor() ([]byte, []int) { - return file_protos_sharding_rules_proto_rawDescGZIP(), []int{5} + return file_protos_sharding_rules_proto_rawDescGZIP(), []int{4} } func (x *ListShardingRuleReply) GetRules() []*ShardingRule { @@ -348,7 +311,7 @@ type DropShardingRuleRequest struct { func (x *DropShardingRuleRequest) Reset() { *x = DropShardingRuleRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_sharding_rules_proto_msgTypes[6] + mi := &file_protos_sharding_rules_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -361,7 +324,7 @@ func (x *DropShardingRuleRequest) String() string { func (*DropShardingRuleRequest) ProtoMessage() {} func (x *DropShardingRuleRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_sharding_rules_proto_msgTypes[6] + mi := &file_protos_sharding_rules_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -374,7 +337,7 @@ func (x *DropShardingRuleRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use DropShardingRuleRequest.ProtoReflect.Descriptor instead. func (*DropShardingRuleRequest) Descriptor() ([]byte, []int) { - return file_protos_sharding_rules_proto_rawDescGZIP(), []int{6} + return file_protos_sharding_rules_proto_rawDescGZIP(), []int{5} } func (x *DropShardingRuleRequest) GetId() []string { @@ -384,104 +347,64 @@ func (x *DropShardingRuleRequest) GetId() []string { return nil } -type DropShardingRuleReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *DropShardingRuleReply) Reset() { - *x = DropShardingRuleReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_sharding_rules_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *DropShardingRuleReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*DropShardingRuleReply) ProtoMessage() {} - -func (x *DropShardingRuleReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_sharding_rules_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use DropShardingRuleReply.ProtoReflect.Descriptor instead. -func (*DropShardingRuleReply) Descriptor() ([]byte, []int) { - return file_protos_sharding_rules_proto_rawDescGZIP(), []int{7} -} - var File_protos_sharding_rules_proto protoreflect.FileDescriptor var file_protos_sharding_rules_proto_rawDesc = []byte{ 0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x73, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, - 0x70, 0x71, 0x72, 0x22, 0x57, 0x0a, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, - 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, - 0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x06, 0x63, 0x6f, - 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x26, 0x0a, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, - 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xbb, 0x01, 0x0a, - 0x0c, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x12, 0x0a, - 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x20, 0x0a, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, - 0x61, 0x6d, 0x65, 0x12, 0x49, 0x0a, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, - 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, - 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, - 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x42, 0x02, 0x18, 0x01, 0x52, 0x11, 0x53, 0x68, 0x61, - 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x2a, - 0x0a, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x74, - 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x16, 0x41, 0x64, - 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x12, 0x28, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, - 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x16, - 0x0a, 0x14, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, - 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x3d, 0x0a, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, + 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x22, 0x57, 0x0a, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x1a, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, + 0x6e, 0x12, 0x26, 0x0a, 0x0c, 0x68, 0x61, 0x73, 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, + 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x68, 0x61, 0x73, + 0x68, 0x46, 0x75, 0x6e, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xbb, 0x01, 0x0a, 0x0c, 0x53, 0x68, + 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, + 0x0a, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, + 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, + 0x12, 0x49, 0x0a, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x73, 0x70, + 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x45, + 0x6e, 0x74, 0x72, 0x79, 0x42, 0x02, 0x18, 0x01, 0x52, 0x11, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, + 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x2a, 0x0a, 0x0e, 0x64, + 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x18, 0x04, 0x20, + 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0e, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, + 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x22, 0x42, 0x0a, 0x16, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, - 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, - 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x15, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, - 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x28, - 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, - 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, - 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x29, 0x0a, 0x17, 0x44, 0x72, 0x6f, 0x70, + 0x74, 0x12, 0x28, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, + 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x3d, 0x0a, 0x17, 0x4c, + 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, + 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x41, 0x0a, 0x15, 0x4c, 0x69, + 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, + 0x70, 0x6c, 0x79, 0x12, 0x28, 0x0a, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, + 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x05, 0x72, 0x75, 0x6c, 0x65, 0x73, 0x22, 0x29, 0x0a, + 0x17, 0x44, 0x72, 0x6f, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, + 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x32, 0x8c, 0x02, 0x0a, 0x14, 0x53, 0x68, 0x61, + 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, + 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, + 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, - 0x02, 0x69, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x44, 0x72, 0x6f, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, - 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x32, 0x95, 0x02, 0x0a, - 0x14, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x53, 0x65, - 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x51, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, - 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1c, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x41, 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x41, - 0x64, 0x64, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, - 0x70, 0x6c, 0x79, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x54, 0x0a, 0x11, 0x44, 0x72, 0x6f, 0x70, - 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1d, 0x2e, - 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, - 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, - 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x54, - 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, - 0x6c, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, - 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, - 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, - 0x03, 0x88, 0x02, 0x01, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x03, 0x88, 0x02, 0x01, + 0x12, 0x4f, 0x0a, 0x11, 0x44, 0x72, 0x6f, 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, + 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x44, 0x72, 0x6f, + 0x70, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x03, 0x88, 0x02, + 0x01, 0x12, 0x54, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, + 0x67, 0x52, 0x75, 0x6c, 0x65, 0x73, 0x12, 0x1d, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, + 0x73, 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4c, 0x69, 0x73, + 0x74, 0x53, 0x68, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x65, 0x70, + 0x6c, 0x79, 0x22, 0x03, 0x88, 0x02, 0x01, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -496,27 +419,26 @@ func file_protos_sharding_rules_proto_rawDescGZIP() []byte { return file_protos_sharding_rules_proto_rawDescData } -var file_protos_sharding_rules_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_protos_sharding_rules_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_protos_sharding_rules_proto_goTypes = []interface{}{ (*ShardingRuleEntry)(nil), // 0: spqr.ShardingRuleEntry (*ShardingRule)(nil), // 1: spqr.ShardingRule (*AddShardingRuleRequest)(nil), // 2: spqr.AddShardingRuleRequest - (*AddShardingRuleReply)(nil), // 3: spqr.AddShardingRuleReply - (*ListShardingRuleRequest)(nil), // 4: spqr.ListShardingRuleRequest - (*ListShardingRuleReply)(nil), // 5: spqr.ListShardingRuleReply - (*DropShardingRuleRequest)(nil), // 6: spqr.DropShardingRuleRequest - (*DropShardingRuleReply)(nil), // 7: spqr.DropShardingRuleReply + (*ListShardingRuleRequest)(nil), // 3: spqr.ListShardingRuleRequest + (*ListShardingRuleReply)(nil), // 4: spqr.ListShardingRuleReply + (*DropShardingRuleRequest)(nil), // 5: spqr.DropShardingRuleRequest + (*emptypb.Empty)(nil), // 6: google.protobuf.Empty } var file_protos_sharding_rules_proto_depIdxs = []int32{ 0, // 0: spqr.ShardingRule.ShardingRuleEntry:type_name -> spqr.ShardingRuleEntry 1, // 1: spqr.AddShardingRuleRequest.rules:type_name -> spqr.ShardingRule 1, // 2: spqr.ListShardingRuleReply.rules:type_name -> spqr.ShardingRule 2, // 3: spqr.ShardingRulesService.AddShardingRules:input_type -> spqr.AddShardingRuleRequest - 6, // 4: spqr.ShardingRulesService.DropShardingRules:input_type -> spqr.DropShardingRuleRequest - 4, // 5: spqr.ShardingRulesService.ListShardingRules:input_type -> spqr.ListShardingRuleRequest - 3, // 6: spqr.ShardingRulesService.AddShardingRules:output_type -> spqr.AddShardingRuleReply - 7, // 7: spqr.ShardingRulesService.DropShardingRules:output_type -> spqr.DropShardingRuleReply - 5, // 8: spqr.ShardingRulesService.ListShardingRules:output_type -> spqr.ListShardingRuleReply + 5, // 4: spqr.ShardingRulesService.DropShardingRules:input_type -> spqr.DropShardingRuleRequest + 3, // 5: spqr.ShardingRulesService.ListShardingRules:input_type -> spqr.ListShardingRuleRequest + 6, // 6: spqr.ShardingRulesService.AddShardingRules:output_type -> google.protobuf.Empty + 6, // 7: spqr.ShardingRulesService.DropShardingRules:output_type -> google.protobuf.Empty + 4, // 8: spqr.ShardingRulesService.ListShardingRules:output_type -> spqr.ListShardingRuleReply 6, // [6:9] is the sub-list for method output_type 3, // [3:6] is the sub-list for method input_type 3, // [3:3] is the sub-list for extension type_name @@ -567,18 +489,6 @@ func file_protos_sharding_rules_proto_init() { } } file_protos_sharding_rules_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*AddShardingRuleReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_sharding_rules_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListShardingRuleRequest); i { case 0: return &v.state @@ -590,7 +500,7 @@ func file_protos_sharding_rules_proto_init() { return nil } } - file_protos_sharding_rules_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + file_protos_sharding_rules_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ListShardingRuleReply); i { case 0: return &v.state @@ -602,7 +512,7 @@ func file_protos_sharding_rules_proto_init() { return nil } } - file_protos_sharding_rules_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { + file_protos_sharding_rules_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DropShardingRuleRequest); i { case 0: return &v.state @@ -614,18 +524,6 @@ func file_protos_sharding_rules_proto_init() { return nil } } - file_protos_sharding_rules_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*DropShardingRuleReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -633,7 +531,7 @@ func file_protos_sharding_rules_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_sharding_rules_proto_rawDesc, NumEnums: 0, - NumMessages: 8, + NumMessages: 6, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/sharding_rules_grpc.pb.go b/pkg/protos/sharding_rules_grpc.pb.go index cf24d0b29..43f00271c 100644 --- a/pkg/protos/sharding_rules_grpc.pb.go +++ b/pkg/protos/sharding_rules_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -29,9 +30,9 @@ const ( // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type ShardingRulesServiceClient interface { // Deprecated: Do not use. - AddShardingRules(ctx context.Context, in *AddShardingRuleRequest, opts ...grpc.CallOption) (*AddShardingRuleReply, error) + AddShardingRules(ctx context.Context, in *AddShardingRuleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) // Deprecated: Do not use. - DropShardingRules(ctx context.Context, in *DropShardingRuleRequest, opts ...grpc.CallOption) (*DropShardingRuleReply, error) + DropShardingRules(ctx context.Context, in *DropShardingRuleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) // Deprecated: Do not use. ListShardingRules(ctx context.Context, in *ListShardingRuleRequest, opts ...grpc.CallOption) (*ListShardingRuleReply, error) } @@ -45,8 +46,8 @@ func NewShardingRulesServiceClient(cc grpc.ClientConnInterface) ShardingRulesSer } // Deprecated: Do not use. -func (c *shardingRulesServiceClient) AddShardingRules(ctx context.Context, in *AddShardingRuleRequest, opts ...grpc.CallOption) (*AddShardingRuleReply, error) { - out := new(AddShardingRuleReply) +func (c *shardingRulesServiceClient) AddShardingRules(ctx context.Context, in *AddShardingRuleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, ShardingRulesService_AddShardingRules_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -55,8 +56,8 @@ func (c *shardingRulesServiceClient) AddShardingRules(ctx context.Context, in *A } // Deprecated: Do not use. -func (c *shardingRulesServiceClient) DropShardingRules(ctx context.Context, in *DropShardingRuleRequest, opts ...grpc.CallOption) (*DropShardingRuleReply, error) { - out := new(DropShardingRuleReply) +func (c *shardingRulesServiceClient) DropShardingRules(ctx context.Context, in *DropShardingRuleRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, ShardingRulesService_DropShardingRules_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -79,9 +80,9 @@ func (c *shardingRulesServiceClient) ListShardingRules(ctx context.Context, in * // for forward compatibility type ShardingRulesServiceServer interface { // Deprecated: Do not use. - AddShardingRules(context.Context, *AddShardingRuleRequest) (*AddShardingRuleReply, error) + AddShardingRules(context.Context, *AddShardingRuleRequest) (*emptypb.Empty, error) // Deprecated: Do not use. - DropShardingRules(context.Context, *DropShardingRuleRequest) (*DropShardingRuleReply, error) + DropShardingRules(context.Context, *DropShardingRuleRequest) (*emptypb.Empty, error) // Deprecated: Do not use. ListShardingRules(context.Context, *ListShardingRuleRequest) (*ListShardingRuleReply, error) mustEmbedUnimplementedShardingRulesServiceServer() @@ -91,10 +92,10 @@ type ShardingRulesServiceServer interface { type UnimplementedShardingRulesServiceServer struct { } -func (UnimplementedShardingRulesServiceServer) AddShardingRules(context.Context, *AddShardingRuleRequest) (*AddShardingRuleReply, error) { +func (UnimplementedShardingRulesServiceServer) AddShardingRules(context.Context, *AddShardingRuleRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method AddShardingRules not implemented") } -func (UnimplementedShardingRulesServiceServer) DropShardingRules(context.Context, *DropShardingRuleRequest) (*DropShardingRuleReply, error) { +func (UnimplementedShardingRulesServiceServer) DropShardingRules(context.Context, *DropShardingRuleRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DropShardingRules not implemented") } func (UnimplementedShardingRulesServiceServer) ListShardingRules(context.Context, *ListShardingRuleRequest) (*ListShardingRuleReply, error) { diff --git a/pkg/protos/tasks.pb.go b/pkg/protos/tasks.pb.go index 2ab93d603..fbe13cc64 100644 --- a/pkg/protos/tasks.pb.go +++ b/pkg/protos/tasks.pb.go @@ -9,6 +9,7 @@ package proto import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + emptypb "google.golang.org/protobuf/types/known/emptypb" reflect "reflect" sync "sync" ) @@ -268,44 +269,6 @@ func (x *TaskGroup) GetJoinType() JoinType { return JoinType_JoinNone } -type GetTaskGroupRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *GetTaskGroupRequest) Reset() { - *x = GetTaskGroupRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_tasks_proto_msgTypes[2] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *GetTaskGroupRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*GetTaskGroupRequest) ProtoMessage() {} - -func (x *GetTaskGroupRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_tasks_proto_msgTypes[2] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use GetTaskGroupRequest.ProtoReflect.Descriptor instead. -func (*GetTaskGroupRequest) Descriptor() ([]byte, []int) { - return file_protos_tasks_proto_rawDescGZIP(), []int{2} -} - type GetTaskGroupReply struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -317,7 +280,7 @@ type GetTaskGroupReply struct { func (x *GetTaskGroupReply) Reset() { *x = GetTaskGroupReply{} if protoimpl.UnsafeEnabled { - mi := &file_protos_tasks_proto_msgTypes[3] + mi := &file_protos_tasks_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -330,7 +293,7 @@ func (x *GetTaskGroupReply) String() string { func (*GetTaskGroupReply) ProtoMessage() {} func (x *GetTaskGroupReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_tasks_proto_msgTypes[3] + mi := &file_protos_tasks_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -343,7 +306,7 @@ func (x *GetTaskGroupReply) ProtoReflect() protoreflect.Message { // Deprecated: Use GetTaskGroupReply.ProtoReflect.Descriptor instead. func (*GetTaskGroupReply) Descriptor() ([]byte, []int) { - return file_protos_tasks_proto_rawDescGZIP(), []int{3} + return file_protos_tasks_proto_rawDescGZIP(), []int{2} } func (x *GetTaskGroupReply) GetTaskGroup() *TaskGroup { @@ -364,7 +327,7 @@ type WriteTaskGroupRequest struct { func (x *WriteTaskGroupRequest) Reset() { *x = WriteTaskGroupRequest{} if protoimpl.UnsafeEnabled { - mi := &file_protos_tasks_proto_msgTypes[4] + mi := &file_protos_tasks_proto_msgTypes[3] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -377,7 +340,7 @@ func (x *WriteTaskGroupRequest) String() string { func (*WriteTaskGroupRequest) ProtoMessage() {} func (x *WriteTaskGroupRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_tasks_proto_msgTypes[4] + mi := &file_protos_tasks_proto_msgTypes[3] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -390,7 +353,7 @@ func (x *WriteTaskGroupRequest) ProtoReflect() protoreflect.Message { // Deprecated: Use WriteTaskGroupRequest.ProtoReflect.Descriptor instead. func (*WriteTaskGroupRequest) Descriptor() ([]byte, []int) { - return file_protos_tasks_proto_rawDescGZIP(), []int{4} + return file_protos_tasks_proto_rawDescGZIP(), []int{3} } func (x *WriteTaskGroupRequest) GetTaskGroup() *TaskGroup { @@ -400,184 +363,65 @@ func (x *WriteTaskGroupRequest) GetTaskGroup() *TaskGroup { return nil } -type WriteTaskGroupReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *WriteTaskGroupReply) Reset() { - *x = WriteTaskGroupReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_tasks_proto_msgTypes[5] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *WriteTaskGroupReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*WriteTaskGroupReply) ProtoMessage() {} - -func (x *WriteTaskGroupReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_tasks_proto_msgTypes[5] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use WriteTaskGroupReply.ProtoReflect.Descriptor instead. -func (*WriteTaskGroupReply) Descriptor() ([]byte, []int) { - return file_protos_tasks_proto_rawDescGZIP(), []int{5} -} - -type RemoveTaskGroupRequest struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *RemoveTaskGroupRequest) Reset() { - *x = RemoveTaskGroupRequest{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_tasks_proto_msgTypes[6] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RemoveTaskGroupRequest) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RemoveTaskGroupRequest) ProtoMessage() {} - -func (x *RemoveTaskGroupRequest) ProtoReflect() protoreflect.Message { - mi := &file_protos_tasks_proto_msgTypes[6] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RemoveTaskGroupRequest.ProtoReflect.Descriptor instead. -func (*RemoveTaskGroupRequest) Descriptor() ([]byte, []int) { - return file_protos_tasks_proto_rawDescGZIP(), []int{6} -} - -type RemoveTaskGroupReply struct { - state protoimpl.MessageState - sizeCache protoimpl.SizeCache - unknownFields protoimpl.UnknownFields -} - -func (x *RemoveTaskGroupReply) Reset() { - *x = RemoveTaskGroupReply{} - if protoimpl.UnsafeEnabled { - mi := &file_protos_tasks_proto_msgTypes[7] - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - ms.StoreMessageInfo(mi) - } -} - -func (x *RemoveTaskGroupReply) String() string { - return protoimpl.X.MessageStringOf(x) -} - -func (*RemoveTaskGroupReply) ProtoMessage() {} - -func (x *RemoveTaskGroupReply) ProtoReflect() protoreflect.Message { - mi := &file_protos_tasks_proto_msgTypes[7] - if protoimpl.UnsafeEnabled && x != nil { - ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) - if ms.LoadMessageInfo() == nil { - ms.StoreMessageInfo(mi) - } - return ms - } - return mi.MessageOf(x) -} - -// Deprecated: Use RemoveTaskGroupReply.ProtoReflect.Descriptor instead. -func (*RemoveTaskGroupReply) Descriptor() ([]byte, []int) { - return file_protos_tasks_proto_rawDescGZIP(), []int{7} -} - var File_protos_tasks_proto protoreflect.FileDescriptor var file_protos_tasks_proto_rawDesc = []byte{ 0x0a, 0x12, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x22, 0xfa, 0x01, 0x0a, 0x04, 0x54, - 0x61, 0x73, 0x6b, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x46, 0x72, - 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, - 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, - 0x54, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, - 0x64, 0x54, 0x6f, 0x12, 0x26, 0x0a, 0x0e, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, - 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79, - 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x6b, - 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x12, - 0x26, 0x0a, 0x0e, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x54, 0x65, 0x6d, - 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, - 0x65, 0x49, 0x64, 0x54, 0x65, 0x6d, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, - 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x28, 0x0a, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, - 0x73, 0x70, 0x71, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, - 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x59, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x12, 0x20, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, - 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x12, 0x2a, 0x0a, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x54, 0x79, - 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, - 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x54, 0x79, - 0x70, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x42, 0x0a, 0x11, 0x47, 0x65, 0x74, - 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2d, - 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x46, 0x0a, - 0x15, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x70, 0x71, 0x72, - 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x15, 0x0a, 0x13, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, - 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x18, 0x0a, 0x16, - 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, - 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x2a, 0x2f, - 0x0a, 0x0a, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, - 0x50, 0x6c, 0x61, 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x6c, - 0x69, 0x74, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x4d, 0x6f, 0x76, 0x65, 0x64, 0x10, 0x02, 0x2a, - 0x35, 0x0a, 0x08, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x4a, - 0x6f, 0x69, 0x6e, 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4a, 0x6f, 0x69, - 0x6e, 0x4c, 0x65, 0x66, 0x74, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x6f, 0x69, 0x6e, 0x52, - 0x69, 0x67, 0x68, 0x74, 0x10, 0x02, 0x32, 0xef, 0x01, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x73, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x44, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, 0x61, - 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x19, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, - 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x1a, 0x17, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, - 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4a, 0x0a, - 0x0e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, - 0x1b, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, - 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x19, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x4d, 0x0a, 0x0f, 0x52, 0x65, 0x6d, - 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1c, 0x2e, 0x73, - 0x70, 0x71, 0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, - 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1a, 0x2e, 0x73, 0x70, 0x71, - 0x72, 0x2e, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x04, 0x73, 0x70, 0x71, 0x72, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, + 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, + 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xfa, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x73, 0x6b, + 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x46, 0x72, + 0x6f, 0x6d, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x54, 0x6f, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x68, 0x61, 0x72, 0x64, 0x49, 0x64, 0x54, 0x6f, + 0x12, 0x26, 0x0a, 0x0e, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x46, 0x72, + 0x6f, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, + 0x67, 0x65, 0x49, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x6b, 0x65, 0x79, 0x52, + 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, + 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x54, 0x6f, 0x12, 0x26, 0x0a, 0x0e, + 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, 0x54, 0x65, 0x6d, 0x70, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x64, + 0x54, 0x65, 0x6d, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x18, 0x06, 0x20, + 0x01, 0x28, 0x0c, 0x52, 0x05, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x12, 0x28, 0x0a, 0x06, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10, 0x2e, 0x73, 0x70, 0x71, + 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, + 0x61, 0x74, 0x75, 0x73, 0x22, 0x59, 0x0a, 0x09, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x12, 0x20, 0x0a, 0x05, 0x74, 0x61, 0x73, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x0a, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x05, 0x74, 0x61, + 0x73, 0x6b, 0x73, 0x12, 0x2a, 0x0a, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x0e, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x4a, 0x6f, 0x69, + 0x6e, 0x54, 0x79, 0x70, 0x65, 0x52, 0x08, 0x6a, 0x6f, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, + 0x42, 0x0a, 0x11, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x65, 0x70, 0x6c, 0x79, 0x12, 0x2d, 0x0a, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x54, + 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x22, 0x46, 0x0a, 0x15, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, + 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x2d, 0x0a, 0x09, + 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x0f, 0x2e, 0x73, 0x70, 0x71, 0x72, 0x2e, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x52, 0x09, 0x74, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x2a, 0x2f, 0x0a, 0x0a, 0x54, + 0x61, 0x73, 0x6b, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x6c, 0x61, + 0x6e, 0x6e, 0x65, 0x64, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x70, 0x6c, 0x69, 0x74, 0x10, + 0x01, 0x12, 0x09, 0x0a, 0x05, 0x4d, 0x6f, 0x76, 0x65, 0x64, 0x10, 0x02, 0x2a, 0x35, 0x0a, 0x08, + 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x4a, 0x6f, 0x69, 0x6e, + 0x4e, 0x6f, 0x6e, 0x65, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x65, + 0x66, 0x74, 0x10, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x4a, 0x6f, 0x69, 0x6e, 0x52, 0x69, 0x67, 0x68, + 0x74, 0x10, 0x02, 0x32, 0xdf, 0x01, 0x0a, 0x0c, 0x54, 0x61, 0x73, 0x6b, 0x73, 0x53, 0x65, 0x72, + 0x76, 0x69, 0x63, 0x65, 0x12, 0x41, 0x0a, 0x0c, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x47, + 0x72, 0x6f, 0x75, 0x70, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x17, 0x2e, 0x73, + 0x70, 0x71, 0x72, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, + 0x52, 0x65, 0x70, 0x6c, 0x79, 0x22, 0x00, 0x12, 0x47, 0x0a, 0x0e, 0x57, 0x72, 0x69, 0x74, 0x65, + 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1b, 0x2e, 0x73, 0x70, 0x71, 0x72, + 0x2e, 0x57, 0x72, 0x69, 0x74, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x22, 0x00, + 0x12, 0x43, 0x0a, 0x0f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x54, 0x61, 0x73, 0x6b, 0x47, 0x72, + 0x6f, 0x75, 0x70, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x16, 0x2e, 0x67, 0x6f, + 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, + 0x70, 0x74, 0x79, 0x22, 0x00, 0x42, 0x0c, 0x5a, 0x0a, 0x73, 0x70, 0x71, 0x72, 0x2f, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -593,18 +437,15 @@ func file_protos_tasks_proto_rawDescGZIP() []byte { } var file_protos_tasks_proto_enumTypes = make([]protoimpl.EnumInfo, 2) -var file_protos_tasks_proto_msgTypes = make([]protoimpl.MessageInfo, 8) +var file_protos_tasks_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_protos_tasks_proto_goTypes = []interface{}{ - (TaskStatus)(0), // 0: spqr.TaskStatus - (JoinType)(0), // 1: spqr.JoinType - (*Task)(nil), // 2: spqr.Task - (*TaskGroup)(nil), // 3: spqr.TaskGroup - (*GetTaskGroupRequest)(nil), // 4: spqr.GetTaskGroupRequest - (*GetTaskGroupReply)(nil), // 5: spqr.GetTaskGroupReply - (*WriteTaskGroupRequest)(nil), // 6: spqr.WriteTaskGroupRequest - (*WriteTaskGroupReply)(nil), // 7: spqr.WriteTaskGroupReply - (*RemoveTaskGroupRequest)(nil), // 8: spqr.RemoveTaskGroupRequest - (*RemoveTaskGroupReply)(nil), // 9: spqr.RemoveTaskGroupReply + (TaskStatus)(0), // 0: spqr.TaskStatus + (JoinType)(0), // 1: spqr.JoinType + (*Task)(nil), // 2: spqr.Task + (*TaskGroup)(nil), // 3: spqr.TaskGroup + (*GetTaskGroupReply)(nil), // 4: spqr.GetTaskGroupReply + (*WriteTaskGroupRequest)(nil), // 5: spqr.WriteTaskGroupRequest + (*emptypb.Empty)(nil), // 6: google.protobuf.Empty } var file_protos_tasks_proto_depIdxs = []int32{ 0, // 0: spqr.Task.status:type_name -> spqr.TaskStatus @@ -612,12 +453,12 @@ var file_protos_tasks_proto_depIdxs = []int32{ 1, // 2: spqr.TaskGroup.joinType:type_name -> spqr.JoinType 3, // 3: spqr.GetTaskGroupReply.taskGroup:type_name -> spqr.TaskGroup 3, // 4: spqr.WriteTaskGroupRequest.taskGroup:type_name -> spqr.TaskGroup - 4, // 5: spqr.TasksService.GetTaskGroup:input_type -> spqr.GetTaskGroupRequest - 6, // 6: spqr.TasksService.WriteTaskGroup:input_type -> spqr.WriteTaskGroupRequest - 8, // 7: spqr.TasksService.RemoveTaskGroup:input_type -> spqr.RemoveTaskGroupRequest - 5, // 8: spqr.TasksService.GetTaskGroup:output_type -> spqr.GetTaskGroupReply - 7, // 9: spqr.TasksService.WriteTaskGroup:output_type -> spqr.WriteTaskGroupReply - 9, // 10: spqr.TasksService.RemoveTaskGroup:output_type -> spqr.RemoveTaskGroupReply + 6, // 5: spqr.TasksService.GetTaskGroup:input_type -> google.protobuf.Empty + 5, // 6: spqr.TasksService.WriteTaskGroup:input_type -> spqr.WriteTaskGroupRequest + 6, // 7: spqr.TasksService.RemoveTaskGroup:input_type -> google.protobuf.Empty + 4, // 8: spqr.TasksService.GetTaskGroup:output_type -> spqr.GetTaskGroupReply + 6, // 9: spqr.TasksService.WriteTaskGroup:output_type -> google.protobuf.Empty + 6, // 10: spqr.TasksService.RemoveTaskGroup:output_type -> google.protobuf.Empty 8, // [8:11] is the sub-list for method output_type 5, // [5:8] is the sub-list for method input_type 5, // [5:5] is the sub-list for extension type_name @@ -656,18 +497,6 @@ func file_protos_tasks_proto_init() { } } file_protos_tasks_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetTaskGroupRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_tasks_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*GetTaskGroupReply); i { case 0: return &v.state @@ -679,7 +508,7 @@ func file_protos_tasks_proto_init() { return nil } } - file_protos_tasks_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + file_protos_tasks_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*WriteTaskGroupRequest); i { case 0: return &v.state @@ -691,42 +520,6 @@ func file_protos_tasks_proto_init() { return nil } } - file_protos_tasks_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*WriteTaskGroupReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_tasks_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveTaskGroupRequest); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } - file_protos_tasks_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*RemoveTaskGroupReply); i { - case 0: - return &v.state - case 1: - return &v.sizeCache - case 2: - return &v.unknownFields - default: - return nil - } - } } type x struct{} out := protoimpl.TypeBuilder{ @@ -734,7 +527,7 @@ func file_protos_tasks_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_protos_tasks_proto_rawDesc, NumEnums: 2, - NumMessages: 8, + NumMessages: 4, NumExtensions: 0, NumServices: 1, }, diff --git a/pkg/protos/tasks_grpc.pb.go b/pkg/protos/tasks_grpc.pb.go index e3f442ba1..5a06e97ee 100644 --- a/pkg/protos/tasks_grpc.pb.go +++ b/pkg/protos/tasks_grpc.pb.go @@ -11,6 +11,7 @@ import ( grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + emptypb "google.golang.org/protobuf/types/known/emptypb" ) // This is a compile-time assertion to ensure that this generated file @@ -28,9 +29,9 @@ const ( // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type TasksServiceClient interface { - GetTaskGroup(ctx context.Context, in *GetTaskGroupRequest, opts ...grpc.CallOption) (*GetTaskGroupReply, error) - WriteTaskGroup(ctx context.Context, in *WriteTaskGroupRequest, opts ...grpc.CallOption) (*WriteTaskGroupReply, error) - RemoveTaskGroup(ctx context.Context, in *RemoveTaskGroupRequest, opts ...grpc.CallOption) (*RemoveTaskGroupReply, error) + GetTaskGroup(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetTaskGroupReply, error) + WriteTaskGroup(ctx context.Context, in *WriteTaskGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) + RemoveTaskGroup(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) } type tasksServiceClient struct { @@ -41,7 +42,7 @@ func NewTasksServiceClient(cc grpc.ClientConnInterface) TasksServiceClient { return &tasksServiceClient{cc} } -func (c *tasksServiceClient) GetTaskGroup(ctx context.Context, in *GetTaskGroupRequest, opts ...grpc.CallOption) (*GetTaskGroupReply, error) { +func (c *tasksServiceClient) GetTaskGroup(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetTaskGroupReply, error) { out := new(GetTaskGroupReply) err := c.cc.Invoke(ctx, TasksService_GetTaskGroup_FullMethodName, in, out, opts...) if err != nil { @@ -50,8 +51,8 @@ func (c *tasksServiceClient) GetTaskGroup(ctx context.Context, in *GetTaskGroupR return out, nil } -func (c *tasksServiceClient) WriteTaskGroup(ctx context.Context, in *WriteTaskGroupRequest, opts ...grpc.CallOption) (*WriteTaskGroupReply, error) { - out := new(WriteTaskGroupReply) +func (c *tasksServiceClient) WriteTaskGroup(ctx context.Context, in *WriteTaskGroupRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TasksService_WriteTaskGroup_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -59,8 +60,8 @@ func (c *tasksServiceClient) WriteTaskGroup(ctx context.Context, in *WriteTaskGr return out, nil } -func (c *tasksServiceClient) RemoveTaskGroup(ctx context.Context, in *RemoveTaskGroupRequest, opts ...grpc.CallOption) (*RemoveTaskGroupReply, error) { - out := new(RemoveTaskGroupReply) +func (c *tasksServiceClient) RemoveTaskGroup(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*emptypb.Empty, error) { + out := new(emptypb.Empty) err := c.cc.Invoke(ctx, TasksService_RemoveTaskGroup_FullMethodName, in, out, opts...) if err != nil { return nil, err @@ -72,9 +73,9 @@ func (c *tasksServiceClient) RemoveTaskGroup(ctx context.Context, in *RemoveTask // All implementations must embed UnimplementedTasksServiceServer // for forward compatibility type TasksServiceServer interface { - GetTaskGroup(context.Context, *GetTaskGroupRequest) (*GetTaskGroupReply, error) - WriteTaskGroup(context.Context, *WriteTaskGroupRequest) (*WriteTaskGroupReply, error) - RemoveTaskGroup(context.Context, *RemoveTaskGroupRequest) (*RemoveTaskGroupReply, error) + GetTaskGroup(context.Context, *emptypb.Empty) (*GetTaskGroupReply, error) + WriteTaskGroup(context.Context, *WriteTaskGroupRequest) (*emptypb.Empty, error) + RemoveTaskGroup(context.Context, *emptypb.Empty) (*emptypb.Empty, error) mustEmbedUnimplementedTasksServiceServer() } @@ -82,13 +83,13 @@ type TasksServiceServer interface { type UnimplementedTasksServiceServer struct { } -func (UnimplementedTasksServiceServer) GetTaskGroup(context.Context, *GetTaskGroupRequest) (*GetTaskGroupReply, error) { +func (UnimplementedTasksServiceServer) GetTaskGroup(context.Context, *emptypb.Empty) (*GetTaskGroupReply, error) { return nil, status.Errorf(codes.Unimplemented, "method GetTaskGroup not implemented") } -func (UnimplementedTasksServiceServer) WriteTaskGroup(context.Context, *WriteTaskGroupRequest) (*WriteTaskGroupReply, error) { +func (UnimplementedTasksServiceServer) WriteTaskGroup(context.Context, *WriteTaskGroupRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method WriteTaskGroup not implemented") } -func (UnimplementedTasksServiceServer) RemoveTaskGroup(context.Context, *RemoveTaskGroupRequest) (*RemoveTaskGroupReply, error) { +func (UnimplementedTasksServiceServer) RemoveTaskGroup(context.Context, *emptypb.Empty) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveTaskGroup not implemented") } func (UnimplementedTasksServiceServer) mustEmbedUnimplementedTasksServiceServer() {} @@ -105,7 +106,7 @@ func RegisterTasksServiceServer(s grpc.ServiceRegistrar, srv TasksServiceServer) } func _TasksService_GetTaskGroup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetTaskGroupRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -117,7 +118,7 @@ func _TasksService_GetTaskGroup_Handler(srv interface{}, ctx context.Context, de FullMethod: TasksService_GetTaskGroup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TasksServiceServer).GetTaskGroup(ctx, req.(*GetTaskGroupRequest)) + return srv.(TasksServiceServer).GetTaskGroup(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } @@ -141,7 +142,7 @@ func _TasksService_WriteTaskGroup_Handler(srv interface{}, ctx context.Context, } func _TasksService_RemoveTaskGroup_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(RemoveTaskGroupRequest) + in := new(emptypb.Empty) if err := dec(in); err != nil { return nil, err } @@ -153,7 +154,7 @@ func _TasksService_RemoveTaskGroup_Handler(srv interface{}, ctx context.Context, FullMethod: TasksService_RemoveTaskGroup_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(TasksServiceServer).RemoveTaskGroup(ctx, req.(*RemoveTaskGroupRequest)) + return srv.(TasksServiceServer).RemoveTaskGroup(ctx, req.(*emptypb.Empty)) } return interceptor(ctx, in, info, handler) } diff --git a/protos/backend_connections.proto b/protos/backend_connections.proto index 74c9ea52c..11a674425 100644 --- a/protos/backend_connections.proto +++ b/protos/backend_connections.proto @@ -4,12 +4,10 @@ package spqr; option go_package = "spqr/proto"; -service BackendConnectionsService { - rpc ListBackendConnections (ListBackendConnectionsRequest) returns (ListBackendConntionsReply) {} -} +import "google/protobuf/empty.proto"; -message ListBackendConnectionsRequest { - +service BackendConnectionsService { + rpc ListBackendConnections (google.protobuf.Empty) returns (ListBackendConntionsReply) {} } message ListBackendConntionsReply { diff --git a/protos/clients.proto b/protos/clients.proto index 7cbf87098..47173a6cc 100644 --- a/protos/clients.proto +++ b/protos/clients.proto @@ -4,12 +4,10 @@ package spqr; option go_package = "spqr/proto"; -service ClientInfoService { - rpc ListClients (ListClientsRequest) returns (ListClientsReply) {} -} +import "google/protobuf/empty.proto"; -message ListClientsRequest { - +service ClientInfoService { + rpc ListClients (google.protobuf.Empty) returns (ListClientsReply) {} } message ListClientsReply { diff --git a/protos/coordinator.proto b/protos/coordinator.proto index 8ac37cb7a..d14efda73 100644 --- a/protos/coordinator.proto +++ b/protos/coordinator.proto @@ -4,27 +4,18 @@ package spqr; option go_package = "spqr/proto"; +import "google/protobuf/empty.proto"; import "protos/router.proto"; service TopologyService { - rpc OpenRouter(OpenRouterRequest) returns (OpenRouterReply) {} - rpc GetRouterStatus(GetRouterStatusRequest) returns (GetRouterStatusReply) {} - rpc CloseRouter(CloseRouterRequest) returns (CloseRouterReply) {} - rpc UpdateCoordinator(UpdateCoordinatorRequest) returns (UpdateCoordinatorResponse) {} - rpc GetCoordinator(GetCoordinatorRequest) returns (GetCoordinatorResponse) {} + rpc OpenRouter(google.protobuf.Empty) returns (google.protobuf.Empty) {} + rpc GetRouterStatus(google.protobuf.Empty) returns (GetRouterStatusReply) {} + rpc CloseRouter(google.protobuf.Empty) returns (google.protobuf.Empty) {} + rpc UpdateCoordinator(UpdateCoordinatorRequest) returns (google.protobuf.Empty) {} + rpc GetCoordinator(google.protobuf.Empty) returns (GetCoordinatorResponse) {} } -message OpenRouterRequest {} - -message OpenRouterReply {} - -message CloseRouterRequest {} - -message CloseRouterReply {} - -message GetRouterStatusRequest {} - message GetRouterStatusReply { RouterStatus status = 1; } @@ -33,10 +24,6 @@ message UpdateCoordinatorRequest { string address = 1; } -message UpdateCoordinatorResponse {} - -message GetCoordinatorRequest {} - message GetCoordinatorResponse { string address = 1; } \ No newline at end of file diff --git a/protos/distribution.proto b/protos/distribution.proto index 270666bd2..83ea6b62f 100644 --- a/protos/distribution.proto +++ b/protos/distribution.proto @@ -4,6 +4,8 @@ package spqr; option go_package = "spqr/proto"; +import "google/protobuf/empty.proto"; + message DistributionKeyEntry { string column = 1; string hashFunction = 2; @@ -25,10 +27,6 @@ message CreateDistributionRequest{ repeated Distribution distributions = 1; } -message CreateDistributionReply{} - -message ListDistributionsRequest{} - message ListDistributionsReply { repeated Distribution distributions = 1; } @@ -37,23 +35,17 @@ message DropDistributionRequest { repeated string ids = 1; } -message DropDistributionReply{} - message AlterDistributionAttachRequest{ string id = 1; repeated string ColumnNames = 2; repeated DistributedRelation relations = 3; } -message AlterDistributionAttachReply{} - message AlterDistributionDetachRequest{ string id = 1; repeated string relNames = 2; } -message AlterDistributionDetachReply{} - message GetDistributionRequest{ string id = 1; } @@ -71,12 +63,12 @@ message GetRelationDistributionReply { } service DistributionService { - rpc CreateDistribution(CreateDistributionRequest) returns (CreateDistributionReply) {} - rpc DropDistribution(DropDistributionRequest) returns (DropDistributionReply) {} - rpc ListDistributions(ListDistributionsRequest) returns (ListDistributionsReply) {} + rpc CreateDistribution(CreateDistributionRequest) returns (google.protobuf.Empty) {} + rpc DropDistribution(DropDistributionRequest) returns (google.protobuf.Empty) {} + rpc ListDistributions(google.protobuf.Empty) returns (ListDistributionsReply) {} - rpc AlterDistributionAttach(AlterDistributionAttachRequest) returns (AlterDistributionAttachReply) {} - rpc AlterDistributionDetach(AlterDistributionDetachRequest) returns (AlterDistributionDetachReply) {} + rpc AlterDistributionAttach(AlterDistributionAttachRequest) returns (google.protobuf.Empty) {} + rpc AlterDistributionDetach(AlterDistributionDetachRequest) returns (google.protobuf.Empty) {} rpc GetDistribution(GetDistributionRequest) returns (GetDistributionReply) {} diff --git a/protos/key_range.proto b/protos/key_range.proto index 6b2ce666d..7b6a19437 100644 --- a/protos/key_range.proto +++ b/protos/key_range.proto @@ -3,15 +3,17 @@ syntax = "proto3"; package spqr; option go_package = "spqr/proto"; + +import "google/protobuf/empty.proto"; service KeyRangeService { rpc GetKeyRange (GetKeyRangeRequest) returns (KeyRangeReply) {} rpc ListKeyRange (ListKeyRangeRequest) returns (KeyRangeReply) {} - rpc ListAllKeyRanges (ListAllKeyRangesRequest) returns (KeyRangeReply) {} + rpc ListAllKeyRanges (google.protobuf.Empty) returns (KeyRangeReply) {} rpc LockKeyRange (LockKeyRangeRequest) returns (ModifyReply) {} rpc CreateKeyRange(CreateKeyRangeRequest) returns (ModifyReply) {} rpc DropKeyRange(DropKeyRangeRequest) returns (ModifyReply) {} - rpc DropAllKeyRanges(DropAllKeyRangesRequest) returns (DropAllKeyRangesResponse) {} + rpc DropAllKeyRanges(google.protobuf.Empty) returns (DropAllKeyRangesResponse) {} rpc UnlockKeyRange (UnlockKeyRangeRequest) returns (ModifyReply) {} rpc SplitKeyRange (SplitKeyRangeRequest) returns (ModifyReply) {} rpc MergeKeyRange (MergeKeyRangeRequest) returns (ModifyReply) {} @@ -41,8 +43,6 @@ message ListKeyRangeRequest { string distribution = 1; } -message ListAllKeyRangesRequest { } - message CreateKeyRangeRequest { KeyRangeInfo key_range_info = 1; } @@ -68,9 +68,6 @@ message DropKeyRangeRequest { repeated string id = 1; } -message DropAllKeyRangesRequest { -} - message DropAllKeyRangesResponse { repeated KeyRangeInfo key_range = 1; } diff --git a/protos/pools.proto b/protos/pools.proto index fa9abb14f..dc269c3bd 100644 --- a/protos/pools.proto +++ b/protos/pools.proto @@ -3,11 +3,10 @@ package spqr; option go_package = "spqr/proto"; -service PoolService { - rpc ListPools(ListPoolsRequest) returns (ListPoolsResponse) {} -} +import "google/protobuf/empty.proto"; -message ListPoolsRequest { +service PoolService { + rpc ListPools(google.protobuf.Empty) returns (ListPoolsResponse) {} } message ListPoolsResponse { diff --git a/protos/router.proto b/protos/router.proto index 752252f52..2e1217af0 100644 --- a/protos/router.proto +++ b/protos/router.proto @@ -4,12 +4,13 @@ package spqr; option go_package = "spqr/proto"; +import "google/protobuf/empty.proto"; + enum RouterStatus { CLOSED = 0; OPENED = 1; } - message Router { string id = 1; string address = 2; @@ -17,15 +18,12 @@ message Router { } service RouterService { - rpc ListRouters (ListRoutersRequest) returns (ListRoutersReply) {} + rpc ListRouters (google.protobuf.Empty) returns (ListRoutersReply) {} rpc AddRouter (AddRouterRequest) returns (AddRouterReply) {} - rpc RemoveRouter (RemoveRouterRequest) returns (RemoveRouterReply) {} - rpc SyncMetadata (SyncMetadataRequest) returns (SyncMetadataReply) {} + rpc RemoveRouter (RemoveRouterRequest) returns (google.protobuf.Empty) {} + rpc SyncMetadata (SyncMetadataRequest) returns (google.protobuf.Empty) {} } - -message ListRoutersRequest {} - message ListRoutersReply { repeated Router routers = 1; } @@ -42,10 +40,6 @@ message RemoveRouterRequest { string id = 1; } -message RemoveRouterReply {} - message SyncMetadataRequest { Router router = 1; -} - -message SyncMetadataReply {} \ No newline at end of file +} \ No newline at end of file diff --git a/protos/shard.proto b/protos/shard.proto index 8cda6b9ef..1efed3220 100644 --- a/protos/shard.proto +++ b/protos/shard.proto @@ -4,6 +4,8 @@ package spqr; option go_package = "spqr/proto"; +import "google/protobuf/empty.proto"; + message Shard { string id = 1; repeated string hosts = 2; @@ -15,9 +17,9 @@ message ShardInfo { } service ShardService { - rpc ListShards (ListShardsRequest) returns (ListShardsReply) {} - rpc AddDataShard (AddShardRequest) returns (AddShardReply) {} - rpc AddWorldShard (AddWorldShardRequest) returns (AddShardReply) {} + rpc ListShards (google.protobuf.Empty) returns (ListShardsReply) {} + rpc AddDataShard (AddShardRequest) returns (google.protobuf.Empty) {} + rpc AddWorldShard (AddWorldShardRequest) returns (google.protobuf.Empty) {} rpc GetShard (ShardRequest) returns (ShardReply) {} } @@ -25,9 +27,6 @@ message ShardReply { Shard shard = 1; } -message ListShardsRequest { -} - message ShardRequest { string id = 1; } @@ -40,9 +39,6 @@ message AddShardRequest { Shard shard = 1; } -message AddShardReply { -} - message AddWorldShardRequest { Shard shard = 1; } \ No newline at end of file diff --git a/protos/sharding_rules.proto b/protos/sharding_rules.proto index 3f1025c6c..536a7c248 100644 --- a/protos/sharding_rules.proto +++ b/protos/sharding_rules.proto @@ -4,12 +4,13 @@ package spqr; option go_package = "spqr/proto"; +import "google/protobuf/empty.proto"; + message ShardingRuleEntry { string column = 2 [deprecated = true]; string hashFunction = 3 [deprecated = true]; } - message ShardingRule { string id = 1 [deprecated = true]; string tableName = 2 [deprecated = true]; @@ -21,8 +22,6 @@ message AddShardingRuleRequest { repeated ShardingRule rules = 1; } -message AddShardingRuleReply {} - message ListShardingRuleRequest { string distribution = 1; } @@ -35,13 +34,11 @@ message DropShardingRuleRequest { repeated string id = 1; } -message DropShardingRuleReply {} - service ShardingRulesService { - rpc AddShardingRules(AddShardingRuleRequest) returns (AddShardingRuleReply) { + rpc AddShardingRules(AddShardingRuleRequest) returns (google.protobuf.Empty) { option deprecated = true; } - rpc DropShardingRules(DropShardingRuleRequest) returns (DropShardingRuleReply) { + rpc DropShardingRules(DropShardingRuleRequest) returns (google.protobuf.Empty) { option deprecated = true; } rpc ListShardingRules(ListShardingRuleRequest) returns (ListShardingRuleReply) { diff --git a/protos/tasks.proto b/protos/tasks.proto index 9dde7be4a..84f8968e5 100644 --- a/protos/tasks.proto +++ b/protos/tasks.proto @@ -4,6 +4,8 @@ package spqr; option go_package = "spqr/proto"; +import "google/protobuf/empty.proto"; + enum TaskStatus { Planned = 0; Split = 1; @@ -31,7 +33,6 @@ message TaskGroup { JoinType joinType = 2; } -message GetTaskGroupRequest{} message GetTaskGroupReply { TaskGroup taskGroup = 1; } @@ -39,13 +40,9 @@ message GetTaskGroupReply { message WriteTaskGroupRequest{ TaskGroup taskGroup = 1; } -message WriteTaskGroupReply {} - -message RemoveTaskGroupRequest{} -message RemoveTaskGroupReply{} service TasksService { - rpc GetTaskGroup(GetTaskGroupRequest) returns (GetTaskGroupReply) {} - rpc WriteTaskGroup(WriteTaskGroupRequest) returns(WriteTaskGroupReply) {} - rpc RemoveTaskGroup(RemoveTaskGroupRequest) returns(RemoveTaskGroupReply) {} + rpc GetTaskGroup(google.protobuf.Empty) returns (GetTaskGroupReply) {} + rpc WriteTaskGroup(WriteTaskGroupRequest) returns(google.protobuf.Empty) {} + rpc RemoveTaskGroup(google.protobuf.Empty) returns(google.protobuf.Empty) {} } diff --git a/router/grpc/qrouter.go b/router/grpc/qrouter.go index f5f2194ca..a88edb413 100644 --- a/router/grpc/qrouter.go +++ b/router/grpc/qrouter.go @@ -18,6 +18,7 @@ import ( "github.com/pg-sharding/spqr/router/qrouter" "github.com/pg-sharding/spqr/router/rulerouter" "google.golang.org/grpc/reflection" + "google.golang.org/protobuf/types/known/emptypb" ) type LocalQrouterServer struct { @@ -36,7 +37,7 @@ type LocalQrouterServer struct { rr rulerouter.RuleRouter } -func (l *LocalQrouterServer) ListShards(ctx context.Context, _ *protos.ListShardsRequest) (*protos.ListShardsReply, error) { +func (l *LocalQrouterServer) ListShards(ctx context.Context, _ *emptypb.Empty) (*protos.ListShardsReply, error) { shards, err := l.mgr.ListShards(ctx) if err != nil { return nil, err @@ -52,14 +53,14 @@ func (l *LocalQrouterServer) ListShards(ctx context.Context, _ *protos.ListShard }, nil } -func (l *LocalQrouterServer) AddDataShard(ctx context.Context, request *protos.AddShardRequest) (*protos.AddShardReply, error) { +func (l *LocalQrouterServer) AddDataShard(ctx context.Context, request *protos.AddShardRequest) (*emptypb.Empty, error) { if err := l.mgr.AddDataShard(ctx, datashards.DataShardFromProto(request.GetShard())); err != nil { return nil, err } - return &protos.AddShardReply{}, nil + return nil, nil } -func (l *LocalQrouterServer) AddWorldShard(ctx context.Context, request *protos.AddWorldShardRequest) (*protos.AddShardReply, error) { +func (l *LocalQrouterServer) AddWorldShard(ctx context.Context, request *protos.AddWorldShardRequest) (*emptypb.Empty, error) { //TODO implement me panic("implement me") } @@ -76,29 +77,29 @@ func (l *LocalQrouterServer) GetShard(ctx context.Context, request *protos.Shard // CreateDistribution creates distribution in QDB // TODO: unit tests -func (l *LocalQrouterServer) CreateDistribution(ctx context.Context, request *protos.CreateDistributionRequest) (*protos.CreateDistributionReply, error) { +func (l *LocalQrouterServer) CreateDistribution(ctx context.Context, request *protos.CreateDistributionRequest) (*emptypb.Empty, error) { for _, ds := range request.GetDistributions() { if err := l.mgr.CreateDistribution(ctx, distributions.DistributionFromProto(ds)); err != nil { return nil, err } } - return &protos.CreateDistributionReply{}, nil + return nil, nil } // DropDistribution deletes distribution from QDB // TODO: unit tests -func (l *LocalQrouterServer) DropDistribution(ctx context.Context, request *protos.DropDistributionRequest) (*protos.DropDistributionReply, error) { +func (l *LocalQrouterServer) DropDistribution(ctx context.Context, request *protos.DropDistributionRequest) (*emptypb.Empty, error) { for _, id := range request.GetIds() { if err := l.mgr.DropDistribution(ctx, id); err != nil { return nil, err } } - return &protos.DropDistributionReply{}, nil + return nil, nil } // ListDistributions returns all distributions from QDB // TODO: unit tests -func (l *LocalQrouterServer) ListDistributions(ctx context.Context, _ *protos.ListDistributionsRequest) (*protos.ListDistributionsReply, error) { +func (l *LocalQrouterServer) ListDistributions(ctx context.Context, _ *emptypb.Empty) (*protos.ListDistributionsReply, error) { distrs, err := l.mgr.ListDistributions(ctx) if err != nil { return nil, err @@ -116,8 +117,8 @@ func (l *LocalQrouterServer) ListDistributions(ctx context.Context, _ *protos.Li // AlterDistributionAttach attaches relation to distribution // TODO: unit tests -func (l *LocalQrouterServer) AlterDistributionAttach(ctx context.Context, request *protos.AlterDistributionAttachRequest) (*protos.AlterDistributionAttachReply, error) { - return &protos.AlterDistributionAttachReply{}, l.mgr.AlterDistributionAttach( +func (l *LocalQrouterServer) AlterDistributionAttach(ctx context.Context, request *protos.AlterDistributionAttachRequest) (*emptypb.Empty, error) { + return nil, l.mgr.AlterDistributionAttach( ctx, request.GetId(), func() []*distributions.DistributedRelation { @@ -132,13 +133,13 @@ func (l *LocalQrouterServer) AlterDistributionAttach(ctx context.Context, reques // AlterDistributionDetach detaches relation from distribution // TODO: unit tests -func (l *LocalQrouterServer) AlterDistributionDetach(ctx context.Context, request *protos.AlterDistributionDetachRequest) (*protos.AlterDistributionDetachReply, error) { +func (l *LocalQrouterServer) AlterDistributionDetach(ctx context.Context, request *protos.AlterDistributionDetachRequest) (*emptypb.Empty, error) { for _, relName := range request.GetRelNames() { if err := l.mgr.AlterDistributionDetach(ctx, request.GetId(), relName); err != nil { return nil, err } } - return &protos.AlterDistributionDetachReply{}, nil + return nil, nil } // GetDistribution retrieves info about distribution from QDB @@ -162,13 +163,13 @@ func (l *LocalQrouterServer) GetRelationDistribution(ctx context.Context, reques } // TODO : unit tests -func (l *LocalQrouterServer) OpenRouter(ctx context.Context, request *protos.OpenRouterRequest) (*protos.OpenRouterReply, error) { +func (l *LocalQrouterServer) OpenRouter(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empty, error) { l.qr.Initialize() - return &protos.OpenRouterReply{}, nil + return nil, nil } // TODO : unit tests -func (l *LocalQrouterServer) GetRouterStatus(ctx context.Context, request *protos.GetRouterStatusRequest) (*protos.GetRouterStatusReply, error) { +func (l *LocalQrouterServer) GetRouterStatus(ctx context.Context, _ *emptypb.Empty) (*protos.GetRouterStatusReply, error) { if l.qr.Initialized() { return &protos.GetRouterStatusReply{ Status: protos.RouterStatus_OPENED, @@ -180,7 +181,7 @@ func (l *LocalQrouterServer) GetRouterStatus(ctx context.Context, request *proto } // TODO : implement, unit tests -func (l *LocalQrouterServer) CloseRouter(ctx context.Context, request *protos.CloseRouterRequest) (*protos.CloseRouterReply, error) { +func (l *LocalQrouterServer) CloseRouter(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empty, error) { //TODO implement me panic("implement me") } @@ -197,7 +198,7 @@ func (l *LocalQrouterServer) DropKeyRange(ctx context.Context, request *protos.D } // TODO : unit tests -func (l *LocalQrouterServer) DropAllKeyRanges(ctx context.Context, _ *protos.DropAllKeyRangesRequest) (*protos.DropAllKeyRangesResponse, error) { +func (l *LocalQrouterServer) DropAllKeyRanges(ctx context.Context, _ *emptypb.Empty) (*protos.DropAllKeyRangesResponse, error) { if err := l.mgr.DropKeyRangeAll(ctx); err != nil { return nil, err } @@ -215,7 +216,7 @@ func (l *LocalQrouterServer) MoveKeyRange(ctx context.Context, request *protos.M } // TODO : unit tests -func (l *LocalQrouterServer) AddShardingRules(ctx context.Context, request *protos.AddShardingRuleRequest) (*protos.AddShardingRuleReply, error) { +func (l *LocalQrouterServer) AddShardingRules(ctx context.Context, request *protos.AddShardingRuleRequest) (*emptypb.Empty, error) { return nil, spqrerror.ShardingRulesRemoved } @@ -225,7 +226,7 @@ func (l *LocalQrouterServer) ListShardingRules(ctx context.Context, request *pro } // TODO : unit tests -func (l *LocalQrouterServer) DropShardingRules(ctx context.Context, request *protos.DropShardingRuleRequest) (*protos.DropShardingRuleReply, error) { +func (l *LocalQrouterServer) DropShardingRules(ctx context.Context, request *protos.DropShardingRuleRequest) (*emptypb.Empty, error) { return nil, spqrerror.ShardingRulesRemoved } @@ -278,7 +279,7 @@ func (l *LocalQrouterServer) ListKeyRange(ctx context.Context, request *protos.L } // TODO : unit tests -func (l *LocalQrouterServer) ListAllKeyRanges(ctx context.Context, request *protos.ListAllKeyRangesRequest) (*protos.KeyRangeReply, error) { +func (l *LocalQrouterServer) ListAllKeyRanges(ctx context.Context, _ *emptypb.Empty) (*protos.KeyRangeReply, error) { krsDb, err := l.mgr.ListAllKeyRanges(ctx) if err != nil { return nil, err @@ -388,7 +389,7 @@ func PoolToProto(p pool.Pool, router string) *protos.PoolInfo { } // TODO : unit tests -func (l *LocalQrouterServer) ListClients(context.Context, *protos.ListClientsRequest) (*protos.ListClientsReply, error) { +func (l *LocalQrouterServer) ListClients(context.Context, *emptypb.Empty) (*protos.ListClientsReply, error) { reply := &protos.ListClientsReply{} err := l.rr.ClientPoolForeach(func(client client.ClientInfo) error { @@ -399,7 +400,7 @@ func (l *LocalQrouterServer) ListClients(context.Context, *protos.ListClientsReq } // TODO : unit tests -func (l *LocalQrouterServer) ListBackendConnections(context.Context, *protos.ListBackendConnectionsRequest) (*protos.ListBackendConntionsReply, error) { +func (l *LocalQrouterServer) ListBackendConnections(context.Context, *emptypb.Empty) (*protos.ListBackendConntionsReply, error) { reply := &protos.ListBackendConntionsReply{} err := l.rr.ForEach(func(sh shard.Shardinfo) error { @@ -410,7 +411,7 @@ func (l *LocalQrouterServer) ListBackendConnections(context.Context, *protos.Lis } // TODO : unit tests -func (l *LocalQrouterServer) ListPools(context.Context, *protos.ListPoolsRequest) (*protos.ListPoolsResponse, error) { +func (l *LocalQrouterServer) ListPools(context.Context, *emptypb.Empty) (*protos.ListPoolsResponse, error) { reply := &protos.ListPoolsResponse{} err := l.rr.ForEachPool(func(p pool.Pool) error { @@ -421,20 +422,18 @@ func (l *LocalQrouterServer) ListPools(context.Context, *protos.ListPoolsRequest } // TODO : unit tests -func (l *LocalQrouterServer) UpdateCoordinator(ctx context.Context, req *protos.UpdateCoordinatorRequest) (*protos.UpdateCoordinatorResponse, error) { - reply := &protos.UpdateCoordinatorResponse{} - err := l.mgr.UpdateCoordinator(ctx, req.Address) - return reply, err +func (l *LocalQrouterServer) UpdateCoordinator(ctx context.Context, req *protos.UpdateCoordinatorRequest) (*emptypb.Empty, error) { + return nil, l.mgr.UpdateCoordinator(ctx, req.Address) } -func (l *LocalQrouterServer) GetCoordinator(ctx context.Context, req *protos.GetCoordinatorRequest) (*protos.GetCoordinatorResponse, error) { +func (l *LocalQrouterServer) GetCoordinator(ctx context.Context, _ *emptypb.Empty) (*protos.GetCoordinatorResponse, error) { reply := &protos.GetCoordinatorResponse{} re, err := l.mgr.GetCoordinator(ctx) reply.Address = re return reply, err } -func (l *LocalQrouterServer) GetTaskGroup(ctx context.Context, _ *protos.GetTaskGroupRequest) (*protos.GetTaskGroupReply, error) { +func (l *LocalQrouterServer) GetTaskGroup(ctx context.Context, _ *emptypb.Empty) (*protos.GetTaskGroupReply, error) { group, err := l.mgr.GetTaskGroup(ctx) if err != nil { return nil, err @@ -444,12 +443,12 @@ func (l *LocalQrouterServer) GetTaskGroup(ctx context.Context, _ *protos.GetTask }, nil } -func (l *LocalQrouterServer) WriteTaskGroup(ctx context.Context, request *protos.WriteTaskGroupRequest) (*protos.WriteTaskGroupReply, error) { - return &protos.WriteTaskGroupReply{}, l.mgr.WriteTaskGroup(ctx, tasks.TaskGroupFromProto(request.TaskGroup)) +func (l *LocalQrouterServer) WriteTaskGroup(ctx context.Context, request *protos.WriteTaskGroupRequest) (*emptypb.Empty, error) { + return nil, l.mgr.WriteTaskGroup(ctx, tasks.TaskGroupFromProto(request.TaskGroup)) } -func (l *LocalQrouterServer) RemoveTaskGroup(ctx context.Context, _ *protos.RemoveTaskGroupRequest) (*protos.RemoveTaskGroupReply, error) { - return &protos.RemoveTaskGroupReply{}, l.mgr.RemoveTaskGroup(ctx) +func (l *LocalQrouterServer) RemoveTaskGroup(ctx context.Context, _ *emptypb.Empty) (*emptypb.Empty, error) { + return nil, l.mgr.RemoveTaskGroup(ctx) } func Register(server reflection.GRPCServer, qrouter qrouter.QueryRouter, mgr meta.EntityMgr, rr rulerouter.RuleRouter) { diff --git a/yacc/console/lex.go b/yacc/console/lex.go index d50f272af..778150994 100644 --- a/yacc/console/lex.go +++ b/yacc/console/lex.go @@ -10,7 +10,7 @@ import ( -//line lex.go:14 +//line lex.go:12 const lexer_start int = 4 const lexer_first_final int = 4 const lexer_error int = 0 @@ -36,7 +36,7 @@ func NewLexer(data []byte) *Lexer { pe: len(data), } -//line lex.go:40 +//line lex.go:36 { lex.cs = lexer_start lex.ts = 0 @@ -52,7 +52,7 @@ func ResetLexer(lex *Lexer, data []byte) { lex.pe = len(data) lex.data = data -//line lex.go:56 +//line lex.go:50 { lex.cs = lexer_start lex.ts = 0 @@ -73,7 +73,7 @@ func (lex *Lexer) Lex(lval *yySymType) int { var tok int -//line lex.go:77 +//line lex.go:69 { if ( lex.p) == ( lex.pe) { goto _test_eof @@ -212,7 +212,7 @@ tr24: //line NONE:1 lex.ts = ( lex.p) -//line lex.go:216 +//line lex.go:208 switch lex.data[( lex.p)] { case 32: goto st5 @@ -307,7 +307,7 @@ tr17: goto _test_eof6 } st_case_6: -//line lex.go:311 +//line lex.go:303 switch lex.data[( lex.p)] { case 33: goto tr8 @@ -356,7 +356,7 @@ tr19: goto _test_eof7 } st_case_7: -//line lex.go:360 +//line lex.go:352 switch lex.data[( lex.p)] { case 34: goto tr19 @@ -511,7 +511,7 @@ tr15: goto _test_eof12 } st_case_12: -//line lex.go:515 +//line lex.go:507 switch lex.data[( lex.p)] { case 34: goto st8 @@ -572,7 +572,7 @@ tr5: goto _test_eof13 } st_case_13: -//line lex.go:576 +//line lex.go:568 if lex.data[( lex.p)] == 42 { goto st3 } From 93d2de59af719b87abb40fd087267688c53fdf96 Mon Sep 17 00:00:00 2001 From: Yury Frolov Date: Tue, 29 Oct 2024 18:16:37 +0500 Subject: [PATCH 2/2] Fix feature tests --- test/feature/spqr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/feature/spqr_test.go b/test/feature/spqr_test.go index 8b6381cd2..36f6f29d9 100644 --- a/test/feature/spqr_test.go +++ b/test/feature/spqr_test.go @@ -588,7 +588,7 @@ func (tctx *testContext) stepHostIsStopped(service string) error { client := protos.NewRouterServiceClient(conn) ctx, cancel := context.WithTimeout(context.Background(), time.Second) defer cancel() - _, err = client.ListRouters(ctx, &protos.ListRoutersRequest{}) + _, err = client.ListRouters(ctx, nil) return err == nil }, time.Minute, time.Second)