diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go index 1c09b39379..c869f3d51e 100644 --- a/go/vt/proto/vtctldata/vtctldata.pb.go +++ b/go/vt/proto/vtctldata/vtctldata.pb.go @@ -144,10 +144,10 @@ func (m *GetKeyspacesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_GetKeyspacesRequest proto.InternalMessageInfo type GetKeyspacesResponse struct { - Keyspaces []string `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Keyspaces []*Keyspace `protobuf:"bytes,1,rep,name=keyspaces,proto3" json:"keyspaces,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetKeyspacesResponse) Reset() { *m = GetKeyspacesResponse{} } @@ -175,7 +175,7 @@ func (m *GetKeyspacesResponse) XXX_DiscardUnknown() { var xxx_messageInfo_GetKeyspacesResponse proto.InternalMessageInfo -func (m *GetKeyspacesResponse) GetKeyspaces() []string { +func (m *GetKeyspacesResponse) GetKeyspaces() []*Keyspace { if m != nil { return m.Keyspaces } @@ -268,37 +268,6 @@ func (m *Keyspace) GetKeyspace() *topodata.Keyspace { return nil } -type ShowAllKeyspacesRequest struct { - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ShowAllKeyspacesRequest) Reset() { *m = ShowAllKeyspacesRequest{} } -func (m *ShowAllKeyspacesRequest) String() string { return proto.CompactTextString(m) } -func (*ShowAllKeyspacesRequest) ProtoMessage() {} -func (*ShowAllKeyspacesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_f41247b323a1ab2e, []int{6} -} - -func (m *ShowAllKeyspacesRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ShowAllKeyspacesRequest.Unmarshal(m, b) -} -func (m *ShowAllKeyspacesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ShowAllKeyspacesRequest.Marshal(b, m, deterministic) -} -func (m *ShowAllKeyspacesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShowAllKeyspacesRequest.Merge(m, src) -} -func (m *ShowAllKeyspacesRequest) XXX_Size() int { - return xxx_messageInfo_ShowAllKeyspacesRequest.Size(m) -} -func (m *ShowAllKeyspacesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ShowAllKeyspacesRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ShowAllKeyspacesRequest proto.InternalMessageInfo - // TableMaterializeSttings contains the settings for one table. type TableMaterializeSettings struct { TargetTable string `protobuf:"bytes,1,opt,name=target_table,json=targetTable,proto3" json:"target_table,omitempty"` @@ -317,7 +286,7 @@ func (m *TableMaterializeSettings) Reset() { *m = TableMaterializeSettin func (m *TableMaterializeSettings) String() string { return proto.CompactTextString(m) } func (*TableMaterializeSettings) ProtoMessage() {} func (*TableMaterializeSettings) Descriptor() ([]byte, []int) { - return fileDescriptor_f41247b323a1ab2e, []int{7} + return fileDescriptor_f41247b323a1ab2e, []int{6} } func (m *TableMaterializeSettings) XXX_Unmarshal(b []byte) error { @@ -380,7 +349,7 @@ func (m *MaterializeSettings) Reset() { *m = MaterializeSettings{} } func (m *MaterializeSettings) String() string { return proto.CompactTextString(m) } func (*MaterializeSettings) ProtoMessage() {} func (*MaterializeSettings) Descriptor() ([]byte, []int) { - return fileDescriptor_f41247b323a1ab2e, []int{8} + return fileDescriptor_f41247b323a1ab2e, []int{7} } func (m *MaterializeSettings) XXX_Unmarshal(b []byte) error { @@ -457,7 +426,6 @@ func init() { proto.RegisterType((*GetKeyspacesResponse)(nil), "vtctldata.GetKeyspacesResponse") proto.RegisterType((*GetKeyspaceRequest)(nil), "vtctldata.GetKeyspaceRequest") proto.RegisterType((*Keyspace)(nil), "vtctldata.Keyspace") - proto.RegisterType((*ShowAllKeyspacesRequest)(nil), "vtctldata.ShowAllKeyspacesRequest") proto.RegisterType((*TableMaterializeSettings)(nil), "vtctldata.TableMaterializeSettings") proto.RegisterType((*MaterializeSettings)(nil), "vtctldata.MaterializeSettings") } @@ -465,37 +433,37 @@ func init() { func init() { proto.RegisterFile("vtctldata.proto", fileDescriptor_f41247b323a1ab2e) } var fileDescriptor_f41247b323a1ab2e = []byte{ - // 511 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xd1, 0x6e, 0xd3, 0x4c, - 0x10, 0x85, 0xe5, 0x24, 0xed, 0x1f, 0x4f, 0xfe, 0x38, 0xb0, 0x05, 0x61, 0x02, 0x48, 0xc1, 0x40, - 0x6b, 0x09, 0xc9, 0x41, 0x85, 0x17, 0x28, 0x21, 0x42, 0x02, 0xc1, 0x85, 0x1b, 0x81, 0xc4, 0x8d, - 0xb5, 0x71, 0xa6, 0xc1, 0xea, 0xc6, 0x6b, 0xbc, 0x93, 0xa4, 0xe1, 0x0d, 0x78, 0x19, 0x9e, 0x11, - 0x79, 0xd7, 0xde, 0xb4, 0xa2, 0xdc, 0x8d, 0xbf, 0x3d, 0x33, 0x7b, 0xe6, 0x58, 0x0b, 0x83, 0x0d, - 0xa5, 0x24, 0x16, 0x9c, 0x78, 0x54, 0x94, 0x92, 0x24, 0x73, 0x2d, 0x18, 0xf6, 0x85, 0x5c, 0xae, - 0x29, 0x13, 0xe6, 0x64, 0xe8, 0x91, 0x2c, 0xe4, 0x5e, 0x19, 0x7c, 0x85, 0xe1, 0xf4, 0x0a, 0xd3, - 0x35, 0xe1, 0x97, 0xaa, 0x65, 0x22, 0x57, 0x2b, 0x9e, 0x2f, 0x62, 0xfc, 0xb1, 0x46, 0x45, 0x8c, - 0x41, 0x87, 0x97, 0x4b, 0xe5, 0x3b, 0xa3, 0x76, 0xe8, 0xc6, 0xba, 0x66, 0x2f, 0xc0, 0xe3, 0x29, - 0x65, 0x32, 0x4f, 0x28, 0x5b, 0xa1, 0x5c, 0x93, 0xdf, 0x1a, 0x39, 0x61, 0x3b, 0xee, 0x1b, 0x3a, - 0x33, 0x30, 0x98, 0xc0, 0xa3, 0x5b, 0x07, 0xab, 0x42, 0xe6, 0x0a, 0xd9, 0x73, 0x38, 0xc0, 0x0d, - 0xe6, 0xe4, 0x3b, 0x23, 0x27, 0xec, 0x9d, 0x7a, 0x51, 0x63, 0x73, 0x5a, 0xd1, 0xd8, 0x1c, 0x06, - 0xf7, 0xe1, 0xe8, 0x3d, 0xd2, 0x47, 0xdc, 0xa9, 0x82, 0xa7, 0xa8, 0x6a, 0x5b, 0xc1, 0x1b, 0xb8, - 0x77, 0x13, 0xd7, 0x43, 0x1f, 0x83, 0x7b, 0xd9, 0xc0, 0xda, 0xf3, 0x1e, 0x04, 0xaf, 0x80, 0x5d, - 0xeb, 0x6a, 0x56, 0x1c, 0x42, 0xb7, 0x91, 0x68, 0x2f, 0x6e, 0x6c, 0xbf, 0x83, 0xcf, 0xd0, 0x6d, - 0xe4, 0x55, 0x14, 0x39, 0x5f, 0x35, 0x1a, 0x5d, 0xb3, 0xe8, 0x5a, 0x6f, 0x4b, 0xef, 0xc1, 0x22, - 0x9b, 0xaf, 0xbd, 0x68, 0x3f, 0xef, 0x21, 0x3c, 0x38, 0xff, 0x2e, 0xb7, 0x67, 0x42, 0xfc, 0xb5, - 0xd2, 0x2f, 0x07, 0xfc, 0x19, 0x9f, 0x0b, 0xfc, 0xc4, 0x09, 0xcb, 0x8c, 0x8b, 0xec, 0x27, 0x9e, - 0x23, 0x51, 0x96, 0x2f, 0x15, 0x7b, 0x0a, 0xff, 0x13, 0x2f, 0x97, 0x48, 0x09, 0x55, 0x92, 0xda, - 0x43, 0xcf, 0x30, 0xdd, 0xc5, 0x5e, 0xc2, 0x5d, 0x25, 0xd7, 0x65, 0x8a, 0x09, 0x5e, 0x15, 0x25, - 0x2a, 0x95, 0xc9, 0x5c, 0x7b, 0x72, 0xe3, 0x3b, 0xe6, 0x60, 0x6a, 0x39, 0x7b, 0x02, 0x90, 0x96, - 0xc8, 0x09, 0x93, 0xc5, 0x42, 0xf8, 0x6d, 0xad, 0x72, 0x0d, 0x79, 0xb7, 0x10, 0xc1, 0xef, 0x16, - 0x1c, 0xdd, 0x66, 0x63, 0x08, 0xdd, 0xad, 0x2c, 0x2f, 0x2f, 0x84, 0xdc, 0x36, 0x51, 0x35, 0xdf, - 0xec, 0x04, 0x06, 0xf5, 0xfd, 0x37, 0x12, 0x71, 0x63, 0xcf, 0x60, 0x9b, 0xe3, 0x09, 0x0c, 0xea, - 0x5d, 0xac, 0xd0, 0x18, 0xf0, 0x0c, 0xb6, 0xc2, 0x63, 0x18, 0x28, 0x92, 0x45, 0xc2, 0x2f, 0x08, - 0xcb, 0x24, 0x95, 0xc5, 0xce, 0xef, 0x8c, 0x9c, 0xb0, 0x1b, 0xf7, 0x2b, 0x7c, 0x56, 0xd1, 0x89, - 0x2c, 0x76, 0xec, 0x03, 0x78, 0x3a, 0x95, 0x44, 0xd5, 0x3e, 0xfd, 0x83, 0x51, 0x3b, 0xec, 0x9d, - 0x3e, 0x8b, 0xf6, 0xaf, 0xe2, 0x5f, 0xc9, 0xc6, 0x7d, 0xdd, 0x6a, 0x37, 0x64, 0xd0, 0x49, 0x51, - 0x08, 0xff, 0xd0, 0xfc, 0xe4, 0xaa, 0x36, 0xe1, 0xcf, 0x45, 0x15, 0xfe, 0xae, 0x40, 0xe5, 0xff, - 0xd7, 0x84, 0x5f, 0xb1, 0x59, 0x85, 0xde, 0x86, 0xdf, 0x8e, 0x37, 0x19, 0xa1, 0x52, 0x51, 0x26, - 0xc7, 0xa6, 0x1a, 0x2f, 0xe5, 0x78, 0x43, 0x63, 0xfd, 0xc8, 0xc6, 0xd6, 0xc8, 0xfc, 0x50, 0x83, - 0xd7, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x39, 0x51, 0x64, 0x24, 0xb2, 0x03, 0x00, 0x00, + // 505 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x93, 0xd1, 0x8e, 0xd3, 0x3c, + 0x10, 0x85, 0x95, 0xb6, 0xbb, 0x7f, 0x33, 0xfd, 0x9b, 0x82, 0x0b, 0x52, 0x54, 0x84, 0x54, 0x02, + 0xec, 0x56, 0x42, 0x4a, 0x61, 0x79, 0x02, 0x28, 0x15, 0x02, 0x04, 0x17, 0xa1, 0x02, 0x89, 0x9b, + 0xc8, 0x4d, 0x67, 0xab, 0x68, 0xdd, 0x38, 0xc4, 0xd3, 0xee, 0x96, 0x37, 0xe0, 0x65, 0x78, 0x46, + 0x14, 0x3b, 0x76, 0xbb, 0xd2, 0x72, 0xe7, 0x7c, 0x3e, 0x33, 0x73, 0xe6, 0x58, 0x81, 0xc1, 0x8e, + 0x32, 0x12, 0x2b, 0x4e, 0x3c, 0x2e, 0x2b, 0x49, 0x92, 0xf9, 0x0e, 0x8c, 0xfa, 0x42, 0xae, 0xb7, + 0x94, 0x0b, 0x73, 0x33, 0x0a, 0x48, 0x96, 0xf2, 0xa0, 0x8c, 0xbe, 0xc3, 0x68, 0x7e, 0x83, 0xd9, + 0x96, 0xf0, 0x5b, 0x5d, 0x32, 0x93, 0x9b, 0x0d, 0x2f, 0x56, 0x09, 0xfe, 0xdc, 0xa2, 0x22, 0xc6, + 0xa0, 0xc3, 0xab, 0xb5, 0x0a, 0xbd, 0x71, 0x7b, 0xe2, 0x27, 0xfa, 0xcc, 0x9e, 0x43, 0xc0, 0x33, + 0xca, 0x65, 0x91, 0x52, 0xbe, 0x41, 0xb9, 0xa5, 0xb0, 0x35, 0xf6, 0x26, 0xed, 0xa4, 0x6f, 0xe8, + 0xc2, 0xc0, 0x68, 0x06, 0x8f, 0xee, 0x6c, 0xac, 0x4a, 0x59, 0x28, 0x64, 0xcf, 0xe0, 0x04, 0x77, + 0x58, 0x50, 0xe8, 0x8d, 0xbd, 0x49, 0xef, 0x22, 0x88, 0xad, 0xcd, 0x79, 0x4d, 0x13, 0x73, 0x19, + 0x3d, 0x84, 0xe1, 0x7b, 0xa4, 0x4f, 0xb8, 0x57, 0x25, 0xcf, 0x50, 0x35, 0xb6, 0xa2, 0x0f, 0xf0, + 0xe0, 0x36, 0x6e, 0x9a, 0xbe, 0x02, 0xff, 0xca, 0x42, 0xed, 0xb9, 0x77, 0x31, 0x8c, 0x0f, 0xd9, + 0xd8, 0x82, 0xe4, 0xa0, 0x8a, 0x5e, 0x02, 0x3b, 0x6a, 0x65, 0xf7, 0x1e, 0x41, 0xd7, 0x4a, 0xb4, + 0x41, 0x3f, 0x71, 0xdf, 0xd1, 0x17, 0xe8, 0x5a, 0x79, 0x9d, 0x4f, 0xc1, 0x37, 0x56, 0xa3, 0xcf, + 0x2c, 0x3e, 0xaa, 0x6d, 0xe9, 0xe5, 0x58, 0xec, 0x42, 0x77, 0x83, 0x0e, 0xfd, 0x7e, 0x7b, 0x10, + 0x2e, 0xf8, 0x52, 0xe0, 0x67, 0x4e, 0x58, 0xe5, 0x5c, 0xe4, 0xbf, 0xf0, 0x2b, 0x12, 0xe5, 0xc5, + 0x5a, 0xb1, 0x27, 0xf0, 0x3f, 0xf1, 0x6a, 0x8d, 0x94, 0x52, 0x2d, 0x69, 0x06, 0xf5, 0x0c, 0xd3, + 0x55, 0xec, 0x05, 0xdc, 0x57, 0x72, 0x5b, 0x65, 0x98, 0xe2, 0x4d, 0x59, 0xa1, 0x52, 0xb9, 0x2c, + 0xf4, 0x60, 0x3f, 0xb9, 0x67, 0x2e, 0xe6, 0x8e, 0xb3, 0xc7, 0x00, 0x59, 0x85, 0x9c, 0x30, 0x5d, + 0xad, 0x44, 0xd8, 0xd6, 0x2a, 0xdf, 0x90, 0x77, 0x2b, 0x11, 0xfd, 0x69, 0xc1, 0xf0, 0x2e, 0x1b, + 0x23, 0xe8, 0x5e, 0xcb, 0xea, 0xea, 0x52, 0xc8, 0x6b, 0x9b, 0x87, 0xfd, 0x66, 0xe7, 0x30, 0x68, + 0xe6, 0xdf, 0x5a, 0xdb, 0x4f, 0x02, 0x83, 0x5d, 0x58, 0xe7, 0x30, 0x68, 0x76, 0x71, 0x42, 0x63, + 0x20, 0x30, 0xd8, 0x09, 0xcf, 0x60, 0xa0, 0x48, 0x96, 0x29, 0xbf, 0x24, 0xac, 0xd2, 0x4c, 0x96, + 0xfb, 0xb0, 0x33, 0xf6, 0x26, 0xdd, 0xa4, 0x5f, 0xe3, 0x37, 0x35, 0x9d, 0xc9, 0x72, 0xcf, 0x3e, + 0x42, 0xa0, 0x53, 0x49, 0x55, 0xe3, 0x33, 0x3c, 0xd1, 0x6f, 0xfe, 0xf4, 0xe8, 0xcd, 0xff, 0x95, + 0x6c, 0xd2, 0xd7, 0xa5, 0x6e, 0x43, 0x06, 0x9d, 0x0c, 0x85, 0x08, 0x4f, 0xcd, 0x4b, 0xd6, 0x67, + 0x13, 0xfe, 0x52, 0xd4, 0xe1, 0xef, 0x4b, 0x54, 0xe1, 0x7f, 0x36, 0xfc, 0x9a, 0x2d, 0x6a, 0xf4, + 0x76, 0xf2, 0xe3, 0x6c, 0x97, 0x13, 0x2a, 0x15, 0xe7, 0x72, 0x6a, 0x4e, 0xd3, 0xb5, 0x9c, 0xee, + 0x68, 0xaa, 0x7f, 0xaf, 0xa9, 0x33, 0xb2, 0x3c, 0xd5, 0xe0, 0xf5, 0xdf, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xd5, 0x06, 0x15, 0x84, 0xac, 0x03, 0x00, 0x00, } diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go index 345e2145c2..d8bc9e46e7 100644 --- a/go/vt/proto/vtctlservice/vtctlservice.pb.go +++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go @@ -29,22 +29,20 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package func init() { proto.RegisterFile("vtctlservice.proto", fileDescriptor_27055cdbb1148d2b) } var fileDescriptor_27055cdbb1148d2b = []byte{ - // 227 bytes of a gzipped FileDescriptorProto + // 204 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x2b, 0x49, 0x2e, 0xc9, 0x29, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x41, 0x16, 0x93, 0xe2, 0x07, 0xf3, 0x52, 0x12, 0x4b, 0x12, 0x21, 0xd2, 0x46, 0x85, 0x5c, 0xac, 0x61, 0x20, 0x21, 0xa1, 0x0c, 0x2e, 0x61, 0xd7, 0x8a, 0xd4, 0xe4, 0xd2, 0x92, 0x54, 0x30, 0xdf, 0x39, 0x3f, 0x37, 0x37, 0x31, 0x2f, 0x45, 0x48, 0x55, 0x0f, 0xa1, 0x03, 0x8b, 0x7c, 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x94, 0x1a, 0x21, 0x65, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x4a, - 0x0c, 0x06, 0x8c, 0x46, 0x1f, 0x19, 0xb9, 0xd8, 0xc0, 0x92, 0x29, 0x42, 0xce, 0x5c, 0xdc, 0xee, + 0x0c, 0x06, 0x8c, 0x46, 0x0b, 0x18, 0xb9, 0xd8, 0xc0, 0x92, 0x29, 0x42, 0xce, 0x5c, 0xdc, 0xee, 0xa9, 0x25, 0xde, 0xa9, 0x95, 0xc5, 0x05, 0x89, 0xc9, 0xa9, 0x42, 0xb2, 0x48, 0xa6, 0x20, 0x89, 0xc3, 0x2c, 0x11, 0x46, 0x92, 0x86, 0xc9, 0x29, 0x31, 0x08, 0x05, 0x72, 0xf1, 0x20, 0x29, 0x2e, - 0x16, 0x92, 0xc3, 0x6e, 0x4a, 0x31, 0xcc, 0x18, 0x79, 0x9c, 0xf2, 0x30, 0x47, 0x0a, 0xf9, 0x73, - 0x09, 0x04, 0x67, 0xe4, 0x97, 0x3b, 0xe6, 0xe4, 0x20, 0x8c, 0x55, 0x42, 0xd2, 0x86, 0x2e, 0x89, - 0xdf, 0x85, 0x06, 0x8c, 0x4e, 0xda, 0x51, 0x9a, 0x65, 0x99, 0x25, 0xa9, 0xc5, 0xc5, 0x7a, 0x99, - 0xf9, 0xfa, 0x10, 0x96, 0x7e, 0x7a, 0xbe, 0x7e, 0x59, 0x89, 0x3e, 0x38, 0x1a, 0xf4, 0x91, 0x23, - 0x29, 0x89, 0x0d, 0x2c, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xc5, 0x5f, 0xa5, 0x60, 0xcf, - 0x01, 0x00, 0x00, + 0x16, 0x92, 0xc3, 0x6e, 0x4a, 0x31, 0xcc, 0x18, 0x79, 0x9c, 0xf2, 0x30, 0x47, 0x3a, 0x69, 0x47, + 0x69, 0x96, 0x65, 0x96, 0xa4, 0x16, 0x17, 0xeb, 0x65, 0xe6, 0xeb, 0x43, 0x58, 0xfa, 0xe9, 0xf9, + 0xfa, 0x65, 0x25, 0xfa, 0xe0, 0x50, 0xd3, 0x47, 0x0e, 0xd3, 0x24, 0x36, 0xb0, 0x98, 0x31, 0x20, + 0x00, 0x00, 0xff, 0xff, 0x6a, 0xd1, 0x88, 0x6e, 0x7e, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -160,10 +158,8 @@ var _Vtctl_serviceDesc = grpc.ServiceDesc{ type VtctldClient interface { // GetKeyspace reads the given keyspace from the topo and returns it. GetKeyspace(ctx context.Context, in *vtctldata.GetKeyspaceRequest, opts ...grpc.CallOption) (*vtctldata.Keyspace, error) - // GetKeyspaces returns the names of all keyspaces in the topo. + // GetKeyspaces returns the keyspace struct of all keyspaces in the topo. GetKeyspaces(ctx context.Context, in *vtctldata.GetKeyspacesRequest, opts ...grpc.CallOption) (*vtctldata.GetKeyspacesResponse, error) - // ShowAllKeyspaces returns the keyspace struct of each keyspace in the topo. - ShowAllKeyspaces(ctx context.Context, in *vtctldata.ShowAllKeyspacesRequest, opts ...grpc.CallOption) (Vtctld_ShowAllKeyspacesClient, error) } type vtctldClient struct { @@ -192,46 +188,12 @@ func (c *vtctldClient) GetKeyspaces(ctx context.Context, in *vtctldata.GetKeyspa return out, nil } -func (c *vtctldClient) ShowAllKeyspaces(ctx context.Context, in *vtctldata.ShowAllKeyspacesRequest, opts ...grpc.CallOption) (Vtctld_ShowAllKeyspacesClient, error) { - stream, err := c.cc.NewStream(ctx, &_Vtctld_serviceDesc.Streams[0], "/vtctlservice.Vtctld/ShowAllKeyspaces", opts...) - if err != nil { - return nil, err - } - x := &vtctldShowAllKeyspacesClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type Vtctld_ShowAllKeyspacesClient interface { - Recv() (*vtctldata.Keyspace, error) - grpc.ClientStream -} - -type vtctldShowAllKeyspacesClient struct { - grpc.ClientStream -} - -func (x *vtctldShowAllKeyspacesClient) Recv() (*vtctldata.Keyspace, error) { - m := new(vtctldata.Keyspace) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - // VtctldServer is the server API for Vtctld service. type VtctldServer interface { // GetKeyspace reads the given keyspace from the topo and returns it. GetKeyspace(context.Context, *vtctldata.GetKeyspaceRequest) (*vtctldata.Keyspace, error) - // GetKeyspaces returns the names of all keyspaces in the topo. + // GetKeyspaces returns the keyspace struct of all keyspaces in the topo. GetKeyspaces(context.Context, *vtctldata.GetKeyspacesRequest) (*vtctldata.GetKeyspacesResponse, error) - // ShowAllKeyspaces returns the keyspace struct of each keyspace in the topo. - ShowAllKeyspaces(*vtctldata.ShowAllKeyspacesRequest, Vtctld_ShowAllKeyspacesServer) error } // UnimplementedVtctldServer can be embedded to have forward compatible implementations. @@ -244,9 +206,6 @@ func (*UnimplementedVtctldServer) GetKeyspace(ctx context.Context, req *vtctldat func (*UnimplementedVtctldServer) GetKeyspaces(ctx context.Context, req *vtctldata.GetKeyspacesRequest) (*vtctldata.GetKeyspacesResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetKeyspaces not implemented") } -func (*UnimplementedVtctldServer) ShowAllKeyspaces(req *vtctldata.ShowAllKeyspacesRequest, srv Vtctld_ShowAllKeyspacesServer) error { - return status.Errorf(codes.Unimplemented, "method ShowAllKeyspaces not implemented") -} func RegisterVtctldServer(s *grpc.Server, srv VtctldServer) { s.RegisterService(&_Vtctld_serviceDesc, srv) @@ -288,27 +247,6 @@ func _Vtctld_GetKeyspaces_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } -func _Vtctld_ShowAllKeyspaces_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(vtctldata.ShowAllKeyspacesRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(VtctldServer).ShowAllKeyspaces(m, &vtctldShowAllKeyspacesServer{stream}) -} - -type Vtctld_ShowAllKeyspacesServer interface { - Send(*vtctldata.Keyspace) error - grpc.ServerStream -} - -type vtctldShowAllKeyspacesServer struct { - grpc.ServerStream -} - -func (x *vtctldShowAllKeyspacesServer) Send(m *vtctldata.Keyspace) error { - return x.ServerStream.SendMsg(m) -} - var _Vtctld_serviceDesc = grpc.ServiceDesc{ ServiceName: "vtctlservice.Vtctld", HandlerType: (*VtctldServer)(nil), @@ -322,12 +260,6 @@ var _Vtctld_serviceDesc = grpc.ServiceDesc{ Handler: _Vtctld_GetKeyspaces_Handler, }, }, - Streams: []grpc.StreamDesc{ - { - StreamName: "ShowAllKeyspaces", - Handler: _Vtctld_ShowAllKeyspaces_Handler, - ServerStreams: true, - }, - }, + Streams: []grpc.StreamDesc{}, Metadata: "vtctlservice.proto", } diff --git a/proto/vtctldata.proto b/proto/vtctldata.proto index 3b5f5fb3cb..875d6e200c 100644 --- a/proto/vtctldata.proto +++ b/proto/vtctldata.proto @@ -41,7 +41,7 @@ message GetKeyspacesRequest { } message GetKeyspacesResponse { - repeated string keyspaces = 1; + repeated Keyspace keyspaces = 1; } message GetKeyspaceRequest { @@ -53,8 +53,6 @@ message Keyspace { topodata.Keyspace keyspace = 2; } -message ShowAllKeyspacesRequest {} - // TableMaterializeSttings contains the settings for one table. message TableMaterializeSettings { string target_table = 1; diff --git a/proto/vtctlservice.proto b/proto/vtctlservice.proto index d71d1a89d3..20d88eba87 100644 --- a/proto/vtctlservice.proto +++ b/proto/vtctlservice.proto @@ -33,8 +33,6 @@ service Vtctl { service Vtctld { // GetKeyspace reads the given keyspace from the topo and returns it. rpc GetKeyspace(vtctldata.GetKeyspaceRequest) returns (vtctldata.Keyspace) {}; - // GetKeyspaces returns the names of all keyspaces in the topo. + // GetKeyspaces returns the keyspace struct of all keyspaces in the topo. rpc GetKeyspaces(vtctldata.GetKeyspacesRequest) returns (vtctldata.GetKeyspacesResponse) {}; - // ShowAllKeyspaces returns the keyspace struct of each keyspace in the topo. - rpc ShowAllKeyspaces(vtctldata.ShowAllKeyspacesRequest) returns (stream vtctldata.Keyspace) {}; }