From db326ae74894ef7956d619e8f9ab33425e332609 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Mon, 23 Sep 2019 18:47:00 -0700 Subject: [PATCH 01/25] vstream optional field event Signed-off-by: Nitin Shatma --- Makefile | 3 + go/mysql/replication_constants.go | 38 + go/vt/proto/automation/automation.pb.go | 91 ++- .../automationservice/automationservice.pb.go | 66 +- go/vt/proto/binlogdata/binlogdata.pb.go | 415 ++++++----- go/vt/proto/binlogservice/binlogservice.pb.go | 64 +- go/vt/proto/logutil/logutil.pb.go | 36 +- go/vt/proto/mysqlctl/mysqlctl.pb.go | 161 +++-- go/vt/proto/query/query.pb.go | 501 +++++++------ go/vt/proto/queryservice/queryservice.pb.go | 177 +++-- .../replicationdata/replicationdata.pb.go | 25 +- go/vt/proto/tableacl/tableacl.pb.go | 30 +- .../tabletmanagerdata/tabletmanagerdata.pb.go | 684 ++++++++++-------- .../tabletmanagerservice.pb.go | 298 +++++--- go/vt/proto/throttlerdata/throttlerdata.pb.go | 93 ++- .../throttlerservice/throttlerservice.pb.go | 83 ++- go/vt/proto/topodata/topodata.pb.go | 154 ++-- go/vt/proto/vschema/vschema.pb.go | 81 ++- go/vt/proto/vtctldata/vtctldata.pb.go | 32 +- go/vt/proto/vtctlservice/vtctlservice.pb.go | 57 +- go/vt/proto/vtgate/vtgate.pb.go | 400 +++++----- go/vt/proto/vtgateservice/vtgateservice.pb.go | 181 +++-- go/vt/proto/vtrpc/vtrpc.pb.go | 42 +- go/vt/proto/vttest/vttest.pb.go | 37 +- go/vt/proto/vtworkerdata/vtworkerdata.pb.go | 32 +- .../vtworkerservice/vtworkerservice.pb.go | 59 +- go/vt/proto/workflow/workflow.pb.go | 49 +- .../tabletserver/vstreamer/vstreamer.go | 37 +- proto/binlogdata.proto | 1 + py/vtproto/binlogdata_pb2.py | 75 +- 30 files changed, 2414 insertions(+), 1588 deletions(-) diff --git a/Makefile b/Makefile index bc80f423c7..cf693d775b 100644 --- a/Makefile +++ b/Makefile @@ -112,6 +112,9 @@ java_test: go install ./go/cmd/vtgateclienttest ./go/cmd/vtcombo mvn -f java/pom.xml clean verify +install_protoc-gen-go: + go install github.com/golang/protobuf/protoc-gen-go + # Find protoc compiler. # NOTE: We are *not* using the "protoc" binary (as suggested by the grpc Go # quickstart for example). Instead, we run "protoc" via the Python diff --git a/go/mysql/replication_constants.go b/go/mysql/replication_constants.go index cf5f2f8ce3..a3607fa212 100644 --- a/go/mysql/replication_constants.go +++ b/go/mysql/replication_constants.go @@ -16,6 +16,10 @@ limitations under the License. package mysql +import ( + querypb "vitess.io/vitess/go/vt/proto/query" +) + // This file contains the constant definitions for this package. // This is the data type for a field. @@ -115,6 +119,40 @@ const ( TypeGeometry = 255 ) +var MySqlTypeToVitessType = map[int32]querypb.Type{ + TypeDecimal: querypb.Type_DECIMAL, + TypeTiny: querypb.Type_INT8, + TypeShort: querypb.Type_INT16, + TypeLong: querypb.Type_INT32, + TypeFloat: querypb.Type_FLOAT32, + TypeDouble: querypb.Type_FLOAT64, + TypeNull: querypb.Type_NULL_TYPE, + TypeTimestamp: querypb.Type_TIMESTAMP, + TypeLongLong: querypb.Type_INT64, + TypeInt24: querypb.Type_INT24, + TypeDate: querypb.Type_DATE, + TypeTime: querypb.Type_TIME, + TypeDateTime: querypb.Type_DATETIME, + TypeYear: querypb.Type_YEAR, + TypeNewDate: querypb.Type_DATETIME, + TypeVarchar: querypb.Type_VARCHAR, + TypeBit: querypb.Type_BIT, + TypeTimestamp2: querypb.Type_TIMESTAMP, + TypeDateTime2: querypb.Type_DATETIME, + TypeTime2: querypb.Type_TIME, + TypeJSON: querypb.Type_JSON, + TypeNewDecimal: querypb.Type_DECIMAL, + TypeEnum: querypb.Type_ENUM, + TypeSet: querypb.Type_SET, + TypeTinyBlob: querypb.Type_BLOB, + TypeMediumBlob: querypb.Type_BLOB, + TypeLongBlob: querypb.Type_BLOB, + TypeBlob: querypb.Type_BLOB, + TypeVarString: querypb.Type_BINARY, + TypeString: querypb.Type_BINARY, + TypeGeometry: querypb.Type_GEOMETRY, +} + // Constants for the type of an INTVAR_EVENT. const ( // IntVarInvalidInt is INVALID_INT_EVENT diff --git a/go/vt/proto/automation/automation.pb.go b/go/vt/proto/automation/automation.pb.go index e810986dae..527028c2c7 100644 --- a/go/vt/proto/automation/automation.pb.go +++ b/go/vt/proto/automation/automation.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: automation.proto -package automation // import "vitess.io/vitess/go/vt/proto/automation" +package automation -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type ClusterOperationState int32 @@ -33,6 +35,7 @@ var ClusterOperationState_name = map[int32]string{ 2: "CLUSTER_OPERATION_RUNNING", 3: "CLUSTER_OPERATION_DONE", } + var ClusterOperationState_value = map[string]int32{ "UNKNOWN_CLUSTER_OPERATION_STATE": 0, "CLUSTER_OPERATION_NOT_STARTED": 1, @@ -43,8 +46,9 @@ var ClusterOperationState_value = map[string]int32{ func (x ClusterOperationState) String() string { return proto.EnumName(ClusterOperationState_name, int32(x)) } + func (ClusterOperationState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{0} + return fileDescriptor_06e15ad07c41cb38, []int{0} } type TaskState int32 @@ -62,6 +66,7 @@ var TaskState_name = map[int32]string{ 2: "RUNNING", 3: "DONE", } + var TaskState_value = map[string]int32{ "UNKNOWN_TASK_STATE": 0, "NOT_STARTED": 1, @@ -72,8 +77,9 @@ var TaskState_value = map[string]int32{ func (x TaskState) String() string { return proto.EnumName(TaskState_name, int32(x)) } + func (TaskState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{1} + return fileDescriptor_06e15ad07c41cb38, []int{1} } type ClusterOperation struct { @@ -93,16 +99,17 @@ func (m *ClusterOperation) Reset() { *m = ClusterOperation{} } func (m *ClusterOperation) String() string { return proto.CompactTextString(m) } func (*ClusterOperation) ProtoMessage() {} func (*ClusterOperation) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{0} + return fileDescriptor_06e15ad07c41cb38, []int{0} } + func (m *ClusterOperation) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ClusterOperation.Unmarshal(m, b) } func (m *ClusterOperation) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ClusterOperation.Marshal(b, m, deterministic) } -func (dst *ClusterOperation) XXX_Merge(src proto.Message) { - xxx_messageInfo_ClusterOperation.Merge(dst, src) +func (m *ClusterOperation) XXX_Merge(src proto.Message) { + xxx_messageInfo_ClusterOperation.Merge(m, src) } func (m *ClusterOperation) XXX_Size() int { return xxx_messageInfo_ClusterOperation.Size(m) @@ -155,16 +162,17 @@ func (m *TaskContainer) Reset() { *m = TaskContainer{} } func (m *TaskContainer) String() string { return proto.CompactTextString(m) } func (*TaskContainer) ProtoMessage() {} func (*TaskContainer) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{1} + return fileDescriptor_06e15ad07c41cb38, []int{1} } + func (m *TaskContainer) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TaskContainer.Unmarshal(m, b) } func (m *TaskContainer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TaskContainer.Marshal(b, m, deterministic) } -func (dst *TaskContainer) XXX_Merge(src proto.Message) { - xxx_messageInfo_TaskContainer.Merge(dst, src) +func (m *TaskContainer) XXX_Merge(src proto.Message) { + xxx_messageInfo_TaskContainer.Merge(m, src) } func (m *TaskContainer) XXX_Size() int { return xxx_messageInfo_TaskContainer.Size(m) @@ -210,16 +218,17 @@ func (m *Task) Reset() { *m = Task{} } func (m *Task) String() string { return proto.CompactTextString(m) } func (*Task) ProtoMessage() {} func (*Task) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{2} + return fileDescriptor_06e15ad07c41cb38, []int{2} } + func (m *Task) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Task.Unmarshal(m, b) } func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Task.Marshal(b, m, deterministic) } -func (dst *Task) XXX_Merge(src proto.Message) { - xxx_messageInfo_Task.Merge(dst, src) +func (m *Task) XXX_Merge(src proto.Message) { + xxx_messageInfo_Task.Merge(m, src) } func (m *Task) XXX_Size() int { return xxx_messageInfo_Task.Size(m) @@ -284,16 +293,17 @@ func (m *EnqueueClusterOperationRequest) Reset() { *m = EnqueueClusterOp func (m *EnqueueClusterOperationRequest) String() string { return proto.CompactTextString(m) } func (*EnqueueClusterOperationRequest) ProtoMessage() {} func (*EnqueueClusterOperationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{3} + return fileDescriptor_06e15ad07c41cb38, []int{3} } + func (m *EnqueueClusterOperationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnqueueClusterOperationRequest.Unmarshal(m, b) } func (m *EnqueueClusterOperationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnqueueClusterOperationRequest.Marshal(b, m, deterministic) } -func (dst *EnqueueClusterOperationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnqueueClusterOperationRequest.Merge(dst, src) +func (m *EnqueueClusterOperationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnqueueClusterOperationRequest.Merge(m, src) } func (m *EnqueueClusterOperationRequest) XXX_Size() int { return xxx_messageInfo_EnqueueClusterOperationRequest.Size(m) @@ -329,16 +339,17 @@ func (m *EnqueueClusterOperationResponse) Reset() { *m = EnqueueClusterO func (m *EnqueueClusterOperationResponse) String() string { return proto.CompactTextString(m) } func (*EnqueueClusterOperationResponse) ProtoMessage() {} func (*EnqueueClusterOperationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{4} + return fileDescriptor_06e15ad07c41cb38, []int{4} } + func (m *EnqueueClusterOperationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EnqueueClusterOperationResponse.Unmarshal(m, b) } func (m *EnqueueClusterOperationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EnqueueClusterOperationResponse.Marshal(b, m, deterministic) } -func (dst *EnqueueClusterOperationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_EnqueueClusterOperationResponse.Merge(dst, src) +func (m *EnqueueClusterOperationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_EnqueueClusterOperationResponse.Merge(m, src) } func (m *EnqueueClusterOperationResponse) XXX_Size() int { return xxx_messageInfo_EnqueueClusterOperationResponse.Size(m) @@ -367,16 +378,17 @@ func (m *GetClusterOperationStateRequest) Reset() { *m = GetClusterOpera func (m *GetClusterOperationStateRequest) String() string { return proto.CompactTextString(m) } func (*GetClusterOperationStateRequest) ProtoMessage() {} func (*GetClusterOperationStateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{5} + return fileDescriptor_06e15ad07c41cb38, []int{5} } + func (m *GetClusterOperationStateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetClusterOperationStateRequest.Unmarshal(m, b) } func (m *GetClusterOperationStateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetClusterOperationStateRequest.Marshal(b, m, deterministic) } -func (dst *GetClusterOperationStateRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetClusterOperationStateRequest.Merge(dst, src) +func (m *GetClusterOperationStateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetClusterOperationStateRequest.Merge(m, src) } func (m *GetClusterOperationStateRequest) XXX_Size() int { return xxx_messageInfo_GetClusterOperationStateRequest.Size(m) @@ -405,16 +417,17 @@ func (m *GetClusterOperationStateResponse) Reset() { *m = GetClusterOper func (m *GetClusterOperationStateResponse) String() string { return proto.CompactTextString(m) } func (*GetClusterOperationStateResponse) ProtoMessage() {} func (*GetClusterOperationStateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{6} + return fileDescriptor_06e15ad07c41cb38, []int{6} } + func (m *GetClusterOperationStateResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetClusterOperationStateResponse.Unmarshal(m, b) } func (m *GetClusterOperationStateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetClusterOperationStateResponse.Marshal(b, m, deterministic) } -func (dst *GetClusterOperationStateResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetClusterOperationStateResponse.Merge(dst, src) +func (m *GetClusterOperationStateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetClusterOperationStateResponse.Merge(m, src) } func (m *GetClusterOperationStateResponse) XXX_Size() int { return xxx_messageInfo_GetClusterOperationStateResponse.Size(m) @@ -443,16 +456,17 @@ func (m *GetClusterOperationDetailsRequest) Reset() { *m = GetClusterOpe func (m *GetClusterOperationDetailsRequest) String() string { return proto.CompactTextString(m) } func (*GetClusterOperationDetailsRequest) ProtoMessage() {} func (*GetClusterOperationDetailsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{7} + return fileDescriptor_06e15ad07c41cb38, []int{7} } + func (m *GetClusterOperationDetailsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetClusterOperationDetailsRequest.Unmarshal(m, b) } func (m *GetClusterOperationDetailsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetClusterOperationDetailsRequest.Marshal(b, m, deterministic) } -func (dst *GetClusterOperationDetailsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetClusterOperationDetailsRequest.Merge(dst, src) +func (m *GetClusterOperationDetailsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetClusterOperationDetailsRequest.Merge(m, src) } func (m *GetClusterOperationDetailsRequest) XXX_Size() int { return xxx_messageInfo_GetClusterOperationDetailsRequest.Size(m) @@ -482,16 +496,17 @@ func (m *GetClusterOperationDetailsResponse) Reset() { *m = GetClusterOp func (m *GetClusterOperationDetailsResponse) String() string { return proto.CompactTextString(m) } func (*GetClusterOperationDetailsResponse) ProtoMessage() {} func (*GetClusterOperationDetailsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_automation_4d7d55680fa173cc, []int{8} + return fileDescriptor_06e15ad07c41cb38, []int{8} } + func (m *GetClusterOperationDetailsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetClusterOperationDetailsResponse.Unmarshal(m, b) } func (m *GetClusterOperationDetailsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetClusterOperationDetailsResponse.Marshal(b, m, deterministic) } -func (dst *GetClusterOperationDetailsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetClusterOperationDetailsResponse.Merge(dst, src) +func (m *GetClusterOperationDetailsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetClusterOperationDetailsResponse.Merge(m, src) } func (m *GetClusterOperationDetailsResponse) XXX_Size() int { return xxx_messageInfo_GetClusterOperationDetailsResponse.Size(m) @@ -510,6 +525,8 @@ func (m *GetClusterOperationDetailsResponse) GetClusterOp() *ClusterOperation { } func init() { + proto.RegisterEnum("automation.ClusterOperationState", ClusterOperationState_name, ClusterOperationState_value) + proto.RegisterEnum("automation.TaskState", TaskState_name, TaskState_value) proto.RegisterType((*ClusterOperation)(nil), "automation.ClusterOperation") proto.RegisterType((*TaskContainer)(nil), "automation.TaskContainer") proto.RegisterType((*Task)(nil), "automation.Task") @@ -521,13 +538,11 @@ func init() { proto.RegisterType((*GetClusterOperationStateResponse)(nil), "automation.GetClusterOperationStateResponse") proto.RegisterType((*GetClusterOperationDetailsRequest)(nil), "automation.GetClusterOperationDetailsRequest") proto.RegisterType((*GetClusterOperationDetailsResponse)(nil), "automation.GetClusterOperationDetailsResponse") - proto.RegisterEnum("automation.ClusterOperationState", ClusterOperationState_name, ClusterOperationState_value) - proto.RegisterEnum("automation.TaskState", TaskState_name, TaskState_value) } -func init() { proto.RegisterFile("automation.proto", fileDescriptor_automation_4d7d55680fa173cc) } +func init() { proto.RegisterFile("automation.proto", fileDescriptor_06e15ad07c41cb38) } -var fileDescriptor_automation_4d7d55680fa173cc = []byte{ +var fileDescriptor_06e15ad07c41cb38 = []byte{ // 588 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0xdd, 0x6e, 0xd3, 0x3e, 0x18, 0xc6, 0xff, 0x49, 0xdb, 0xfd, 0xe9, 0x1b, 0xb6, 0x45, 0x16, 0x9b, 0xb2, 0x89, 0xb1, 0x2c, diff --git a/go/vt/proto/automationservice/automationservice.pb.go b/go/vt/proto/automationservice/automationservice.pb.go index 61ac349af8..e776217b6f 100644 --- a/go/vt/proto/automationservice/automationservice.pb.go +++ b/go/vt/proto/automationservice/automationservice.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: automationservice.proto -package automationservice // import "vitess.io/vitess/go/vt/proto/automationservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import automation "vitess.io/vitess/go/vt/proto/automation" +package automationservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + automation "vitess.io/vitess/go/vt/proto/automation" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,25 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("automationservice.proto", fileDescriptor_c03abdd2a71b5164) } + +var fileDescriptor_c03abdd2a71b5164 = []byte{ + // 178 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0x2c, 0x2d, 0xc9, + 0xcf, 0x4d, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, + 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xc4, 0x90, 0x90, 0x12, 0x40, 0x08, 0x41, 0x14, 0x19, 0x35, 0x32, + 0x71, 0x71, 0x39, 0xc2, 0x05, 0x85, 0x4a, 0xb8, 0xc4, 0x5d, 0xf3, 0x0a, 0x4b, 0x53, 0x4b, 0x53, + 0x9d, 0x73, 0x4a, 0x8b, 0x4b, 0x52, 0x8b, 0xfc, 0x0b, 0x52, 0x8b, 0x20, 0x52, 0x5a, 0x7a, 0x48, + 0x9a, 0x71, 0x28, 0x0a, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x91, 0xd2, 0x26, 0x4a, 0x6d, 0x71, + 0x01, 0xc8, 0x65, 0x4a, 0x0c, 0x42, 0xb5, 0x5c, 0x52, 0xee, 0xa9, 0x25, 0xe8, 0x0a, 0x5c, 0x52, + 0x4b, 0x12, 0x33, 0x73, 0x8a, 0x85, 0x74, 0x91, 0x0d, 0xc3, 0xad, 0x0e, 0x66, 0xb7, 0x1e, 0xb1, + 0xca, 0x61, 0xd6, 0x3b, 0x19, 0x44, 0xe9, 0x95, 0x65, 0x96, 0xa4, 0x16, 0x17, 0xeb, 0x65, 0xe6, + 0xeb, 0x43, 0x58, 0xfa, 0xe9, 0xf9, 0xfa, 0x65, 0x25, 0xfa, 0xe0, 0x30, 0xd2, 0xc7, 0x08, 0xc7, + 0x24, 0x36, 0xb0, 0x84, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x4a, 0x9d, 0xc0, 0x7c, 0x01, + 0x00, 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -78,6 +97,17 @@ type AutomationServer interface { GetClusterOperationDetails(context.Context, *automation.GetClusterOperationDetailsRequest) (*automation.GetClusterOperationDetailsResponse, error) } +// UnimplementedAutomationServer can be embedded to have forward compatible implementations. +type UnimplementedAutomationServer struct { +} + +func (*UnimplementedAutomationServer) EnqueueClusterOperation(ctx context.Context, req *automation.EnqueueClusterOperationRequest) (*automation.EnqueueClusterOperationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method EnqueueClusterOperation not implemented") +} +func (*UnimplementedAutomationServer) GetClusterOperationDetails(ctx context.Context, req *automation.GetClusterOperationDetailsRequest) (*automation.GetClusterOperationDetailsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetClusterOperationDetails not implemented") +} + func RegisterAutomationServer(s *grpc.Server, srv AutomationServer) { s.RegisterService(&_Automation_serviceDesc, srv) } @@ -134,23 +164,3 @@ var _Automation_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "automationservice.proto", } - -func init() { - proto.RegisterFile("automationservice.proto", fileDescriptor_automationservice_5369cb995212ce22) -} - -var fileDescriptor_automationservice_5369cb995212ce22 = []byte{ - // 178 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4f, 0x2c, 0x2d, 0xc9, - 0xcf, 0x4d, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, - 0xca, 0x2f, 0xc9, 0x17, 0x12, 0xc4, 0x90, 0x90, 0x12, 0x40, 0x08, 0x41, 0x14, 0x19, 0x35, 0x32, - 0x71, 0x71, 0x39, 0xc2, 0x05, 0x85, 0x4a, 0xb8, 0xc4, 0x5d, 0xf3, 0x0a, 0x4b, 0x53, 0x4b, 0x53, - 0x9d, 0x73, 0x4a, 0x8b, 0x4b, 0x52, 0x8b, 0xfc, 0x0b, 0x52, 0x8b, 0x20, 0x52, 0x5a, 0x7a, 0x48, - 0x9a, 0x71, 0x28, 0x0a, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x91, 0xd2, 0x26, 0x4a, 0x6d, 0x71, - 0x01, 0xc8, 0x65, 0x4a, 0x0c, 0x42, 0xb5, 0x5c, 0x52, 0xee, 0xa9, 0x25, 0xe8, 0x0a, 0x5c, 0x52, - 0x4b, 0x12, 0x33, 0x73, 0x8a, 0x85, 0x74, 0x91, 0x0d, 0xc3, 0xad, 0x0e, 0x66, 0xb7, 0x1e, 0xb1, - 0xca, 0x61, 0xd6, 0x3b, 0x19, 0x44, 0xe9, 0x95, 0x65, 0x96, 0xa4, 0x16, 0x17, 0xeb, 0x65, 0xe6, - 0xeb, 0x43, 0x58, 0xfa, 0xe9, 0xf9, 0xfa, 0x65, 0x25, 0xfa, 0xe0, 0x30, 0xd2, 0xc7, 0x08, 0xc7, - 0x24, 0x36, 0xb0, 0x84, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x4a, 0x9d, 0xc0, 0x7c, 0x01, - 0x00, 0x00, -} diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index 2498394564..d142365d2c 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -1,14 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: binlogdata.proto -package binlogdata // import "vitess.io/vitess/go/vt/proto/binlogdata" +package binlogdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import query "vitess.io/vitess/go/vt/proto/query" -import topodata "vitess.io/vitess/go/vt/proto/topodata" -import vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + query "vitess.io/vitess/go/vt/proto/query" + topodata "vitess.io/vitess/go/vt/proto/topodata" + vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -19,7 +21,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // OnDDLAction lists the possible actions for DDLs. type OnDDLAction int32 @@ -37,6 +39,7 @@ var OnDDLAction_name = map[int32]string{ 2: "EXEC", 3: "EXEC_IGNORE", } + var OnDDLAction_value = map[string]int32{ "IGNORE": 0, "STOP": 1, @@ -47,8 +50,9 @@ var OnDDLAction_value = map[string]int32{ func (x OnDDLAction) String() string { return proto.EnumName(OnDDLAction_name, int32(x)) } + func (OnDDLAction) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{0} + return fileDescriptor_5fd02bcb2e350dad, []int{0} } // VEventType enumerates the event types. @@ -95,6 +99,7 @@ var VEventType_name = map[int32]string{ 15: "VGTID", 16: "JOURNAL", } + var VEventType_value = map[string]int32{ "UNKNOWN": 0, "GTID": 1, @@ -118,8 +123,9 @@ var VEventType_value = map[string]int32{ func (x VEventType) String() string { return proto.EnumName(VEventType_name, int32(x)) } + func (VEventType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1} + return fileDescriptor_5fd02bcb2e350dad, []int{1} } // MigrationType specifies the type of migration for the Journal. @@ -134,6 +140,7 @@ var MigrationType_name = map[int32]string{ 0: "TABLES", 1: "SHARDS", } + var MigrationType_value = map[string]int32{ "TABLES": 0, "SHARDS": 1, @@ -142,8 +149,9 @@ var MigrationType_value = map[string]int32{ func (x MigrationType) String() string { return proto.EnumName(MigrationType_name, int32(x)) } + func (MigrationType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{2} + return fileDescriptor_5fd02bcb2e350dad, []int{2} } type BinlogTransaction_Statement_Category int32 @@ -174,6 +182,7 @@ var BinlogTransaction_Statement_Category_name = map[int32]string{ 8: "BL_UPDATE", 9: "BL_DELETE", } + var BinlogTransaction_Statement_Category_value = map[string]int32{ "BL_UNRECOGNIZED": 0, "BL_BEGIN": 1, @@ -190,8 +199,9 @@ var BinlogTransaction_Statement_Category_value = map[string]int32{ func (x BinlogTransaction_Statement_Category) String() string { return proto.EnumName(BinlogTransaction_Statement_Category_name, int32(x)) } + func (BinlogTransaction_Statement_Category) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1, 0, 0} + return fileDescriptor_5fd02bcb2e350dad, []int{1, 0, 0} } // Charset is the per-statement charset info from a QUERY_EVENT binlog entry. @@ -211,16 +221,17 @@ func (m *Charset) Reset() { *m = Charset{} } func (m *Charset) String() string { return proto.CompactTextString(m) } func (*Charset) ProtoMessage() {} func (*Charset) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{0} + return fileDescriptor_5fd02bcb2e350dad, []int{0} } + func (m *Charset) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Charset.Unmarshal(m, b) } func (m *Charset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Charset.Marshal(b, m, deterministic) } -func (dst *Charset) XXX_Merge(src proto.Message) { - xxx_messageInfo_Charset.Merge(dst, src) +func (m *Charset) XXX_Merge(src proto.Message) { + xxx_messageInfo_Charset.Merge(m, src) } func (m *Charset) XXX_Size() int { return xxx_messageInfo_Charset.Size(m) @@ -268,16 +279,17 @@ func (m *BinlogTransaction) Reset() { *m = BinlogTransaction{} } func (m *BinlogTransaction) String() string { return proto.CompactTextString(m) } func (*BinlogTransaction) ProtoMessage() {} func (*BinlogTransaction) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1} + return fileDescriptor_5fd02bcb2e350dad, []int{1} } + func (m *BinlogTransaction) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BinlogTransaction.Unmarshal(m, b) } func (m *BinlogTransaction) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BinlogTransaction.Marshal(b, m, deterministic) } -func (dst *BinlogTransaction) XXX_Merge(src proto.Message) { - xxx_messageInfo_BinlogTransaction.Merge(dst, src) +func (m *BinlogTransaction) XXX_Merge(src proto.Message) { + xxx_messageInfo_BinlogTransaction.Merge(m, src) } func (m *BinlogTransaction) XXX_Size() int { return xxx_messageInfo_BinlogTransaction.Size(m) @@ -318,16 +330,17 @@ func (m *BinlogTransaction_Statement) Reset() { *m = BinlogTransaction_S func (m *BinlogTransaction_Statement) String() string { return proto.CompactTextString(m) } func (*BinlogTransaction_Statement) ProtoMessage() {} func (*BinlogTransaction_Statement) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{1, 0} + return fileDescriptor_5fd02bcb2e350dad, []int{1, 0} } + func (m *BinlogTransaction_Statement) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BinlogTransaction_Statement.Unmarshal(m, b) } func (m *BinlogTransaction_Statement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BinlogTransaction_Statement.Marshal(b, m, deterministic) } -func (dst *BinlogTransaction_Statement) XXX_Merge(src proto.Message) { - xxx_messageInfo_BinlogTransaction_Statement.Merge(dst, src) +func (m *BinlogTransaction_Statement) XXX_Merge(src proto.Message) { + xxx_messageInfo_BinlogTransaction_Statement.Merge(m, src) } func (m *BinlogTransaction_Statement) XXX_Size() int { return xxx_messageInfo_BinlogTransaction_Statement.Size(m) @@ -376,16 +389,17 @@ func (m *StreamKeyRangeRequest) Reset() { *m = StreamKeyRangeRequest{} } func (m *StreamKeyRangeRequest) String() string { return proto.CompactTextString(m) } func (*StreamKeyRangeRequest) ProtoMessage() {} func (*StreamKeyRangeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{2} + return fileDescriptor_5fd02bcb2e350dad, []int{2} } + func (m *StreamKeyRangeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamKeyRangeRequest.Unmarshal(m, b) } func (m *StreamKeyRangeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamKeyRangeRequest.Marshal(b, m, deterministic) } -func (dst *StreamKeyRangeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamKeyRangeRequest.Merge(dst, src) +func (m *StreamKeyRangeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamKeyRangeRequest.Merge(m, src) } func (m *StreamKeyRangeRequest) XXX_Size() int { return xxx_messageInfo_StreamKeyRangeRequest.Size(m) @@ -429,16 +443,17 @@ func (m *StreamKeyRangeResponse) Reset() { *m = StreamKeyRangeResponse{} func (m *StreamKeyRangeResponse) String() string { return proto.CompactTextString(m) } func (*StreamKeyRangeResponse) ProtoMessage() {} func (*StreamKeyRangeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{3} + return fileDescriptor_5fd02bcb2e350dad, []int{3} } + func (m *StreamKeyRangeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamKeyRangeResponse.Unmarshal(m, b) } func (m *StreamKeyRangeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamKeyRangeResponse.Marshal(b, m, deterministic) } -func (dst *StreamKeyRangeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamKeyRangeResponse.Merge(dst, src) +func (m *StreamKeyRangeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamKeyRangeResponse.Merge(m, src) } func (m *StreamKeyRangeResponse) XXX_Size() int { return xxx_messageInfo_StreamKeyRangeResponse.Size(m) @@ -473,16 +488,17 @@ func (m *StreamTablesRequest) Reset() { *m = StreamTablesRequest{} } func (m *StreamTablesRequest) String() string { return proto.CompactTextString(m) } func (*StreamTablesRequest) ProtoMessage() {} func (*StreamTablesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{4} + return fileDescriptor_5fd02bcb2e350dad, []int{4} } + func (m *StreamTablesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamTablesRequest.Unmarshal(m, b) } func (m *StreamTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamTablesRequest.Marshal(b, m, deterministic) } -func (dst *StreamTablesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamTablesRequest.Merge(dst, src) +func (m *StreamTablesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamTablesRequest.Merge(m, src) } func (m *StreamTablesRequest) XXX_Size() int { return xxx_messageInfo_StreamTablesRequest.Size(m) @@ -526,16 +542,17 @@ func (m *StreamTablesResponse) Reset() { *m = StreamTablesResponse{} } func (m *StreamTablesResponse) String() string { return proto.CompactTextString(m) } func (*StreamTablesResponse) ProtoMessage() {} func (*StreamTablesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{5} + return fileDescriptor_5fd02bcb2e350dad, []int{5} } + func (m *StreamTablesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamTablesResponse.Unmarshal(m, b) } func (m *StreamTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamTablesResponse.Marshal(b, m, deterministic) } -func (dst *StreamTablesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamTablesResponse.Merge(dst, src) +func (m *StreamTablesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamTablesResponse.Merge(m, src) } func (m *StreamTablesResponse) XXX_Size() int { return xxx_messageInfo_StreamTablesResponse.Size(m) @@ -571,16 +588,17 @@ func (m *Rule) Reset() { *m = Rule{} } func (m *Rule) String() string { return proto.CompactTextString(m) } func (*Rule) ProtoMessage() {} func (*Rule) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{6} + return fileDescriptor_5fd02bcb2e350dad, []int{6} } + func (m *Rule) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Rule.Unmarshal(m, b) } func (m *Rule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Rule.Marshal(b, m, deterministic) } -func (dst *Rule) XXX_Merge(src proto.Message) { - xxx_messageInfo_Rule.Merge(dst, src) +func (m *Rule) XXX_Merge(src proto.Message) { + xxx_messageInfo_Rule.Merge(m, src) } func (m *Rule) XXX_Size() int { return xxx_messageInfo_Rule.Size(m) @@ -608,26 +626,28 @@ func (m *Rule) GetFilter() string { // Filter represents a list of ordered rules. First match // wins. type Filter struct { - Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` + BestEffortNameInFieldEvent bool `protobuf:"varint,2,opt,name=bestEffortNameInFieldEvent,proto3" json:"bestEffortNameInFieldEvent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Filter) Reset() { *m = Filter{} } func (m *Filter) String() string { return proto.CompactTextString(m) } func (*Filter) ProtoMessage() {} func (*Filter) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{7} + return fileDescriptor_5fd02bcb2e350dad, []int{7} } + func (m *Filter) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Filter.Unmarshal(m, b) } func (m *Filter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Filter.Marshal(b, m, deterministic) } -func (dst *Filter) XXX_Merge(src proto.Message) { - xxx_messageInfo_Filter.Merge(dst, src) +func (m *Filter) XXX_Merge(src proto.Message) { + xxx_messageInfo_Filter.Merge(m, src) } func (m *Filter) XXX_Size() int { return xxx_messageInfo_Filter.Size(m) @@ -645,6 +665,13 @@ func (m *Filter) GetRules() []*Rule { return nil } +func (m *Filter) GetBestEffortNameInFieldEvent() bool { + if m != nil { + return m.BestEffortNameInFieldEvent + } + return false +} + // BinlogSource specifies the source and filter parameters for // Filtered Replication. It currently supports a keyrange // or a list of tables. @@ -673,16 +700,17 @@ func (m *BinlogSource) Reset() { *m = BinlogSource{} } func (m *BinlogSource) String() string { return proto.CompactTextString(m) } func (*BinlogSource) ProtoMessage() {} func (*BinlogSource) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{8} + return fileDescriptor_5fd02bcb2e350dad, []int{8} } + func (m *BinlogSource) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BinlogSource.Unmarshal(m, b) } func (m *BinlogSource) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BinlogSource.Marshal(b, m, deterministic) } -func (dst *BinlogSource) XXX_Merge(src proto.Message) { - xxx_messageInfo_BinlogSource.Merge(dst, src) +func (m *BinlogSource) XXX_Merge(src proto.Message) { + xxx_messageInfo_BinlogSource.Merge(m, src) } func (m *BinlogSource) XXX_Size() int { return xxx_messageInfo_BinlogSource.Size(m) @@ -755,16 +783,17 @@ func (m *RowChange) Reset() { *m = RowChange{} } func (m *RowChange) String() string { return proto.CompactTextString(m) } func (*RowChange) ProtoMessage() {} func (*RowChange) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{9} + return fileDescriptor_5fd02bcb2e350dad, []int{9} } + func (m *RowChange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RowChange.Unmarshal(m, b) } func (m *RowChange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RowChange.Marshal(b, m, deterministic) } -func (dst *RowChange) XXX_Merge(src proto.Message) { - xxx_messageInfo_RowChange.Merge(dst, src) +func (m *RowChange) XXX_Merge(src proto.Message) { + xxx_messageInfo_RowChange.Merge(m, src) } func (m *RowChange) XXX_Size() int { return xxx_messageInfo_RowChange.Size(m) @@ -802,16 +831,17 @@ func (m *RowEvent) Reset() { *m = RowEvent{} } func (m *RowEvent) String() string { return proto.CompactTextString(m) } func (*RowEvent) ProtoMessage() {} func (*RowEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{10} + return fileDescriptor_5fd02bcb2e350dad, []int{10} } + func (m *RowEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RowEvent.Unmarshal(m, b) } func (m *RowEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RowEvent.Marshal(b, m, deterministic) } -func (dst *RowEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_RowEvent.Merge(dst, src) +func (m *RowEvent) XXX_Merge(src proto.Message) { + xxx_messageInfo_RowEvent.Merge(m, src) } func (m *RowEvent) XXX_Size() int { return xxx_messageInfo_RowEvent.Size(m) @@ -848,16 +878,17 @@ func (m *FieldEvent) Reset() { *m = FieldEvent{} } func (m *FieldEvent) String() string { return proto.CompactTextString(m) } func (*FieldEvent) ProtoMessage() {} func (*FieldEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{11} + return fileDescriptor_5fd02bcb2e350dad, []int{11} } + func (m *FieldEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_FieldEvent.Unmarshal(m, b) } func (m *FieldEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_FieldEvent.Marshal(b, m, deterministic) } -func (dst *FieldEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_FieldEvent.Merge(dst, src) +func (m *FieldEvent) XXX_Merge(src proto.Message) { + xxx_messageInfo_FieldEvent.Merge(m, src) } func (m *FieldEvent) XXX_Size() int { return xxx_messageInfo_FieldEvent.Size(m) @@ -895,16 +926,17 @@ func (m *ShardGtid) Reset() { *m = ShardGtid{} } func (m *ShardGtid) String() string { return proto.CompactTextString(m) } func (*ShardGtid) ProtoMessage() {} func (*ShardGtid) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{12} + return fileDescriptor_5fd02bcb2e350dad, []int{12} } + func (m *ShardGtid) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShardGtid.Unmarshal(m, b) } func (m *ShardGtid) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShardGtid.Marshal(b, m, deterministic) } -func (dst *ShardGtid) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShardGtid.Merge(dst, src) +func (m *ShardGtid) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShardGtid.Merge(m, src) } func (m *ShardGtid) XXX_Size() int { return xxx_messageInfo_ShardGtid.Size(m) @@ -947,16 +979,17 @@ func (m *VGtid) Reset() { *m = VGtid{} } func (m *VGtid) String() string { return proto.CompactTextString(m) } func (*VGtid) ProtoMessage() {} func (*VGtid) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{13} + return fileDescriptor_5fd02bcb2e350dad, []int{13} } + func (m *VGtid) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VGtid.Unmarshal(m, b) } func (m *VGtid) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VGtid.Marshal(b, m, deterministic) } -func (dst *VGtid) XXX_Merge(src proto.Message) { - xxx_messageInfo_VGtid.Merge(dst, src) +func (m *VGtid) XXX_Merge(src proto.Message) { + xxx_messageInfo_VGtid.Merge(m, src) } func (m *VGtid) XXX_Size() int { return xxx_messageInfo_VGtid.Size(m) @@ -986,16 +1019,17 @@ func (m *KeyspaceShard) Reset() { *m = KeyspaceShard{} } func (m *KeyspaceShard) String() string { return proto.CompactTextString(m) } func (*KeyspaceShard) ProtoMessage() {} func (*KeyspaceShard) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{14} + return fileDescriptor_5fd02bcb2e350dad, []int{14} } + func (m *KeyspaceShard) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KeyspaceShard.Unmarshal(m, b) } func (m *KeyspaceShard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_KeyspaceShard.Marshal(b, m, deterministic) } -func (dst *KeyspaceShard) XXX_Merge(src proto.Message) { - xxx_messageInfo_KeyspaceShard.Merge(dst, src) +func (m *KeyspaceShard) XXX_Merge(src proto.Message) { + xxx_messageInfo_KeyspaceShard.Merge(m, src) } func (m *KeyspaceShard) XXX_Size() int { return xxx_messageInfo_KeyspaceShard.Size(m) @@ -1037,16 +1071,17 @@ func (m *Journal) Reset() { *m = Journal{} } func (m *Journal) String() string { return proto.CompactTextString(m) } func (*Journal) ProtoMessage() {} func (*Journal) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{15} + return fileDescriptor_5fd02bcb2e350dad, []int{15} } + func (m *Journal) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Journal.Unmarshal(m, b) } func (m *Journal) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Journal.Marshal(b, m, deterministic) } -func (dst *Journal) XXX_Merge(src proto.Message) { - xxx_messageInfo_Journal.Merge(dst, src) +func (m *Journal) XXX_Merge(src proto.Message) { + xxx_messageInfo_Journal.Merge(m, src) } func (m *Journal) XXX_Size() int { return xxx_messageInfo_Journal.Size(m) @@ -1127,16 +1162,17 @@ func (m *VEvent) Reset() { *m = VEvent{} } func (m *VEvent) String() string { return proto.CompactTextString(m) } func (*VEvent) ProtoMessage() {} func (*VEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{16} + return fileDescriptor_5fd02bcb2e350dad, []int{16} } + func (m *VEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VEvent.Unmarshal(m, b) } func (m *VEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VEvent.Marshal(b, m, deterministic) } -func (dst *VEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_VEvent.Merge(dst, src) +func (m *VEvent) XXX_Merge(src proto.Message) { + xxx_messageInfo_VEvent.Merge(m, src) } func (m *VEvent) XXX_Size() int { return xxx_messageInfo_VEvent.Size(m) @@ -1226,16 +1262,17 @@ func (m *VStreamRequest) Reset() { *m = VStreamRequest{} } func (m *VStreamRequest) String() string { return proto.CompactTextString(m) } func (*VStreamRequest) ProtoMessage() {} func (*VStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{17} + return fileDescriptor_5fd02bcb2e350dad, []int{17} } + func (m *VStreamRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VStreamRequest.Unmarshal(m, b) } func (m *VStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VStreamRequest.Marshal(b, m, deterministic) } -func (dst *VStreamRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_VStreamRequest.Merge(dst, src) +func (m *VStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_VStreamRequest.Merge(m, src) } func (m *VStreamRequest) XXX_Size() int { return xxx_messageInfo_VStreamRequest.Size(m) @@ -1293,16 +1330,17 @@ func (m *VStreamResponse) Reset() { *m = VStreamResponse{} } func (m *VStreamResponse) String() string { return proto.CompactTextString(m) } func (*VStreamResponse) ProtoMessage() {} func (*VStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{18} + return fileDescriptor_5fd02bcb2e350dad, []int{18} } + func (m *VStreamResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VStreamResponse.Unmarshal(m, b) } func (m *VStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VStreamResponse.Marshal(b, m, deterministic) } -func (dst *VStreamResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_VStreamResponse.Merge(dst, src) +func (m *VStreamResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_VStreamResponse.Merge(m, src) } func (m *VStreamResponse) XXX_Size() int { return xxx_messageInfo_VStreamResponse.Size(m) @@ -1336,16 +1374,17 @@ func (m *VStreamRowsRequest) Reset() { *m = VStreamRowsRequest{} } func (m *VStreamRowsRequest) String() string { return proto.CompactTextString(m) } func (*VStreamRowsRequest) ProtoMessage() {} func (*VStreamRowsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{19} + return fileDescriptor_5fd02bcb2e350dad, []int{19} } + func (m *VStreamRowsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VStreamRowsRequest.Unmarshal(m, b) } func (m *VStreamRowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VStreamRowsRequest.Marshal(b, m, deterministic) } -func (dst *VStreamRowsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_VStreamRowsRequest.Merge(dst, src) +func (m *VStreamRowsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_VStreamRowsRequest.Merge(m, src) } func (m *VStreamRowsRequest) XXX_Size() int { return xxx_messageInfo_VStreamRowsRequest.Size(m) @@ -1407,16 +1446,17 @@ func (m *VStreamRowsResponse) Reset() { *m = VStreamRowsResponse{} } func (m *VStreamRowsResponse) String() string { return proto.CompactTextString(m) } func (*VStreamRowsResponse) ProtoMessage() {} func (*VStreamRowsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_binlogdata_db2d20dd0016de21, []int{20} + return fileDescriptor_5fd02bcb2e350dad, []int{20} } + func (m *VStreamRowsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VStreamRowsResponse.Unmarshal(m, b) } func (m *VStreamRowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VStreamRowsResponse.Marshal(b, m, deterministic) } -func (dst *VStreamRowsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_VStreamRowsResponse.Merge(dst, src) +func (m *VStreamRowsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_VStreamRowsResponse.Merge(m, src) } func (m *VStreamRowsResponse) XXX_Size() int { return xxx_messageInfo_VStreamRowsResponse.Size(m) @@ -1463,6 +1503,10 @@ func (m *VStreamRowsResponse) GetLastpk() *query.Row { } func init() { + proto.RegisterEnum("binlogdata.OnDDLAction", OnDDLAction_name, OnDDLAction_value) + proto.RegisterEnum("binlogdata.VEventType", VEventType_name, VEventType_value) + proto.RegisterEnum("binlogdata.MigrationType", MigrationType_name, MigrationType_value) + proto.RegisterEnum("binlogdata.BinlogTransaction_Statement_Category", BinlogTransaction_Statement_Category_name, BinlogTransaction_Statement_Category_value) proto.RegisterType((*Charset)(nil), "binlogdata.Charset") proto.RegisterType((*BinlogTransaction)(nil), "binlogdata.BinlogTransaction") proto.RegisterType((*BinlogTransaction_Statement)(nil), "binlogdata.BinlogTransaction.Statement") @@ -1485,112 +1529,109 @@ func init() { proto.RegisterType((*VStreamResponse)(nil), "binlogdata.VStreamResponse") proto.RegisterType((*VStreamRowsRequest)(nil), "binlogdata.VStreamRowsRequest") proto.RegisterType((*VStreamRowsResponse)(nil), "binlogdata.VStreamRowsResponse") - proto.RegisterEnum("binlogdata.OnDDLAction", OnDDLAction_name, OnDDLAction_value) - proto.RegisterEnum("binlogdata.VEventType", VEventType_name, VEventType_value) - proto.RegisterEnum("binlogdata.MigrationType", MigrationType_name, MigrationType_value) - proto.RegisterEnum("binlogdata.BinlogTransaction_Statement_Category", BinlogTransaction_Statement_Category_name, BinlogTransaction_Statement_Category_value) } -func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_binlogdata_db2d20dd0016de21) } +func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) } -var fileDescriptor_binlogdata_db2d20dd0016de21 = []byte{ - // 1558 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xdb, 0xca, - 0x11, 0x35, 0x09, 0xf0, 0xd5, 0x90, 0x28, 0x68, 0xf4, 0x08, 0xa3, 0x8a, 0x53, 0x0a, 0x2a, 0x8e, - 0x14, 0x55, 0x85, 0x72, 0x98, 0xc4, 0x59, 0x39, 0x0e, 0x1f, 0xb0, 0x4c, 0x09, 0x22, 0xe5, 0x21, - 0x24, 0xa7, 0xbc, 0x41, 0x41, 0xc4, 0x48, 0x42, 0x04, 0x02, 0x34, 0x30, 0xa4, 0xa2, 0x0f, 0x48, - 0xe5, 0x03, 0xb2, 0xcd, 0x0f, 0x64, 0x9f, 0x6d, 0xb6, 0xd9, 0xe7, 0x0b, 0xb2, 0xca, 0x7f, 0xdc, - 0x9a, 0x07, 0x40, 0x42, 0xf6, 0xb5, 0xe5, 0x5b, 0x75, 0x17, 0x77, 0xc3, 0xea, 0xe9, 0xe9, 0xe7, - 0x41, 0x4f, 0x77, 0x13, 0xf4, 0x4b, 0x3f, 0x0c, 0xa2, 0x6b, 0xcf, 0xa5, 0x6e, 0x73, 0x1a, 0x47, - 0x34, 0x42, 0xb0, 0xe0, 0xec, 0x68, 0x73, 0x1a, 0x4f, 0xc7, 0xe2, 0x62, 0x47, 0xfb, 0x30, 0x23, - 0xf1, 0xbd, 0x3c, 0xd4, 0x69, 0x34, 0x8d, 0x16, 0x5a, 0xc6, 0x29, 0x54, 0xba, 0x37, 0x6e, 0x9c, - 0x10, 0x8a, 0xb6, 0xa1, 0x3c, 0x0e, 0x7c, 0x12, 0xd2, 0x46, 0x61, 0xb7, 0xb0, 0x5f, 0xc2, 0xf2, - 0x84, 0x10, 0xa8, 0xe3, 0x28, 0x0c, 0x1b, 0x45, 0xce, 0xe5, 0x34, 0x93, 0x4d, 0x48, 0x3c, 0x27, - 0x71, 0x43, 0x11, 0xb2, 0xe2, 0x64, 0xfc, 0x5f, 0x81, 0xf5, 0x0e, 0x8f, 0xc3, 0x8e, 0xdd, 0x30, - 0x71, 0xc7, 0xd4, 0x8f, 0x42, 0x74, 0x04, 0x90, 0x50, 0x97, 0x92, 0x09, 0x09, 0x69, 0xd2, 0x28, - 0xec, 0x2a, 0xfb, 0x5a, 0x6b, 0xaf, 0xb9, 0x94, 0xc1, 0x47, 0x2a, 0xcd, 0x51, 0x2a, 0x8f, 0x97, - 0x54, 0x51, 0x0b, 0x34, 0x32, 0x27, 0x21, 0x75, 0x68, 0x74, 0x4b, 0xc2, 0x86, 0xba, 0x5b, 0xd8, - 0xd7, 0x5a, 0xeb, 0x4d, 0x91, 0xa0, 0xc9, 0x6e, 0x6c, 0x76, 0x81, 0x81, 0x64, 0xf4, 0xce, 0x7f, - 0x8a, 0x50, 0xcb, 0xac, 0x21, 0x0b, 0xaa, 0x63, 0x97, 0x92, 0xeb, 0x28, 0xbe, 0xe7, 0x69, 0xd6, - 0x5b, 0xcf, 0x1f, 0x19, 0x48, 0xb3, 0x2b, 0xf5, 0x70, 0x66, 0x01, 0xfd, 0x0a, 0x2a, 0x63, 0x81, - 0x1e, 0x47, 0x47, 0x6b, 0x6d, 0x2c, 0x1b, 0x93, 0xc0, 0xe2, 0x54, 0x06, 0xe9, 0xa0, 0x24, 0x1f, - 0x02, 0x0e, 0xd9, 0x0a, 0x66, 0xa4, 0xf1, 0xcf, 0x02, 0x54, 0x53, 0xbb, 0x68, 0x03, 0xd6, 0x3a, - 0x96, 0x73, 0x3e, 0xc0, 0x66, 0x77, 0x78, 0x34, 0xe8, 0xbf, 0x37, 0x7b, 0xfa, 0x13, 0xb4, 0x02, - 0xd5, 0x8e, 0xe5, 0x74, 0xcc, 0xa3, 0xfe, 0x40, 0x2f, 0xa0, 0x55, 0xa8, 0x75, 0x2c, 0xa7, 0x3b, - 0x3c, 0x3d, 0xed, 0xdb, 0x7a, 0x11, 0xad, 0x81, 0xd6, 0xb1, 0x1c, 0x3c, 0xb4, 0xac, 0x4e, 0xbb, - 0x7b, 0xa2, 0x2b, 0x68, 0x0b, 0xd6, 0x3b, 0x96, 0xd3, 0x3b, 0xb5, 0x9c, 0x9e, 0x79, 0x86, 0xcd, - 0x6e, 0xdb, 0x36, 0x7b, 0xba, 0x8a, 0x00, 0xca, 0x8c, 0xdd, 0xb3, 0xf4, 0x92, 0xa4, 0x47, 0xa6, - 0xad, 0x97, 0xa5, 0xb9, 0xfe, 0x60, 0x64, 0x62, 0x5b, 0xaf, 0xc8, 0xe3, 0xf9, 0x59, 0xaf, 0x6d, - 0x9b, 0x7a, 0x55, 0x1e, 0x7b, 0xa6, 0x65, 0xda, 0xa6, 0x5e, 0x3b, 0x56, 0xab, 0x45, 0x5d, 0x39, - 0x56, 0xab, 0x8a, 0xae, 0x1a, 0x7f, 0x2f, 0xc0, 0xd6, 0x88, 0xc6, 0xc4, 0x9d, 0x9c, 0x90, 0x7b, - 0xec, 0x86, 0xd7, 0x04, 0x93, 0x0f, 0x33, 0x92, 0x50, 0xb4, 0x03, 0xd5, 0x69, 0x94, 0xf8, 0x0c, - 0x3b, 0x0e, 0x70, 0x0d, 0x67, 0x67, 0x74, 0x08, 0xb5, 0x5b, 0x72, 0xef, 0xc4, 0x4c, 0x5e, 0x02, - 0x86, 0x9a, 0x59, 0x41, 0x66, 0x96, 0xaa, 0xb7, 0x92, 0x5a, 0xc6, 0x57, 0xf9, 0x32, 0xbe, 0xc6, - 0x15, 0x6c, 0x3f, 0x0c, 0x2a, 0x99, 0x46, 0x61, 0x42, 0x90, 0x05, 0x48, 0x28, 0x3a, 0x74, 0xf1, - 0x6d, 0x79, 0x7c, 0x5a, 0xeb, 0xe9, 0x67, 0x0b, 0x00, 0xaf, 0x5f, 0x3e, 0x64, 0x19, 0x7f, 0x81, - 0x0d, 0xe1, 0xc7, 0x76, 0x2f, 0x03, 0x92, 0x3c, 0x26, 0xf5, 0x6d, 0x28, 0x53, 0x2e, 0xdc, 0x28, - 0xee, 0x2a, 0xfb, 0x35, 0x2c, 0x4f, 0x5f, 0x9b, 0xa1, 0x07, 0x9b, 0x79, 0xcf, 0xdf, 0x4b, 0x7e, - 0xbf, 0x05, 0x15, 0xcf, 0x02, 0x82, 0x36, 0xa1, 0x34, 0x71, 0xe9, 0xf8, 0x46, 0x66, 0x23, 0x0e, - 0x2c, 0x95, 0x2b, 0x3f, 0xa0, 0x24, 0xe6, 0x9f, 0xb0, 0x86, 0xe5, 0xc9, 0x78, 0x0e, 0xe5, 0xd7, - 0x9c, 0x42, 0xbf, 0x80, 0x52, 0x3c, 0x63, 0xb9, 0x8a, 0xa7, 0xae, 0x2f, 0x07, 0xc0, 0x0c, 0x63, - 0x71, 0x6d, 0xfc, 0xa3, 0x08, 0x2b, 0x22, 0xa0, 0x51, 0x34, 0x8b, 0xc7, 0x84, 0x21, 0x78, 0x4b, - 0xee, 0x93, 0xa9, 0x3b, 0x26, 0x29, 0x82, 0xe9, 0x99, 0x05, 0x93, 0xdc, 0xb8, 0xb1, 0x27, 0xbd, - 0x8a, 0x03, 0xfa, 0x1d, 0x68, 0x1c, 0x49, 0xea, 0xd0, 0xfb, 0x29, 0xe1, 0x18, 0xd6, 0x5b, 0x9b, - 0x8b, 0xa2, 0xe2, 0x38, 0x51, 0xfb, 0x7e, 0x4a, 0x30, 0xd0, 0x8c, 0xce, 0x57, 0xa2, 0xfa, 0x88, - 0x4a, 0x5c, 0x7c, 0xbf, 0x52, 0xee, 0xfb, 0x1d, 0x64, 0x60, 0x94, 0xa5, 0x95, 0xa5, 0x5c, 0x05, - 0x1c, 0x29, 0x40, 0xa8, 0x09, 0xe5, 0x28, 0x74, 0x3c, 0x2f, 0x68, 0x54, 0x78, 0x98, 0x3f, 0x5a, - 0x96, 0x1d, 0x86, 0xbd, 0x9e, 0xd5, 0x16, 0x9f, 0xa4, 0x14, 0x85, 0x3d, 0x2f, 0x30, 0xde, 0x42, - 0x0d, 0x47, 0x77, 0xdd, 0x1b, 0x1e, 0x80, 0x01, 0xe5, 0x4b, 0x72, 0x15, 0xc5, 0x44, 0x7e, 0x55, - 0x90, 0x5d, 0x0f, 0x47, 0x77, 0x58, 0xde, 0xa0, 0x5d, 0x28, 0xb9, 0x57, 0xe9, 0x87, 0xc9, 0x8b, - 0x88, 0x0b, 0xc3, 0x85, 0x2a, 0x8e, 0xee, 0x78, 0xa7, 0x44, 0x4f, 0x41, 0x20, 0xe2, 0x84, 0xee, - 0x24, 0x85, 0xbb, 0xc6, 0x39, 0x03, 0x77, 0x42, 0xd0, 0x0b, 0xd0, 0xe2, 0xe8, 0xce, 0x19, 0x73, - 0xf7, 0xa2, 0x6c, 0xb5, 0xd6, 0x56, 0xee, 0x53, 0xa6, 0xc1, 0x61, 0x88, 0x53, 0x32, 0x31, 0xde, - 0x02, 0xbc, 0xf6, 0x49, 0xe0, 0x3d, 0xca, 0xc9, 0xcf, 0x19, 0x7c, 0x24, 0xf0, 0x52, 0xfb, 0x2b, - 0x32, 0x64, 0x6e, 0x01, 0xcb, 0x3b, 0x06, 0xc4, 0x88, 0x7d, 0xed, 0x23, 0xea, 0x7b, 0xdf, 0xa1, - 0x46, 0x10, 0xa8, 0xd7, 0xd4, 0xf7, 0x78, 0x71, 0xd4, 0x30, 0xa7, 0x8d, 0x57, 0x50, 0xba, 0xe0, - 0xe6, 0x5e, 0x80, 0xc6, 0xa5, 0x1c, 0xc6, 0x4e, 0x2b, 0x36, 0x97, 0x66, 0xe6, 0x1a, 0x43, 0x92, - 0x92, 0x89, 0xd1, 0x86, 0xd5, 0x13, 0xe9, 0x96, 0x0b, 0x7c, 0x7d, 0x5c, 0xc6, 0xbf, 0x8a, 0x50, - 0x39, 0x8e, 0x66, 0x71, 0xe8, 0x06, 0xa8, 0x0e, 0x45, 0xdf, 0xe3, 0x7a, 0x0a, 0x2e, 0xfa, 0x1e, - 0xfa, 0x23, 0xd4, 0x27, 0xfe, 0x75, 0xec, 0xb2, 0x7a, 0x10, 0xa5, 0x5d, 0xe4, 0x35, 0xf3, 0xe3, - 0xe5, 0xc8, 0x4e, 0x53, 0x09, 0x5e, 0xdf, 0xab, 0x93, 0xe5, 0xe3, 0x52, 0xc5, 0x2a, 0xb9, 0x8a, - 0x7d, 0x06, 0xf5, 0x20, 0x1a, 0xbb, 0x81, 0x93, 0xf5, 0x2a, 0x95, 0x07, 0xb5, 0xca, 0xb9, 0x67, - 0x69, 0xc3, 0x7a, 0x80, 0x4b, 0xe9, 0x91, 0xb8, 0xa0, 0x97, 0xb0, 0x32, 0x75, 0x63, 0xea, 0x8f, - 0xfd, 0xa9, 0xcb, 0xa6, 0x7d, 0x99, 0x2b, 0xe6, 0xc2, 0xce, 0xe1, 0x86, 0x73, 0xe2, 0xe8, 0x67, - 0xb0, 0x12, 0x93, 0x39, 0x89, 0x13, 0xe2, 0x39, 0xcc, 0x6f, 0x65, 0x57, 0xd9, 0x57, 0xb0, 0x96, - 0xf2, 0xfa, 0x5e, 0x62, 0xfc, 0xaf, 0x08, 0xe5, 0x0b, 0x51, 0x5d, 0x07, 0xa0, 0x72, 0x6c, 0xc4, - 0x24, 0xdf, 0x5e, 0x76, 0x22, 0x24, 0x38, 0x30, 0x5c, 0x06, 0xfd, 0x04, 0x6a, 0xd4, 0x9f, 0x90, - 0x84, 0xba, 0x93, 0x29, 0x07, 0x53, 0xc1, 0x0b, 0xc6, 0xa7, 0x6a, 0x84, 0x8d, 0x6b, 0xf6, 0x58, - 0x05, 0x3c, 0x8c, 0x44, 0xbf, 0x86, 0x1a, 0x7b, 0x13, 0x7c, 0xbb, 0x68, 0x94, 0xf8, 0x23, 0xdb, - 0x7c, 0xf0, 0x22, 0xb8, 0x5b, 0x5c, 0x8d, 0xd3, 0x57, 0xf6, 0x7b, 0xd0, 0x78, 0x15, 0x4b, 0x25, - 0xd1, 0x25, 0xb6, 0xf3, 0x5d, 0x22, 0x7d, 0x2d, 0x18, 0xae, 0x16, 0x2f, 0x67, 0x0f, 0x4a, 0x73, - 0x1e, 0x52, 0x45, 0x6e, 0x39, 0xcb, 0xc9, 0x71, 0xd8, 0xc5, 0x3d, 0x1b, 0x21, 0x7f, 0x16, 0x55, - 0xd4, 0xa8, 0x7e, 0x3c, 0x42, 0x64, 0x81, 0xe1, 0x54, 0x86, 0x21, 0x3c, 0x9e, 0xc5, 0x31, 0xdf, - 0xa2, 0xfc, 0x09, 0x69, 0x6c, 0x72, 0x28, 0x34, 0xc9, 0xb3, 0xfd, 0x09, 0x31, 0xfe, 0x56, 0x84, - 0xfa, 0x85, 0x98, 0x33, 0xe9, 0x6c, 0x7b, 0x05, 0x1b, 0xe4, 0xea, 0x8a, 0x8c, 0xa9, 0x3f, 0x27, - 0xce, 0xd8, 0x0d, 0x02, 0x12, 0x3b, 0xb2, 0x60, 0xb5, 0xd6, 0x5a, 0x53, 0xec, 0x9b, 0x5d, 0xce, - 0xef, 0xf7, 0xf0, 0x7a, 0x26, 0x2b, 0x59, 0x1e, 0x32, 0x61, 0xc3, 0x9f, 0x4c, 0x88, 0xe7, 0xbb, - 0x74, 0xd9, 0x80, 0xe8, 0x54, 0x5b, 0xf2, 0xd9, 0x5f, 0xd8, 0x47, 0x2e, 0x25, 0x0b, 0x33, 0x99, - 0x46, 0x66, 0xe6, 0x19, 0xab, 0xea, 0xf8, 0x3a, 0x1b, 0x97, 0xab, 0x52, 0xd3, 0xe6, 0x4c, 0x2c, - 0x2f, 0x73, 0xa3, 0x58, 0x7d, 0x30, 0x8a, 0x17, 0x2d, 0xbb, 0xf4, 0xa5, 0x96, 0x6d, 0xbc, 0x84, - 0xb5, 0x0c, 0x08, 0x39, 0x6a, 0x0f, 0xa0, 0xcc, 0x3f, 0x65, 0xda, 0x2b, 0xd0, 0xc7, 0x55, 0x87, - 0xa5, 0x84, 0xf1, 0xd7, 0x22, 0xa0, 0x54, 0x3f, 0xba, 0x4b, 0x7e, 0xa0, 0x60, 0x6e, 0x42, 0x89, - 0xf3, 0x25, 0x92, 0xe2, 0xc0, 0x70, 0x08, 0xdc, 0x84, 0x4e, 0x6f, 0x33, 0x18, 0x85, 0xf2, 0x5b, - 0xf6, 0x8b, 0x49, 0x32, 0x0b, 0x28, 0x96, 0x12, 0xc6, 0xbf, 0x0b, 0xb0, 0x91, 0xc3, 0x41, 0x62, - 0xb9, 0x68, 0xff, 0x85, 0x6f, 0x6f, 0xff, 0x68, 0x1f, 0xaa, 0xd3, 0xdb, 0xcf, 0x8c, 0x89, 0xec, - 0xf6, 0x93, 0xaf, 0xf8, 0xa7, 0xa0, 0xc6, 0xd1, 0x5d, 0xd2, 0x50, 0xb9, 0xe6, 0xf2, 0x4c, 0xe4, - 0x7c, 0x36, 0x58, 0x73, 0x79, 0xe4, 0x06, 0xab, 0xb8, 0x39, 0xf8, 0x03, 0x68, 0x4b, 0xf3, 0x99, - 0xad, 0xd0, 0xfd, 0xa3, 0xc1, 0x10, 0x9b, 0xfa, 0x13, 0x54, 0x05, 0x75, 0x64, 0x0f, 0xcf, 0xf4, - 0x02, 0xa3, 0xcc, 0x3f, 0x99, 0x5d, 0xb1, 0x96, 0x33, 0xca, 0x91, 0x42, 0xca, 0xc1, 0x7f, 0x0b, - 0x00, 0x8b, 0x86, 0x84, 0x34, 0xa8, 0x9c, 0x0f, 0x4e, 0x06, 0xc3, 0x77, 0x03, 0x61, 0xe0, 0xc8, - 0xee, 0xf7, 0xf4, 0x02, 0xaa, 0x41, 0x49, 0xec, 0xf9, 0x45, 0xe6, 0x41, 0x2e, 0xf9, 0x0a, 0xfb, - 0x07, 0x90, 0x6d, 0xf8, 0x2a, 0xaa, 0x80, 0x92, 0xed, 0xf1, 0x72, 0x71, 0x2f, 0x33, 0x83, 0xd8, - 0x3c, 0xb3, 0xda, 0x5d, 0x53, 0xaf, 0xb0, 0x8b, 0x6c, 0x85, 0x07, 0x28, 0xa7, 0xfb, 0x3b, 0xd3, - 0x64, 0x5b, 0x3f, 0x30, 0x3f, 0x43, 0xfb, 0x8d, 0x89, 0x75, 0x8d, 0xf1, 0xf0, 0xf0, 0x9d, 0xbe, - 0xc2, 0x78, 0xaf, 0xfb, 0xa6, 0xd5, 0xd3, 0x57, 0xd9, 0xda, 0xff, 0xc6, 0x6c, 0x63, 0xbb, 0x63, - 0xb6, 0x6d, 0xbd, 0xce, 0x6e, 0x2e, 0x78, 0x80, 0x6b, 0xcc, 0xcd, 0xf1, 0xf0, 0x1c, 0x0f, 0xda, - 0x96, 0xae, 0x1f, 0xec, 0xc1, 0x6a, 0x6e, 0xfe, 0x30, 0x5f, 0x76, 0xbb, 0x63, 0x99, 0x23, 0xfd, - 0x09, 0xa3, 0x47, 0x6f, 0xda, 0xb8, 0x37, 0xd2, 0x0b, 0x9d, 0x5f, 0xbe, 0xdf, 0x9b, 0xfb, 0x94, - 0x24, 0x49, 0xd3, 0x8f, 0x0e, 0x05, 0x75, 0x78, 0x1d, 0x1d, 0xce, 0xe9, 0x21, 0xff, 0x0b, 0x7a, - 0xb8, 0x78, 0x3e, 0x97, 0x65, 0xce, 0xf9, 0xcd, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xb4, - 0x72, 0xde, 0xde, 0x0e, 0x00, 0x00, +var fileDescriptor_5fd02bcb2e350dad = []byte{ + // 1583 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xe3, 0x4c, + 0x15, 0x1e, 0x5b, 0xf2, 0xed, 0x28, 0x71, 0x94, 0xce, 0x05, 0x93, 0xe2, 0xa7, 0x82, 0x8a, 0x9f, + 0x84, 0x54, 0xe1, 0x80, 0x81, 0x61, 0x35, 0x33, 0xf8, 0xa2, 0xc9, 0x38, 0x51, 0xec, 0x4c, 0x5b, + 0xc9, 0x50, 0xb3, 0x51, 0x29, 0x56, 0x3b, 0x11, 0x91, 0x25, 0x8f, 0xd4, 0x76, 0xc8, 0x03, 0x50, + 0x3c, 0x00, 0x5b, 0x5e, 0x80, 0x3d, 0x5b, 0xb6, 0xec, 0x79, 0x02, 0x56, 0xbc, 0x07, 0xd5, 0x17, + 0xc9, 0x56, 0x66, 0x98, 0xc9, 0x50, 0xc5, 0xe2, 0xdf, 0xa8, 0x4e, 0x9f, 0x3e, 0xd7, 0xef, 0x9c, + 0xee, 0xd3, 0x02, 0xfd, 0xda, 0x0f, 0x83, 0xe8, 0xc6, 0x73, 0xa9, 0xdb, 0x9c, 0xc5, 0x11, 0x8d, + 0x10, 0x2c, 0x39, 0x7b, 0xda, 0x82, 0xc6, 0xb3, 0xb1, 0xd8, 0xd8, 0xd3, 0x3e, 0xcc, 0x49, 0xfc, + 0x20, 0x17, 0x75, 0x1a, 0xcd, 0xa2, 0xa5, 0x96, 0x71, 0x0e, 0x95, 0xee, 0xad, 0x1b, 0x27, 0x84, + 0xa2, 0x5d, 0x28, 0x8f, 0x03, 0x9f, 0x84, 0xb4, 0x51, 0xd8, 0x2f, 0x1c, 0x96, 0xb0, 0x5c, 0x21, + 0x04, 0xea, 0x38, 0x0a, 0xc3, 0x46, 0x91, 0x73, 0x39, 0xcd, 0x64, 0x13, 0x12, 0x2f, 0x48, 0xdc, + 0x50, 0x84, 0xac, 0x58, 0x19, 0xff, 0x56, 0x60, 0xb3, 0xc3, 0xe3, 0xb0, 0x63, 0x37, 0x4c, 0xdc, + 0x31, 0xf5, 0xa3, 0x10, 0x9d, 0x00, 0x24, 0xd4, 0xa5, 0x64, 0x4a, 0x42, 0x9a, 0x34, 0x0a, 0xfb, + 0xca, 0xa1, 0xd6, 0x3a, 0x68, 0xae, 0x64, 0xf0, 0x91, 0x4a, 0x73, 0x94, 0xca, 0xe3, 0x15, 0x55, + 0xd4, 0x02, 0x8d, 0x2c, 0x48, 0x48, 0x1d, 0x1a, 0xdd, 0x91, 0xb0, 0xa1, 0xee, 0x17, 0x0e, 0xb5, + 0xd6, 0x66, 0x53, 0x24, 0x68, 0xb2, 0x1d, 0x9b, 0x6d, 0x60, 0x20, 0x19, 0xbd, 0xf7, 0x8f, 0x22, + 0xd4, 0x32, 0x6b, 0xc8, 0x82, 0xea, 0xd8, 0xa5, 0xe4, 0x26, 0x8a, 0x1f, 0x78, 0x9a, 0xf5, 0xd6, + 0xcf, 0x9f, 0x18, 0x48, 0xb3, 0x2b, 0xf5, 0x70, 0x66, 0x01, 0xfd, 0x0c, 0x2a, 0x63, 0x81, 0x1e, + 0x47, 0x47, 0x6b, 0x6d, 0xad, 0x1a, 0x93, 0xc0, 0xe2, 0x54, 0x06, 0xe9, 0xa0, 0x24, 0x1f, 0x02, + 0x0e, 0xd9, 0x1a, 0x66, 0xa4, 0xf1, 0xd7, 0x02, 0x54, 0x53, 0xbb, 0x68, 0x0b, 0x36, 0x3a, 0x96, + 0x73, 0x39, 0xc0, 0x66, 0x77, 0x78, 0x32, 0xe8, 0xbf, 0x37, 0x7b, 0xfa, 0x33, 0xb4, 0x06, 0xd5, + 0x8e, 0xe5, 0x74, 0xcc, 0x93, 0xfe, 0x40, 0x2f, 0xa0, 0x75, 0xa8, 0x75, 0x2c, 0xa7, 0x3b, 0x3c, + 0x3f, 0xef, 0xdb, 0x7a, 0x11, 0x6d, 0x80, 0xd6, 0xb1, 0x1c, 0x3c, 0xb4, 0xac, 0x4e, 0xbb, 0x7b, + 0xa6, 0x2b, 0x68, 0x07, 0x36, 0x3b, 0x96, 0xd3, 0x3b, 0xb7, 0x9c, 0x9e, 0x79, 0x81, 0xcd, 0x6e, + 0xdb, 0x36, 0x7b, 0xba, 0x8a, 0x00, 0xca, 0x8c, 0xdd, 0xb3, 0xf4, 0x92, 0xa4, 0x47, 0xa6, 0xad, + 0x97, 0xa5, 0xb9, 0xfe, 0x60, 0x64, 0x62, 0x5b, 0xaf, 0xc8, 0xe5, 0xe5, 0x45, 0xaf, 0x6d, 0x9b, + 0x7a, 0x55, 0x2e, 0x7b, 0xa6, 0x65, 0xda, 0xa6, 0x5e, 0x3b, 0x55, 0xab, 0x45, 0x5d, 0x39, 0x55, + 0xab, 0x8a, 0xae, 0x1a, 0x7f, 0x2e, 0xc0, 0xce, 0x88, 0xc6, 0xc4, 0x9d, 0x9e, 0x91, 0x07, 0xec, + 0x86, 0x37, 0x04, 0x93, 0x0f, 0x73, 0x92, 0x50, 0xb4, 0x07, 0xd5, 0x59, 0x94, 0xf8, 0x0c, 0x3b, + 0x0e, 0x70, 0x0d, 0x67, 0x6b, 0x74, 0x0c, 0xb5, 0x3b, 0xf2, 0xe0, 0xc4, 0x4c, 0x5e, 0x02, 0x86, + 0x9a, 0x59, 0x43, 0x66, 0x96, 0xaa, 0x77, 0x92, 0x5a, 0xc5, 0x57, 0xf9, 0x32, 0xbe, 0xc6, 0x04, + 0x76, 0x1f, 0x07, 0x95, 0xcc, 0xa2, 0x30, 0x21, 0xc8, 0x02, 0x24, 0x14, 0x1d, 0xba, 0xac, 0x2d, + 0x8f, 0x4f, 0x6b, 0x7d, 0xf3, 0xd9, 0x06, 0xc0, 0x9b, 0xd7, 0x8f, 0x59, 0xc6, 0x1f, 0x60, 0x4b, + 0xf8, 0xb1, 0xdd, 0xeb, 0x80, 0x24, 0x4f, 0x49, 0x7d, 0x17, 0xca, 0x94, 0x0b, 0x37, 0x8a, 0xfb, + 0xca, 0x61, 0x0d, 0xcb, 0xd5, 0xd7, 0x66, 0xe8, 0xc1, 0x76, 0xde, 0xf3, 0xff, 0x25, 0xbf, 0x5f, + 0x81, 0x8a, 0xe7, 0x01, 0x41, 0xdb, 0x50, 0x9a, 0xba, 0x74, 0x7c, 0x2b, 0xb3, 0x11, 0x0b, 0x96, + 0xca, 0xc4, 0x0f, 0x28, 0x89, 0x79, 0x09, 0x6b, 0x58, 0xae, 0x8c, 0x19, 0x94, 0x5f, 0x73, 0x0a, + 0xfd, 0x04, 0x4a, 0xf1, 0x9c, 0xe5, 0x2a, 0x8e, 0xba, 0xbe, 0x1a, 0x00, 0x33, 0x8c, 0xc5, 0x36, + 0x7a, 0x09, 0x7b, 0xd7, 0x24, 0xa1, 0xe6, 0x64, 0x12, 0xc5, 0x74, 0xe0, 0x4e, 0x49, 0x3f, 0x7c, + 0xed, 0x93, 0xc0, 0xe3, 0x27, 0x99, 0x5b, 0xaf, 0xe2, 0xcf, 0x48, 0x18, 0x7f, 0x29, 0xc2, 0x9a, + 0x48, 0x68, 0x14, 0xcd, 0xe3, 0x31, 0x61, 0x15, 0xb8, 0x23, 0x0f, 0xc9, 0xcc, 0x1d, 0x93, 0xb4, + 0x02, 0xe9, 0x9a, 0x25, 0x93, 0xdc, 0xba, 0xb1, 0x27, 0xa3, 0x16, 0x0b, 0xf4, 0x6b, 0xd0, 0x78, + 0x25, 0xa8, 0x43, 0x1f, 0x66, 0x84, 0xd7, 0xa0, 0xde, 0xda, 0x5e, 0x36, 0x25, 0xc7, 0x99, 0xda, + 0x0f, 0x33, 0x82, 0x81, 0x66, 0x74, 0xbe, 0x93, 0xd5, 0x27, 0x74, 0xf2, 0xb2, 0xfe, 0xa5, 0x5c, + 0xfd, 0x8f, 0x32, 0x30, 0xcb, 0xd2, 0xca, 0x0a, 0x56, 0x02, 0xce, 0x14, 0x60, 0xd4, 0x84, 0x72, + 0x14, 0x3a, 0x9e, 0x17, 0x34, 0x2a, 0x3c, 0xcc, 0xef, 0xad, 0xca, 0x0e, 0xc3, 0x5e, 0xcf, 0x6a, + 0x8b, 0x92, 0x96, 0xa2, 0xb0, 0xe7, 0x05, 0xc6, 0x5b, 0xa8, 0xe1, 0xe8, 0xbe, 0x7b, 0xcb, 0x03, + 0x30, 0xa0, 0x7c, 0x4d, 0x26, 0x51, 0x4c, 0x64, 0x57, 0x80, 0xbc, 0x35, 0x71, 0x74, 0x8f, 0xe5, + 0x0e, 0xda, 0x87, 0x92, 0x3b, 0x49, 0x0b, 0x9b, 0x17, 0x11, 0x1b, 0x86, 0x0b, 0x55, 0x1c, 0xdd, + 0x73, 0xf4, 0xd1, 0x37, 0x20, 0x10, 0x71, 0x42, 0x77, 0x9a, 0xc2, 0x5d, 0xe3, 0x1c, 0x56, 0x28, + 0xf4, 0x1c, 0xb4, 0x38, 0xba, 0x77, 0xc6, 0xdc, 0xbd, 0x68, 0x7b, 0xad, 0xb5, 0x93, 0x6b, 0x85, + 0x34, 0x38, 0x0c, 0x71, 0x4a, 0x26, 0xc6, 0x5b, 0x80, 0x65, 0x89, 0xbf, 0xe4, 0xe4, 0xc7, 0x0c, + 0x3e, 0x12, 0x78, 0xa9, 0xfd, 0x35, 0x19, 0x32, 0xb7, 0x80, 0xe5, 0x1e, 0x03, 0x62, 0xc4, 0xaa, + 0x7d, 0x42, 0x7d, 0xef, 0x7f, 0xe8, 0x11, 0x04, 0xea, 0x0d, 0xf5, 0x3d, 0xde, 0x1c, 0x35, 0xcc, + 0x69, 0xe3, 0x15, 0x94, 0xae, 0xb8, 0xb9, 0xe7, 0xa0, 0x71, 0x29, 0x87, 0xb1, 0xd3, 0x8e, 0xcf, + 0xa5, 0x99, 0xb9, 0xc6, 0x90, 0xa4, 0x64, 0x62, 0xb4, 0x61, 0xfd, 0x4c, 0xba, 0xe5, 0x02, 0x5f, + 0x1f, 0x97, 0xf1, 0xb7, 0x22, 0x54, 0x4e, 0xa3, 0x79, 0x1c, 0xba, 0x01, 0xaa, 0x43, 0xd1, 0xf7, + 0xb8, 0x9e, 0x82, 0x8b, 0xbe, 0x87, 0x7e, 0x0b, 0xf5, 0xa9, 0x7f, 0x13, 0xbb, 0xac, 0x1f, 0x44, + 0x6b, 0x17, 0x79, 0xcf, 0x7c, 0x7f, 0x35, 0xb2, 0xf3, 0x54, 0x82, 0xf7, 0xf7, 0xfa, 0x74, 0x75, + 0xb9, 0xd2, 0xb1, 0x4a, 0xae, 0x63, 0xbf, 0x85, 0x7a, 0x10, 0x8d, 0xdd, 0xc0, 0xc9, 0xee, 0x3a, + 0x95, 0x07, 0xb5, 0xce, 0xb9, 0x17, 0xe9, 0x85, 0xf7, 0x08, 0x97, 0xd2, 0x13, 0x71, 0x41, 0x2f, + 0x60, 0x6d, 0xe6, 0xc6, 0xd4, 0x1f, 0xfb, 0x33, 0x97, 0xbd, 0x16, 0xca, 0x5c, 0x31, 0x17, 0x76, + 0x0e, 0x37, 0x9c, 0x13, 0x47, 0x3f, 0x82, 0xb5, 0x98, 0x2c, 0x48, 0x9c, 0x10, 0xcf, 0x61, 0x7e, + 0x2b, 0xfb, 0xca, 0xa1, 0x82, 0xb5, 0x94, 0xd7, 0xf7, 0x12, 0xe3, 0x5f, 0x45, 0x28, 0x5f, 0x89, + 0xee, 0x3a, 0x02, 0x95, 0x63, 0x23, 0x5e, 0x02, 0xbb, 0xab, 0x4e, 0x84, 0x04, 0x07, 0x86, 0xcb, + 0xa0, 0x1f, 0x40, 0x8d, 0xfa, 0x53, 0x92, 0x50, 0x77, 0x3a, 0xe3, 0x60, 0x2a, 0x78, 0xc9, 0xf8, + 0x54, 0x8f, 0xb0, 0x71, 0xcf, 0x0e, 0xab, 0x80, 0x87, 0x91, 0xe8, 0x17, 0x50, 0x63, 0x67, 0x82, + 0xbf, 0x4e, 0x1a, 0x25, 0x7e, 0xc8, 0xb6, 0x1f, 0x9d, 0x08, 0xee, 0x16, 0x57, 0xe3, 0xf4, 0x94, + 0xfd, 0x06, 0x34, 0xde, 0xc5, 0x52, 0x49, 0xdc, 0x12, 0xbb, 0xf9, 0x5b, 0x22, 0x3d, 0x2d, 0x18, + 0x26, 0xcb, 0x93, 0x73, 0x00, 0xa5, 0x05, 0x0f, 0xa9, 0x22, 0x5f, 0x49, 0xab, 0xc9, 0x71, 0xd8, + 0xc5, 0x3e, 0x1b, 0x41, 0xbf, 0x17, 0x5d, 0xd4, 0xa8, 0x7e, 0x3c, 0x82, 0x64, 0x83, 0xe1, 0x54, + 0x86, 0x21, 0x3c, 0x9e, 0xc7, 0x31, 0x7f, 0x85, 0xf9, 0x53, 0xd2, 0xd8, 0xe6, 0x50, 0x68, 0x92, + 0x67, 0xfb, 0x53, 0x62, 0xfc, 0xa9, 0x08, 0xf5, 0x2b, 0x31, 0xa7, 0xd2, 0xd9, 0xf8, 0x0a, 0xb6, + 0xc8, 0x64, 0x42, 0xc6, 0xd4, 0x5f, 0x10, 0x67, 0xec, 0x06, 0x01, 0x89, 0x1d, 0xd9, 0xb0, 0x5a, + 0x6b, 0xa3, 0x29, 0xde, 0xab, 0x5d, 0xce, 0xef, 0xf7, 0xf0, 0x66, 0x26, 0x2b, 0x59, 0x1e, 0x32, + 0x61, 0xcb, 0x9f, 0x4e, 0x89, 0xe7, 0xbb, 0x74, 0xd5, 0x80, 0xb8, 0xa9, 0x76, 0xe4, 0xb1, 0xbf, + 0xb2, 0x4f, 0x5c, 0x4a, 0x96, 0x66, 0x32, 0x8d, 0xcc, 0xcc, 0xb7, 0xac, 0xab, 0xe3, 0x9b, 0x6c, + 0xdc, 0xae, 0x4b, 0x4d, 0x9b, 0x33, 0xb1, 0xdc, 0xcc, 0x8d, 0x72, 0xf5, 0xd1, 0x28, 0x5f, 0x5e, + 0xd9, 0xa5, 0x2f, 0x5d, 0xd9, 0xc6, 0x0b, 0xd8, 0xc8, 0x80, 0x90, 0xa3, 0xfa, 0x08, 0xca, 0xbc, + 0x94, 0xe9, 0x5d, 0x81, 0x3e, 0xee, 0x3a, 0x2c, 0x25, 0x8c, 0x3f, 0x16, 0x01, 0xa5, 0xfa, 0xd1, + 0x7d, 0xf2, 0x1d, 0x05, 0x73, 0x1b, 0x4a, 0x9c, 0x2f, 0x91, 0x14, 0x0b, 0x86, 0x43, 0xe0, 0x26, + 0x74, 0x76, 0x97, 0xc1, 0x28, 0x94, 0xdf, 0xb2, 0x2f, 0x26, 0xc9, 0x3c, 0xa0, 0x58, 0x4a, 0x18, + 0x7f, 0x2f, 0xc0, 0x56, 0x0e, 0x07, 0x89, 0xe5, 0xf2, 0xfa, 0x2f, 0xfc, 0xf7, 0xeb, 0x1f, 0x1d, + 0x42, 0x75, 0x76, 0xf7, 0x99, 0x31, 0x91, 0xed, 0x7e, 0xf2, 0x14, 0xff, 0x10, 0xd4, 0x38, 0xba, + 0x4f, 0x1a, 0x2a, 0xd7, 0x5c, 0x9d, 0x89, 0x9c, 0xcf, 0x06, 0x6b, 0x2e, 0x8f, 0xdc, 0x60, 0x15, + 0x3b, 0x47, 0x2f, 0x41, 0x5b, 0x99, 0xcf, 0xec, 0x09, 0xde, 0x3f, 0x19, 0x0c, 0xb1, 0xa9, 0x3f, + 0x43, 0x55, 0x50, 0x47, 0xf6, 0xf0, 0x42, 0x2f, 0x30, 0xca, 0xfc, 0x9d, 0xd9, 0x15, 0xcf, 0x7a, + 0x46, 0x39, 0x52, 0x48, 0x39, 0xfa, 0x67, 0x01, 0x60, 0x79, 0x21, 0x21, 0x0d, 0x2a, 0x97, 0x83, + 0xb3, 0xc1, 0xf0, 0xdd, 0x40, 0x18, 0x38, 0xb1, 0xfb, 0x3d, 0xbd, 0x80, 0x6a, 0x50, 0x12, 0xff, + 0x09, 0x45, 0xe6, 0x41, 0xfe, 0x24, 0x28, 0xec, 0x0f, 0x22, 0xfb, 0x43, 0x50, 0x51, 0x05, 0x94, + 0xec, 0x3f, 0x40, 0x3e, 0xfc, 0xcb, 0xcc, 0x20, 0x36, 0x2f, 0xac, 0x76, 0xd7, 0xd4, 0x2b, 0x6c, + 0x23, 0xfb, 0x05, 0x00, 0x28, 0xa7, 0xef, 0x7f, 0xa6, 0xc9, 0xfe, 0x1a, 0x80, 0xf9, 0x19, 0xda, + 0x6f, 0x4c, 0xac, 0x6b, 0x8c, 0x87, 0x87, 0xef, 0xf4, 0x35, 0xc6, 0x7b, 0xdd, 0x37, 0xad, 0x9e, + 0xbe, 0xce, 0x7e, 0x1b, 0xde, 0x98, 0x6d, 0x6c, 0x77, 0xcc, 0xb6, 0xad, 0xd7, 0xd9, 0xce, 0x15, + 0x0f, 0x70, 0x83, 0xb9, 0x39, 0x1d, 0x5e, 0xe2, 0x41, 0xdb, 0xd2, 0xf5, 0xa3, 0x03, 0x58, 0xcf, + 0xcd, 0x1f, 0xe6, 0xcb, 0x6e, 0x77, 0x2c, 0x73, 0xa4, 0x3f, 0x63, 0xf4, 0xe8, 0x4d, 0x1b, 0xf7, + 0x46, 0x7a, 0xa1, 0xf3, 0xd3, 0xf7, 0x07, 0x0b, 0x9f, 0x92, 0x24, 0x69, 0xfa, 0xd1, 0xb1, 0xa0, + 0x8e, 0x6f, 0xa2, 0xe3, 0x05, 0x3d, 0xe6, 0xbf, 0xb0, 0xc7, 0xcb, 0xe3, 0x73, 0x5d, 0xe6, 0x9c, + 0x5f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x62, 0xe7, 0xb4, 0xdc, 0x1e, 0x0f, 0x00, 0x00, } diff --git a/go/vt/proto/binlogservice/binlogservice.pb.go b/go/vt/proto/binlogservice/binlogservice.pb.go index 790a92f4a2..f10fe87e8b 100644 --- a/go/vt/proto/binlogservice/binlogservice.pb.go +++ b/go/vt/proto/binlogservice/binlogservice.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: binlogservice.proto -package binlogservice // import "vitess.io/vitess/go/vt/proto/binlogservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" +package binlogservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,25 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("binlogservice.proto", fileDescriptor_4ccdea02fd9c8d58) } + +var fileDescriptor_4ccdea02fd9c8d58 = []byte{ + // 177 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0xca, 0xcc, 0xcb, + 0xc9, 0x4f, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, + 0xe2, 0x45, 0x11, 0x94, 0x12, 0x80, 0x70, 0x53, 0x12, 0x4b, 0x12, 0x21, 0x0a, 0x8c, 0x0e, 0x31, + 0x72, 0xf1, 0x84, 0x16, 0xa4, 0x24, 0x96, 0xa4, 0x06, 0x97, 0x14, 0xa5, 0x26, 0xe6, 0x0a, 0x45, + 0x73, 0xf1, 0x41, 0x58, 0xde, 0xa9, 0x95, 0x41, 0x89, 0x79, 0xe9, 0xa9, 0x42, 0x8a, 0x7a, 0x48, + 0xba, 0x50, 0xe5, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0xa4, 0x94, 0xf0, 0x29, 0x29, 0x2e, + 0xc8, 0xcf, 0x2b, 0x4e, 0x55, 0x62, 0x30, 0x60, 0x14, 0x0a, 0xe5, 0xe2, 0x81, 0xc8, 0x86, 0x24, + 0x26, 0xe5, 0xa4, 0x16, 0x0b, 0xc9, 0x63, 0xea, 0x83, 0xc8, 0xc0, 0x0c, 0x56, 0xc0, 0xad, 0x00, + 0x61, 0xac, 0x93, 0x4e, 0x94, 0x56, 0x59, 0x66, 0x49, 0x6a, 0x71, 0xb1, 0x5e, 0x66, 0xbe, 0x3e, + 0x84, 0xa5, 0x9f, 0x9e, 0xaf, 0x5f, 0x56, 0xa2, 0x0f, 0xf6, 0xa4, 0x3e, 0x4a, 0x20, 0x24, 0xb1, + 0x81, 0x05, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xf4, 0x0a, 0x9c, 0x31, 0x01, 0x00, + 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -126,6 +145,17 @@ type UpdateStreamServer interface { StreamTables(*binlogdata.StreamTablesRequest, UpdateStream_StreamTablesServer) error } +// UnimplementedUpdateStreamServer can be embedded to have forward compatible implementations. +type UnimplementedUpdateStreamServer struct { +} + +func (*UnimplementedUpdateStreamServer) StreamKeyRange(req *binlogdata.StreamKeyRangeRequest, srv UpdateStream_StreamKeyRangeServer) error { + return status.Errorf(codes.Unimplemented, "method StreamKeyRange not implemented") +} +func (*UnimplementedUpdateStreamServer) StreamTables(req *binlogdata.StreamTablesRequest, srv UpdateStream_StreamTablesServer) error { + return status.Errorf(codes.Unimplemented, "method StreamTables not implemented") +} + func RegisterUpdateStreamServer(s *grpc.Server, srv UpdateStreamServer) { s.RegisterService(&_UpdateStream_serviceDesc, srv) } @@ -190,21 +220,3 @@ var _UpdateStream_serviceDesc = grpc.ServiceDesc{ }, Metadata: "binlogservice.proto", } - -func init() { proto.RegisterFile("binlogservice.proto", fileDescriptor_binlogservice_bfebf84e565603b8) } - -var fileDescriptor_binlogservice_bfebf84e565603b8 = []byte{ - // 177 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4e, 0xca, 0xcc, 0xcb, - 0xc9, 0x4f, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0xe2, 0x45, 0x11, 0x94, 0x12, 0x80, 0x70, 0x53, 0x12, 0x4b, 0x12, 0x21, 0x0a, 0x8c, 0x0e, 0x31, - 0x72, 0xf1, 0x84, 0x16, 0xa4, 0x24, 0x96, 0xa4, 0x06, 0x97, 0x14, 0xa5, 0x26, 0xe6, 0x0a, 0x45, - 0x73, 0xf1, 0x41, 0x58, 0xde, 0xa9, 0x95, 0x41, 0x89, 0x79, 0xe9, 0xa9, 0x42, 0x8a, 0x7a, 0x48, - 0xba, 0x50, 0xe5, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0xa4, 0x94, 0xf0, 0x29, 0x29, 0x2e, - 0xc8, 0xcf, 0x2b, 0x4e, 0x55, 0x62, 0x30, 0x60, 0x14, 0x0a, 0xe5, 0xe2, 0x81, 0xc8, 0x86, 0x24, - 0x26, 0xe5, 0xa4, 0x16, 0x0b, 0xc9, 0x63, 0xea, 0x83, 0xc8, 0xc0, 0x0c, 0x56, 0xc0, 0xad, 0x00, - 0x61, 0xac, 0x93, 0x4e, 0x94, 0x56, 0x59, 0x66, 0x49, 0x6a, 0x71, 0xb1, 0x5e, 0x66, 0xbe, 0x3e, - 0x84, 0xa5, 0x9f, 0x9e, 0xaf, 0x5f, 0x56, 0xa2, 0x0f, 0xf6, 0xa4, 0x3e, 0x4a, 0x20, 0x24, 0xb1, - 0x81, 0x05, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xf4, 0x0a, 0x9c, 0x31, 0x01, 0x00, - 0x00, -} diff --git a/go/vt/proto/logutil/logutil.pb.go b/go/vt/proto/logutil/logutil.pb.go index f120217326..5806897eb9 100644 --- a/go/vt/proto/logutil/logutil.pb.go +++ b/go/vt/proto/logutil/logutil.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: logutil.proto -package logutil // import "vitess.io/vitess/go/vt/proto/logutil" +package logutil -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Level is the level of the log messages. type Level int32 @@ -38,6 +40,7 @@ var Level_name = map[int32]string{ 2: "ERROR", 3: "CONSOLE", } + var Level_value = map[string]int32{ "INFO": 0, "WARNING": 1, @@ -48,8 +51,9 @@ var Level_value = map[string]int32{ func (x Level) String() string { return proto.EnumName(Level_name, int32(x)) } + func (Level) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_logutil_1922c06158165cc5, []int{0} + return fileDescriptor_31f5dd3702a8edf9, []int{0} } // Time represents a time stamp in nanoseconds. In go, use logutil library @@ -66,16 +70,17 @@ func (m *Time) Reset() { *m = Time{} } func (m *Time) String() string { return proto.CompactTextString(m) } func (*Time) ProtoMessage() {} func (*Time) Descriptor() ([]byte, []int) { - return fileDescriptor_logutil_1922c06158165cc5, []int{0} + return fileDescriptor_31f5dd3702a8edf9, []int{0} } + func (m *Time) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Time.Unmarshal(m, b) } func (m *Time) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Time.Marshal(b, m, deterministic) } -func (dst *Time) XXX_Merge(src proto.Message) { - xxx_messageInfo_Time.Merge(dst, src) +func (m *Time) XXX_Merge(src proto.Message) { + xxx_messageInfo_Time.Merge(m, src) } func (m *Time) XXX_Size() int { return xxx_messageInfo_Time.Size(m) @@ -116,16 +121,17 @@ func (m *Event) Reset() { *m = Event{} } func (m *Event) String() string { return proto.CompactTextString(m) } func (*Event) ProtoMessage() {} func (*Event) Descriptor() ([]byte, []int) { - return fileDescriptor_logutil_1922c06158165cc5, []int{1} + return fileDescriptor_31f5dd3702a8edf9, []int{1} } + func (m *Event) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Event.Unmarshal(m, b) } func (m *Event) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Event.Marshal(b, m, deterministic) } -func (dst *Event) XXX_Merge(src proto.Message) { - xxx_messageInfo_Event.Merge(dst, src) +func (m *Event) XXX_Merge(src proto.Message) { + xxx_messageInfo_Event.Merge(m, src) } func (m *Event) XXX_Size() int { return xxx_messageInfo_Event.Size(m) @@ -172,14 +178,14 @@ func (m *Event) GetValue() string { } func init() { + proto.RegisterEnum("logutil.Level", Level_name, Level_value) proto.RegisterType((*Time)(nil), "logutil.Time") proto.RegisterType((*Event)(nil), "logutil.Event") - proto.RegisterEnum("logutil.Level", Level_name, Level_value) } -func init() { proto.RegisterFile("logutil.proto", fileDescriptor_logutil_1922c06158165cc5) } +func init() { proto.RegisterFile("logutil.proto", fileDescriptor_31f5dd3702a8edf9) } -var fileDescriptor_logutil_1922c06158165cc5 = []byte{ +var fileDescriptor_31f5dd3702a8edf9 = []byte{ // 260 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x41, 0x4b, 0xfb, 0x40, 0x10, 0xc5, 0xff, 0xdb, 0x64, 0xff, 0xb1, 0x13, 0x5a, 0xc2, 0xe0, 0x21, 0xc7, 0x58, 0x8a, 0x04, diff --git a/go/vt/proto/mysqlctl/mysqlctl.pb.go b/go/vt/proto/mysqlctl/mysqlctl.pb.go index b75568fd4b..f5c5fb76da 100644 --- a/go/vt/proto/mysqlctl/mysqlctl.pb.go +++ b/go/vt/proto/mysqlctl/mysqlctl.pb.go @@ -1,15 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: mysqlctl.proto -package mysqlctl // import "vitess.io/vitess/go/vt/proto/mysqlctl" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +package mysqlctl import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. @@ -21,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type StartRequest struct { MysqldArgs []string `protobuf:"bytes,1,rep,name=mysqld_args,json=mysqldArgs,proto3" json:"mysqld_args,omitempty"` @@ -34,16 +35,17 @@ func (m *StartRequest) Reset() { *m = StartRequest{} } func (m *StartRequest) String() string { return proto.CompactTextString(m) } func (*StartRequest) ProtoMessage() {} func (*StartRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{0} + return fileDescriptor_cd8c110e42f9cbb9, []int{0} } + func (m *StartRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartRequest.Unmarshal(m, b) } func (m *StartRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartRequest.Marshal(b, m, deterministic) } -func (dst *StartRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartRequest.Merge(dst, src) +func (m *StartRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartRequest.Merge(m, src) } func (m *StartRequest) XXX_Size() int { return xxx_messageInfo_StartRequest.Size(m) @@ -71,16 +73,17 @@ func (m *StartResponse) Reset() { *m = StartResponse{} } func (m *StartResponse) String() string { return proto.CompactTextString(m) } func (*StartResponse) ProtoMessage() {} func (*StartResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{1} + return fileDescriptor_cd8c110e42f9cbb9, []int{1} } + func (m *StartResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartResponse.Unmarshal(m, b) } func (m *StartResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartResponse.Marshal(b, m, deterministic) } -func (dst *StartResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartResponse.Merge(dst, src) +func (m *StartResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartResponse.Merge(m, src) } func (m *StartResponse) XXX_Size() int { return xxx_messageInfo_StartResponse.Size(m) @@ -102,16 +105,17 @@ func (m *ShutdownRequest) Reset() { *m = ShutdownRequest{} } func (m *ShutdownRequest) String() string { return proto.CompactTextString(m) } func (*ShutdownRequest) ProtoMessage() {} func (*ShutdownRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{2} + return fileDescriptor_cd8c110e42f9cbb9, []int{2} } + func (m *ShutdownRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShutdownRequest.Unmarshal(m, b) } func (m *ShutdownRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShutdownRequest.Marshal(b, m, deterministic) } -func (dst *ShutdownRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShutdownRequest.Merge(dst, src) +func (m *ShutdownRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShutdownRequest.Merge(m, src) } func (m *ShutdownRequest) XXX_Size() int { return xxx_messageInfo_ShutdownRequest.Size(m) @@ -139,16 +143,17 @@ func (m *ShutdownResponse) Reset() { *m = ShutdownResponse{} } func (m *ShutdownResponse) String() string { return proto.CompactTextString(m) } func (*ShutdownResponse) ProtoMessage() {} func (*ShutdownResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{3} + return fileDescriptor_cd8c110e42f9cbb9, []int{3} } + func (m *ShutdownResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShutdownResponse.Unmarshal(m, b) } func (m *ShutdownResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShutdownResponse.Marshal(b, m, deterministic) } -func (dst *ShutdownResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShutdownResponse.Merge(dst, src) +func (m *ShutdownResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShutdownResponse.Merge(m, src) } func (m *ShutdownResponse) XXX_Size() int { return xxx_messageInfo_ShutdownResponse.Size(m) @@ -169,16 +174,17 @@ func (m *RunMysqlUpgradeRequest) Reset() { *m = RunMysqlUpgradeRequest{} func (m *RunMysqlUpgradeRequest) String() string { return proto.CompactTextString(m) } func (*RunMysqlUpgradeRequest) ProtoMessage() {} func (*RunMysqlUpgradeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{4} + return fileDescriptor_cd8c110e42f9cbb9, []int{4} } + func (m *RunMysqlUpgradeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RunMysqlUpgradeRequest.Unmarshal(m, b) } func (m *RunMysqlUpgradeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RunMysqlUpgradeRequest.Marshal(b, m, deterministic) } -func (dst *RunMysqlUpgradeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunMysqlUpgradeRequest.Merge(dst, src) +func (m *RunMysqlUpgradeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RunMysqlUpgradeRequest.Merge(m, src) } func (m *RunMysqlUpgradeRequest) XXX_Size() int { return xxx_messageInfo_RunMysqlUpgradeRequest.Size(m) @@ -199,16 +205,17 @@ func (m *RunMysqlUpgradeResponse) Reset() { *m = RunMysqlUpgradeResponse func (m *RunMysqlUpgradeResponse) String() string { return proto.CompactTextString(m) } func (*RunMysqlUpgradeResponse) ProtoMessage() {} func (*RunMysqlUpgradeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{5} + return fileDescriptor_cd8c110e42f9cbb9, []int{5} } + func (m *RunMysqlUpgradeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RunMysqlUpgradeResponse.Unmarshal(m, b) } func (m *RunMysqlUpgradeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RunMysqlUpgradeResponse.Marshal(b, m, deterministic) } -func (dst *RunMysqlUpgradeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunMysqlUpgradeResponse.Merge(dst, src) +func (m *RunMysqlUpgradeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RunMysqlUpgradeResponse.Merge(m, src) } func (m *RunMysqlUpgradeResponse) XXX_Size() int { return xxx_messageInfo_RunMysqlUpgradeResponse.Size(m) @@ -229,16 +236,17 @@ func (m *ReinitConfigRequest) Reset() { *m = ReinitConfigRequest{} } func (m *ReinitConfigRequest) String() string { return proto.CompactTextString(m) } func (*ReinitConfigRequest) ProtoMessage() {} func (*ReinitConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{6} + return fileDescriptor_cd8c110e42f9cbb9, []int{6} } + func (m *ReinitConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReinitConfigRequest.Unmarshal(m, b) } func (m *ReinitConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ReinitConfigRequest.Marshal(b, m, deterministic) } -func (dst *ReinitConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReinitConfigRequest.Merge(dst, src) +func (m *ReinitConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReinitConfigRequest.Merge(m, src) } func (m *ReinitConfigRequest) XXX_Size() int { return xxx_messageInfo_ReinitConfigRequest.Size(m) @@ -259,16 +267,17 @@ func (m *ReinitConfigResponse) Reset() { *m = ReinitConfigResponse{} } func (m *ReinitConfigResponse) String() string { return proto.CompactTextString(m) } func (*ReinitConfigResponse) ProtoMessage() {} func (*ReinitConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{7} + return fileDescriptor_cd8c110e42f9cbb9, []int{7} } + func (m *ReinitConfigResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReinitConfigResponse.Unmarshal(m, b) } func (m *ReinitConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ReinitConfigResponse.Marshal(b, m, deterministic) } -func (dst *ReinitConfigResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReinitConfigResponse.Merge(dst, src) +func (m *ReinitConfigResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReinitConfigResponse.Merge(m, src) } func (m *ReinitConfigResponse) XXX_Size() int { return xxx_messageInfo_ReinitConfigResponse.Size(m) @@ -289,16 +298,17 @@ func (m *RefreshConfigRequest) Reset() { *m = RefreshConfigRequest{} } func (m *RefreshConfigRequest) String() string { return proto.CompactTextString(m) } func (*RefreshConfigRequest) ProtoMessage() {} func (*RefreshConfigRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{8} + return fileDescriptor_cd8c110e42f9cbb9, []int{8} } + func (m *RefreshConfigRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RefreshConfigRequest.Unmarshal(m, b) } func (m *RefreshConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RefreshConfigRequest.Marshal(b, m, deterministic) } -func (dst *RefreshConfigRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RefreshConfigRequest.Merge(dst, src) +func (m *RefreshConfigRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshConfigRequest.Merge(m, src) } func (m *RefreshConfigRequest) XXX_Size() int { return xxx_messageInfo_RefreshConfigRequest.Size(m) @@ -319,16 +329,17 @@ func (m *RefreshConfigResponse) Reset() { *m = RefreshConfigResponse{} } func (m *RefreshConfigResponse) String() string { return proto.CompactTextString(m) } func (*RefreshConfigResponse) ProtoMessage() {} func (*RefreshConfigResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_mysqlctl_6cf72a3618d6fe7c, []int{9} + return fileDescriptor_cd8c110e42f9cbb9, []int{9} } + func (m *RefreshConfigResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RefreshConfigResponse.Unmarshal(m, b) } func (m *RefreshConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RefreshConfigResponse.Marshal(b, m, deterministic) } -func (dst *RefreshConfigResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RefreshConfigResponse.Merge(dst, src) +func (m *RefreshConfigResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshConfigResponse.Merge(m, src) } func (m *RefreshConfigResponse) XXX_Size() int { return xxx_messageInfo_RefreshConfigResponse.Size(m) @@ -352,6 +363,34 @@ func init() { proto.RegisterType((*RefreshConfigResponse)(nil), "mysqlctl.RefreshConfigResponse") } +func init() { proto.RegisterFile("mysqlctl.proto", fileDescriptor_cd8c110e42f9cbb9) } + +var fileDescriptor_cd8c110e42f9cbb9 = []byte{ + // 339 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4d, 0x4f, 0xfa, 0x30, + 0x1c, 0xc7, 0xff, 0x84, 0xfc, 0xcd, 0xfc, 0x09, 0xce, 0x54, 0x79, 0x6a, 0xa2, 0xe0, 0x12, 0x95, + 0x13, 0x4d, 0xf4, 0xa4, 0x37, 0x25, 0xf1, 0x66, 0x4c, 0x4a, 0x4c, 0x8c, 0x17, 0x32, 0xa5, 0x8c, + 0x26, 0xb8, 0x42, 0x5b, 0x20, 0xbe, 0x05, 0x5f, 0xb5, 0xb1, 0x6b, 0xc7, 0xc6, 0xc0, 0xdb, 0xfa, + 0x7d, 0x6a, 0xf6, 0xd9, 0xe0, 0xf0, 0xf3, 0x4b, 0xcd, 0xa7, 0x1f, 0x7a, 0xda, 0x9b, 0x49, 0xa1, + 0x05, 0xf2, 0xdc, 0x39, 0x20, 0x50, 0x19, 0xe8, 0x50, 0x6a, 0xca, 0xe6, 0x0b, 0xa6, 0x34, 0x6a, + 0xc3, 0x81, 0xf1, 0x46, 0xc3, 0x50, 0x46, 0xaa, 0x59, 0xea, 0x94, 0xbb, 0xfb, 0x14, 0x12, 0xe9, + 0x5e, 0x46, 0x2a, 0xf0, 0xa1, 0x6a, 0x0b, 0x6a, 0x26, 0x62, 0xc5, 0x82, 0x5b, 0xf0, 0x07, 0x93, + 0x85, 0x1e, 0x89, 0x55, 0xec, 0x46, 0x2e, 0xc1, 0x5f, 0x85, 0x5c, 0x0f, 0xc7, 0x42, 0x0e, 0x93, + 0x6a, 0xb3, 0xd4, 0x29, 0x75, 0x3d, 0x5a, 0xfd, 0x95, 0x1f, 0x85, 0x7c, 0x32, 0x62, 0x80, 0xe0, + 0x68, 0x5d, 0xb5, 0x73, 0x4d, 0xa8, 0xd3, 0x45, 0x6c, 0x02, 0x2f, 0xb3, 0x48, 0x86, 0x23, 0x66, + 0x57, 0x83, 0x16, 0x34, 0x0a, 0x8e, 0x2d, 0xd5, 0xe0, 0x98, 0x32, 0x1e, 0x73, 0xdd, 0x17, 0xf1, + 0x98, 0x47, 0xae, 0x51, 0x87, 0x93, 0xbc, 0x6c, 0xe3, 0x46, 0x1f, 0x4b, 0xa6, 0x26, 0xf9, 0x7c, + 0x03, 0x6a, 0x1b, 0x7a, 0x52, 0xb8, 0xfe, 0x2e, 0x83, 0x67, 0x2e, 0xee, 0xeb, 0x29, 0xba, 0x83, + 0xff, 0x86, 0x00, 0xaa, 0xf7, 0x52, 0xac, 0x59, 0x86, 0xb8, 0x51, 0xd0, 0xed, 0xbd, 0xff, 0x50, + 0x1f, 0x3c, 0xf7, 0xc6, 0xa8, 0x95, 0x89, 0xe5, 0x01, 0x62, 0xbc, 0xcd, 0x4a, 0x47, 0x5e, 0xc1, + 0xdf, 0x00, 0x81, 0x3a, 0xeb, 0xc2, 0x76, 0x7a, 0xf8, 0xfc, 0x8f, 0x44, 0xba, 0xfc, 0x0c, 0x95, + 0x2c, 0x30, 0x74, 0x9a, 0x29, 0x15, 0xf9, 0xe2, 0xb3, 0x5d, 0x76, 0x3a, 0x48, 0xa1, 0x9a, 0x23, + 0x8a, 0x72, 0x95, 0xe2, 0x27, 0xc0, 0xed, 0x9d, 0xbe, 0xdb, 0x7c, 0xb8, 0x7a, 0xbb, 0x58, 0x72, + 0xcd, 0x94, 0xea, 0x71, 0x41, 0x92, 0x27, 0x12, 0x09, 0xb2, 0xd4, 0xc4, 0xfc, 0xdc, 0xc4, 0x0d, + 0xbc, 0xef, 0x99, 0xf3, 0xcd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xe2, 0x15, 0x86, 0xfe, + 0x02, 0x00, 0x00, +} + // Reference imports to suppress errors if they are not otherwise used. var _ context.Context var _ grpc.ClientConn @@ -433,6 +472,26 @@ type MysqlCtlServer interface { RefreshConfig(context.Context, *RefreshConfigRequest) (*RefreshConfigResponse, error) } +// UnimplementedMysqlCtlServer can be embedded to have forward compatible implementations. +type UnimplementedMysqlCtlServer struct { +} + +func (*UnimplementedMysqlCtlServer) Start(ctx context.Context, req *StartRequest) (*StartResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Start not implemented") +} +func (*UnimplementedMysqlCtlServer) Shutdown(ctx context.Context, req *ShutdownRequest) (*ShutdownResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Shutdown not implemented") +} +func (*UnimplementedMysqlCtlServer) RunMysqlUpgrade(ctx context.Context, req *RunMysqlUpgradeRequest) (*RunMysqlUpgradeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RunMysqlUpgrade not implemented") +} +func (*UnimplementedMysqlCtlServer) ReinitConfig(ctx context.Context, req *ReinitConfigRequest) (*ReinitConfigResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReinitConfig not implemented") +} +func (*UnimplementedMysqlCtlServer) RefreshConfig(ctx context.Context, req *RefreshConfigRequest) (*RefreshConfigResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RefreshConfig not implemented") +} + func RegisterMysqlCtlServer(s *grpc.Server, srv MysqlCtlServer) { s.RegisterService(&_MysqlCtl_serviceDesc, srv) } @@ -555,31 +614,3 @@ var _MysqlCtl_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "mysqlctl.proto", } - -func init() { proto.RegisterFile("mysqlctl.proto", fileDescriptor_mysqlctl_6cf72a3618d6fe7c) } - -var fileDescriptor_mysqlctl_6cf72a3618d6fe7c = []byte{ - // 339 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x4d, 0x4f, 0xfa, 0x30, - 0x1c, 0xc7, 0xff, 0x84, 0xfc, 0xcd, 0xfc, 0x09, 0xce, 0x54, 0x79, 0x6a, 0xa2, 0xe0, 0x12, 0x95, - 0x13, 0x4d, 0xf4, 0xa4, 0x37, 0x25, 0xf1, 0x66, 0x4c, 0x4a, 0x4c, 0x8c, 0x17, 0x32, 0xa5, 0x8c, - 0x26, 0xb8, 0x42, 0x5b, 0x20, 0xbe, 0x05, 0x5f, 0xb5, 0xb1, 0x6b, 0xc7, 0xc6, 0xc0, 0xdb, 0xfa, - 0x7d, 0x6a, 0xf6, 0xd9, 0xe0, 0xf0, 0xf3, 0x4b, 0xcd, 0xa7, 0x1f, 0x7a, 0xda, 0x9b, 0x49, 0xa1, - 0x05, 0xf2, 0xdc, 0x39, 0x20, 0x50, 0x19, 0xe8, 0x50, 0x6a, 0xca, 0xe6, 0x0b, 0xa6, 0x34, 0x6a, - 0xc3, 0x81, 0xf1, 0x46, 0xc3, 0x50, 0x46, 0xaa, 0x59, 0xea, 0x94, 0xbb, 0xfb, 0x14, 0x12, 0xe9, - 0x5e, 0x46, 0x2a, 0xf0, 0xa1, 0x6a, 0x0b, 0x6a, 0x26, 0x62, 0xc5, 0x82, 0x5b, 0xf0, 0x07, 0x93, - 0x85, 0x1e, 0x89, 0x55, 0xec, 0x46, 0x2e, 0xc1, 0x5f, 0x85, 0x5c, 0x0f, 0xc7, 0x42, 0x0e, 0x93, - 0x6a, 0xb3, 0xd4, 0x29, 0x75, 0x3d, 0x5a, 0xfd, 0x95, 0x1f, 0x85, 0x7c, 0x32, 0x62, 0x80, 0xe0, - 0x68, 0x5d, 0xb5, 0x73, 0x4d, 0xa8, 0xd3, 0x45, 0x6c, 0x02, 0x2f, 0xb3, 0x48, 0x86, 0x23, 0x66, - 0x57, 0x83, 0x16, 0x34, 0x0a, 0x8e, 0x2d, 0xd5, 0xe0, 0x98, 0x32, 0x1e, 0x73, 0xdd, 0x17, 0xf1, - 0x98, 0x47, 0xae, 0x51, 0x87, 0x93, 0xbc, 0x6c, 0xe3, 0x46, 0x1f, 0x4b, 0xa6, 0x26, 0xf9, 0x7c, - 0x03, 0x6a, 0x1b, 0x7a, 0x52, 0xb8, 0xfe, 0x2e, 0x83, 0x67, 0x2e, 0xee, 0xeb, 0x29, 0xba, 0x83, - 0xff, 0x86, 0x00, 0xaa, 0xf7, 0x52, 0xac, 0x59, 0x86, 0xb8, 0x51, 0xd0, 0xed, 0xbd, 0xff, 0x50, - 0x1f, 0x3c, 0xf7, 0xc6, 0xa8, 0x95, 0x89, 0xe5, 0x01, 0x62, 0xbc, 0xcd, 0x4a, 0x47, 0x5e, 0xc1, - 0xdf, 0x00, 0x81, 0x3a, 0xeb, 0xc2, 0x76, 0x7a, 0xf8, 0xfc, 0x8f, 0x44, 0xba, 0xfc, 0x0c, 0x95, - 0x2c, 0x30, 0x74, 0x9a, 0x29, 0x15, 0xf9, 0xe2, 0xb3, 0x5d, 0x76, 0x3a, 0x48, 0xa1, 0x9a, 0x23, - 0x8a, 0x72, 0x95, 0xe2, 0x27, 0xc0, 0xed, 0x9d, 0xbe, 0xdb, 0x7c, 0xb8, 0x7a, 0xbb, 0x58, 0x72, - 0xcd, 0x94, 0xea, 0x71, 0x41, 0x92, 0x27, 0x12, 0x09, 0xb2, 0xd4, 0xc4, 0xfc, 0xdc, 0xc4, 0x0d, - 0xbc, 0xef, 0x99, 0xf3, 0xcd, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xe2, 0x15, 0x86, 0xfe, - 0x02, 0x00, 0x00, -} diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go index ec8b4f71ab..605d6d3ab4 100644 --- a/go/vt/proto/query/query.pb.go +++ b/go/vt/proto/query/query.pb.go @@ -1,13 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: query.proto -package query // import "vitess.io/vitess/go/vt/proto/query" +package query -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import topodata "vitess.io/vitess/go/vt/proto/topodata" -import vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + topodata "vitess.io/vitess/go/vt/proto/topodata" + vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -18,7 +20,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Flags sent from the MySQL C API type MySqlFlag int32 @@ -68,6 +70,7 @@ var MySqlFlag_name = map[int32]string{ 65536: "UNIQUE_FLAG", 131072: "BINCMP_FLAG", } + var MySqlFlag_value = map[string]int32{ "EMPTY": 0, "NOT_NULL_FLAG": 1, @@ -94,8 +97,9 @@ var MySqlFlag_value = map[string]int32{ func (x MySqlFlag) String() string { return proto.EnumName(MySqlFlag_name, int32(x)) } + func (MySqlFlag) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{0} + return fileDescriptor_5c6ac9b241082464, []int{0} } // Flag allows us to qualify types by their common properties. @@ -120,6 +124,7 @@ var Flag_name = map[int32]string{ 4096: "ISTEXT", 8192: "ISBINARY", } + var Flag_value = map[string]int32{ "NONE": 0, "ISINTEGRAL": 256, @@ -133,8 +138,9 @@ var Flag_value = map[string]int32{ func (x Flag) String() string { return proto.EnumName(Flag_name, int32(x)) } + func (Flag) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{1} + return fileDescriptor_5c6ac9b241082464, []int{1} } // Type defines the various supported data types in bind vars @@ -276,6 +282,7 @@ var Type_name = map[int32]string{ 2078: "JSON", 31: "EXPRESSION", } + var Type_value = map[string]int32{ "NULL_TYPE": 0, "INT8": 257, @@ -314,8 +321,9 @@ var Type_value = map[string]int32{ func (x Type) String() string { return proto.EnumName(Type_name, int32(x)) } + func (Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{2} + return fileDescriptor_5c6ac9b241082464, []int{2} } // TransactionState represents the state of a distributed transaction. @@ -334,6 +342,7 @@ var TransactionState_name = map[int32]string{ 2: "COMMIT", 3: "ROLLBACK", } + var TransactionState_value = map[string]int32{ "UNKNOWN": 0, "PREPARE": 1, @@ -344,8 +353,9 @@ var TransactionState_value = map[string]int32{ func (x TransactionState) String() string { return proto.EnumName(TransactionState_name, int32(x)) } + func (TransactionState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{3} + return fileDescriptor_5c6ac9b241082464, []int{3} } type ExecuteOptions_IncludedFields int32 @@ -361,6 +371,7 @@ var ExecuteOptions_IncludedFields_name = map[int32]string{ 1: "TYPE_ONLY", 2: "ALL", } + var ExecuteOptions_IncludedFields_value = map[string]int32{ "TYPE_AND_NAME": 0, "TYPE_ONLY": 1, @@ -370,8 +381,9 @@ var ExecuteOptions_IncludedFields_value = map[string]int32{ func (x ExecuteOptions_IncludedFields) String() string { return proto.EnumName(ExecuteOptions_IncludedFields_name, int32(x)) } + func (ExecuteOptions_IncludedFields) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{6, 0} + return fileDescriptor_5c6ac9b241082464, []int{6, 0} } type ExecuteOptions_Workload int32 @@ -389,6 +401,7 @@ var ExecuteOptions_Workload_name = map[int32]string{ 2: "OLAP", 3: "DBA", } + var ExecuteOptions_Workload_value = map[string]int32{ "UNSPECIFIED": 0, "OLTP": 1, @@ -399,8 +412,9 @@ var ExecuteOptions_Workload_value = map[string]int32{ func (x ExecuteOptions_Workload) String() string { return proto.EnumName(ExecuteOptions_Workload_name, int32(x)) } + func (ExecuteOptions_Workload) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{6, 1} + return fileDescriptor_5c6ac9b241082464, []int{6, 1} } type ExecuteOptions_TransactionIsolation int32 @@ -428,6 +442,7 @@ var ExecuteOptions_TransactionIsolation_name = map[int32]string{ 5: "CONSISTENT_SNAPSHOT_READ_ONLY", 6: "AUTOCOMMIT", } + var ExecuteOptions_TransactionIsolation_value = map[string]int32{ "DEFAULT": 0, "REPEATABLE_READ": 1, @@ -441,8 +456,9 @@ var ExecuteOptions_TransactionIsolation_value = map[string]int32{ func (x ExecuteOptions_TransactionIsolation) String() string { return proto.EnumName(ExecuteOptions_TransactionIsolation_name, int32(x)) } + func (ExecuteOptions_TransactionIsolation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{6, 2} + return fileDescriptor_5c6ac9b241082464, []int{6, 2} } // The category of one statement. @@ -459,6 +475,7 @@ var StreamEvent_Statement_Category_name = map[int32]string{ 1: "DML", 2: "DDL", } + var StreamEvent_Statement_Category_value = map[string]int32{ "Error": 0, "DML": 1, @@ -468,8 +485,9 @@ var StreamEvent_Statement_Category_value = map[string]int32{ func (x StreamEvent_Statement_Category) String() string { return proto.EnumName(StreamEvent_Statement_Category_name, int32(x)) } + func (StreamEvent_Statement_Category) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{12, 0, 0} + return fileDescriptor_5c6ac9b241082464, []int{12, 0, 0} } type SplitQueryRequest_Algorithm int32 @@ -483,6 +501,7 @@ var SplitQueryRequest_Algorithm_name = map[int32]string{ 0: "EQUAL_SPLITS", 1: "FULL_SCAN", } + var SplitQueryRequest_Algorithm_value = map[string]int32{ "EQUAL_SPLITS": 0, "FULL_SCAN": 1, @@ -491,8 +510,9 @@ var SplitQueryRequest_Algorithm_value = map[string]int32{ func (x SplitQueryRequest_Algorithm) String() string { return proto.EnumName(SplitQueryRequest_Algorithm_name, int32(x)) } + func (SplitQueryRequest_Algorithm) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{50, 0} + return fileDescriptor_5c6ac9b241082464, []int{50, 0} } // Target describes what the client expects the tablet is. @@ -513,16 +533,17 @@ func (m *Target) Reset() { *m = Target{} } func (m *Target) String() string { return proto.CompactTextString(m) } func (*Target) ProtoMessage() {} func (*Target) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{0} + return fileDescriptor_5c6ac9b241082464, []int{0} } + func (m *Target) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Target.Unmarshal(m, b) } func (m *Target) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Target.Marshal(b, m, deterministic) } -func (dst *Target) XXX_Merge(src proto.Message) { - xxx_messageInfo_Target.Merge(dst, src) +func (m *Target) XXX_Merge(src proto.Message) { + xxx_messageInfo_Target.Merge(m, src) } func (m *Target) XXX_Size() int { return xxx_messageInfo_Target.Size(m) @@ -581,16 +602,17 @@ func (m *VTGateCallerID) Reset() { *m = VTGateCallerID{} } func (m *VTGateCallerID) String() string { return proto.CompactTextString(m) } func (*VTGateCallerID) ProtoMessage() {} func (*VTGateCallerID) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{1} + return fileDescriptor_5c6ac9b241082464, []int{1} } + func (m *VTGateCallerID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VTGateCallerID.Unmarshal(m, b) } func (m *VTGateCallerID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VTGateCallerID.Marshal(b, m, deterministic) } -func (dst *VTGateCallerID) XXX_Merge(src proto.Message) { - xxx_messageInfo_VTGateCallerID.Merge(dst, src) +func (m *VTGateCallerID) XXX_Merge(src proto.Message) { + xxx_messageInfo_VTGateCallerID.Merge(m, src) } func (m *VTGateCallerID) XXX_Size() int { return xxx_messageInfo_VTGateCallerID.Size(m) @@ -637,16 +659,17 @@ func (m *EventToken) Reset() { *m = EventToken{} } func (m *EventToken) String() string { return proto.CompactTextString(m) } func (*EventToken) ProtoMessage() {} func (*EventToken) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{2} + return fileDescriptor_5c6ac9b241082464, []int{2} } + func (m *EventToken) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_EventToken.Unmarshal(m, b) } func (m *EventToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_EventToken.Marshal(b, m, deterministic) } -func (dst *EventToken) XXX_Merge(src proto.Message) { - xxx_messageInfo_EventToken.Merge(dst, src) +func (m *EventToken) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventToken.Merge(m, src) } func (m *EventToken) XXX_Size() int { return xxx_messageInfo_EventToken.Size(m) @@ -691,16 +714,17 @@ func (m *Value) Reset() { *m = Value{} } func (m *Value) String() string { return proto.CompactTextString(m) } func (*Value) ProtoMessage() {} func (*Value) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{3} + return fileDescriptor_5c6ac9b241082464, []int{3} } + func (m *Value) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Value.Unmarshal(m, b) } func (m *Value) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Value.Marshal(b, m, deterministic) } -func (dst *Value) XXX_Merge(src proto.Message) { - xxx_messageInfo_Value.Merge(dst, src) +func (m *Value) XXX_Merge(src proto.Message) { + xxx_messageInfo_Value.Merge(m, src) } func (m *Value) XXX_Size() int { return xxx_messageInfo_Value.Size(m) @@ -740,16 +764,17 @@ func (m *BindVariable) Reset() { *m = BindVariable{} } func (m *BindVariable) String() string { return proto.CompactTextString(m) } func (*BindVariable) ProtoMessage() {} func (*BindVariable) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{4} + return fileDescriptor_5c6ac9b241082464, []int{4} } + func (m *BindVariable) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BindVariable.Unmarshal(m, b) } func (m *BindVariable) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BindVariable.Marshal(b, m, deterministic) } -func (dst *BindVariable) XXX_Merge(src proto.Message) { - xxx_messageInfo_BindVariable.Merge(dst, src) +func (m *BindVariable) XXX_Merge(src proto.Message) { + xxx_messageInfo_BindVariable.Merge(m, src) } func (m *BindVariable) XXX_Size() int { return xxx_messageInfo_BindVariable.Size(m) @@ -797,16 +822,17 @@ func (m *BoundQuery) Reset() { *m = BoundQuery{} } func (m *BoundQuery) String() string { return proto.CompactTextString(m) } func (*BoundQuery) ProtoMessage() {} func (*BoundQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{5} + return fileDescriptor_5c6ac9b241082464, []int{5} } + func (m *BoundQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BoundQuery.Unmarshal(m, b) } func (m *BoundQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BoundQuery.Marshal(b, m, deterministic) } -func (dst *BoundQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_BoundQuery.Merge(dst, src) +func (m *BoundQuery) XXX_Merge(src proto.Message) { + xxx_messageInfo_BoundQuery.Merge(m, src) } func (m *BoundQuery) XXX_Size() int { return xxx_messageInfo_BoundQuery.Size(m) @@ -871,16 +897,17 @@ func (m *ExecuteOptions) Reset() { *m = ExecuteOptions{} } func (m *ExecuteOptions) String() string { return proto.CompactTextString(m) } func (*ExecuteOptions) ProtoMessage() {} func (*ExecuteOptions) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{6} + return fileDescriptor_5c6ac9b241082464, []int{6} } + func (m *ExecuteOptions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteOptions.Unmarshal(m, b) } func (m *ExecuteOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteOptions.Marshal(b, m, deterministic) } -func (dst *ExecuteOptions) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteOptions.Merge(dst, src) +func (m *ExecuteOptions) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteOptions.Merge(m, src) } func (m *ExecuteOptions) XXX_Size() int { return xxx_messageInfo_ExecuteOptions.Size(m) @@ -977,16 +1004,17 @@ func (m *Field) Reset() { *m = Field{} } func (m *Field) String() string { return proto.CompactTextString(m) } func (*Field) ProtoMessage() {} func (*Field) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{7} + return fileDescriptor_5c6ac9b241082464, []int{7} } + func (m *Field) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Field.Unmarshal(m, b) } func (m *Field) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Field.Marshal(b, m, deterministic) } -func (dst *Field) XXX_Merge(src proto.Message) { - xxx_messageInfo_Field.Merge(dst, src) +func (m *Field) XXX_Merge(src proto.Message) { + xxx_messageInfo_Field.Merge(m, src) } func (m *Field) XXX_Size() int { return xxx_messageInfo_Field.Size(m) @@ -1085,16 +1113,17 @@ func (m *Row) Reset() { *m = Row{} } func (m *Row) String() string { return proto.CompactTextString(m) } func (*Row) ProtoMessage() {} func (*Row) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{8} + return fileDescriptor_5c6ac9b241082464, []int{8} } + func (m *Row) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Row.Unmarshal(m, b) } func (m *Row) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Row.Marshal(b, m, deterministic) } -func (dst *Row) XXX_Merge(src proto.Message) { - xxx_messageInfo_Row.Merge(dst, src) +func (m *Row) XXX_Merge(src proto.Message) { + xxx_messageInfo_Row.Merge(m, src) } func (m *Row) XXX_Size() int { return xxx_messageInfo_Row.Size(m) @@ -1137,16 +1166,17 @@ func (m *ResultExtras) Reset() { *m = ResultExtras{} } func (m *ResultExtras) String() string { return proto.CompactTextString(m) } func (*ResultExtras) ProtoMessage() {} func (*ResultExtras) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{9} + return fileDescriptor_5c6ac9b241082464, []int{9} } + func (m *ResultExtras) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResultExtras.Unmarshal(m, b) } func (m *ResultExtras) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResultExtras.Marshal(b, m, deterministic) } -func (dst *ResultExtras) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResultExtras.Merge(dst, src) +func (m *ResultExtras) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResultExtras.Merge(m, src) } func (m *ResultExtras) XXX_Size() int { return xxx_messageInfo_ResultExtras.Size(m) @@ -1195,16 +1225,17 @@ func (m *QueryResult) Reset() { *m = QueryResult{} } func (m *QueryResult) String() string { return proto.CompactTextString(m) } func (*QueryResult) ProtoMessage() {} func (*QueryResult) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{10} + return fileDescriptor_5c6ac9b241082464, []int{10} } + func (m *QueryResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueryResult.Unmarshal(m, b) } func (m *QueryResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_QueryResult.Marshal(b, m, deterministic) } -func (dst *QueryResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryResult.Merge(dst, src) +func (m *QueryResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryResult.Merge(m, src) } func (m *QueryResult) XXX_Size() int { return xxx_messageInfo_QueryResult.Size(m) @@ -1264,16 +1295,17 @@ func (m *QueryWarning) Reset() { *m = QueryWarning{} } func (m *QueryWarning) String() string { return proto.CompactTextString(m) } func (*QueryWarning) ProtoMessage() {} func (*QueryWarning) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{11} + return fileDescriptor_5c6ac9b241082464, []int{11} } + func (m *QueryWarning) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QueryWarning.Unmarshal(m, b) } func (m *QueryWarning) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_QueryWarning.Marshal(b, m, deterministic) } -func (dst *QueryWarning) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryWarning.Merge(dst, src) +func (m *QueryWarning) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryWarning.Merge(m, src) } func (m *QueryWarning) XXX_Size() int { return xxx_messageInfo_QueryWarning.Size(m) @@ -1315,16 +1347,17 @@ func (m *StreamEvent) Reset() { *m = StreamEvent{} } func (m *StreamEvent) String() string { return proto.CompactTextString(m) } func (*StreamEvent) ProtoMessage() {} func (*StreamEvent) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{12} + return fileDescriptor_5c6ac9b241082464, []int{12} } + func (m *StreamEvent) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamEvent.Unmarshal(m, b) } func (m *StreamEvent) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamEvent.Marshal(b, m, deterministic) } -func (dst *StreamEvent) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamEvent.Merge(dst, src) +func (m *StreamEvent) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamEvent.Merge(m, src) } func (m *StreamEvent) XXX_Size() int { return xxx_messageInfo_StreamEvent.Size(m) @@ -1368,16 +1401,17 @@ func (m *StreamEvent_Statement) Reset() { *m = StreamEvent_Statement{} } func (m *StreamEvent_Statement) String() string { return proto.CompactTextString(m) } func (*StreamEvent_Statement) ProtoMessage() {} func (*StreamEvent_Statement) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{12, 0} + return fileDescriptor_5c6ac9b241082464, []int{12, 0} } + func (m *StreamEvent_Statement) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamEvent_Statement.Unmarshal(m, b) } func (m *StreamEvent_Statement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamEvent_Statement.Marshal(b, m, deterministic) } -func (dst *StreamEvent_Statement) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamEvent_Statement.Merge(dst, src) +func (m *StreamEvent_Statement) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamEvent_Statement.Merge(m, src) } func (m *StreamEvent_Statement) XXX_Size() int { return xxx_messageInfo_StreamEvent_Statement.Size(m) @@ -1440,16 +1474,17 @@ func (m *ExecuteRequest) Reset() { *m = ExecuteRequest{} } func (m *ExecuteRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteRequest) ProtoMessage() {} func (*ExecuteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{13} + return fileDescriptor_5c6ac9b241082464, []int{13} } + func (m *ExecuteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteRequest.Unmarshal(m, b) } func (m *ExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteRequest.Merge(dst, src) +func (m *ExecuteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteRequest.Merge(m, src) } func (m *ExecuteRequest) XXX_Size() int { return xxx_messageInfo_ExecuteRequest.Size(m) @@ -1514,16 +1549,17 @@ func (m *ExecuteResponse) Reset() { *m = ExecuteResponse{} } func (m *ExecuteResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteResponse) ProtoMessage() {} func (*ExecuteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{14} + return fileDescriptor_5c6ac9b241082464, []int{14} } + func (m *ExecuteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteResponse.Unmarshal(m, b) } func (m *ExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteResponse.Merge(dst, src) +func (m *ExecuteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteResponse.Merge(m, src) } func (m *ExecuteResponse) XXX_Size() int { return xxx_messageInfo_ExecuteResponse.Size(m) @@ -1558,16 +1594,17 @@ func (m *ResultWithError) Reset() { *m = ResultWithError{} } func (m *ResultWithError) String() string { return proto.CompactTextString(m) } func (*ResultWithError) ProtoMessage() {} func (*ResultWithError) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{15} + return fileDescriptor_5c6ac9b241082464, []int{15} } + func (m *ResultWithError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResultWithError.Unmarshal(m, b) } func (m *ResultWithError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResultWithError.Marshal(b, m, deterministic) } -func (dst *ResultWithError) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResultWithError.Merge(dst, src) +func (m *ResultWithError) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResultWithError.Merge(m, src) } func (m *ResultWithError) XXX_Size() int { return xxx_messageInfo_ResultWithError.Size(m) @@ -1610,16 +1647,17 @@ func (m *ExecuteBatchRequest) Reset() { *m = ExecuteBatchRequest{} } func (m *ExecuteBatchRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchRequest) ProtoMessage() {} func (*ExecuteBatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{16} + return fileDescriptor_5c6ac9b241082464, []int{16} } + func (m *ExecuteBatchRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchRequest.Unmarshal(m, b) } func (m *ExecuteBatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchRequest.Merge(dst, src) +func (m *ExecuteBatchRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchRequest.Merge(m, src) } func (m *ExecuteBatchRequest) XXX_Size() int { return xxx_messageInfo_ExecuteBatchRequest.Size(m) @@ -1691,16 +1729,17 @@ func (m *ExecuteBatchResponse) Reset() { *m = ExecuteBatchResponse{} } func (m *ExecuteBatchResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchResponse) ProtoMessage() {} func (*ExecuteBatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{17} + return fileDescriptor_5c6ac9b241082464, []int{17} } + func (m *ExecuteBatchResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchResponse.Unmarshal(m, b) } func (m *ExecuteBatchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchResponse.Merge(dst, src) +func (m *ExecuteBatchResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchResponse.Merge(m, src) } func (m *ExecuteBatchResponse) XXX_Size() int { return xxx_messageInfo_ExecuteBatchResponse.Size(m) @@ -1735,16 +1774,17 @@ func (m *StreamExecuteRequest) Reset() { *m = StreamExecuteRequest{} } func (m *StreamExecuteRequest) String() string { return proto.CompactTextString(m) } func (*StreamExecuteRequest) ProtoMessage() {} func (*StreamExecuteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{18} + return fileDescriptor_5c6ac9b241082464, []int{18} } + func (m *StreamExecuteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteRequest.Unmarshal(m, b) } func (m *StreamExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteRequest.Marshal(b, m, deterministic) } -func (dst *StreamExecuteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteRequest.Merge(dst, src) +func (m *StreamExecuteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteRequest.Merge(m, src) } func (m *StreamExecuteRequest) XXX_Size() int { return xxx_messageInfo_StreamExecuteRequest.Size(m) @@ -1809,16 +1849,17 @@ func (m *StreamExecuteResponse) Reset() { *m = StreamExecuteResponse{} } func (m *StreamExecuteResponse) String() string { return proto.CompactTextString(m) } func (*StreamExecuteResponse) ProtoMessage() {} func (*StreamExecuteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{19} + return fileDescriptor_5c6ac9b241082464, []int{19} } + func (m *StreamExecuteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteResponse.Unmarshal(m, b) } func (m *StreamExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteResponse.Marshal(b, m, deterministic) } -func (dst *StreamExecuteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteResponse.Merge(dst, src) +func (m *StreamExecuteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteResponse.Merge(m, src) } func (m *StreamExecuteResponse) XXX_Size() int { return xxx_messageInfo_StreamExecuteResponse.Size(m) @@ -1851,16 +1892,17 @@ func (m *BeginRequest) Reset() { *m = BeginRequest{} } func (m *BeginRequest) String() string { return proto.CompactTextString(m) } func (*BeginRequest) ProtoMessage() {} func (*BeginRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{20} + return fileDescriptor_5c6ac9b241082464, []int{20} } + func (m *BeginRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginRequest.Unmarshal(m, b) } func (m *BeginRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginRequest.Marshal(b, m, deterministic) } -func (dst *BeginRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginRequest.Merge(dst, src) +func (m *BeginRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginRequest.Merge(m, src) } func (m *BeginRequest) XXX_Size() int { return xxx_messageInfo_BeginRequest.Size(m) @@ -1911,16 +1953,17 @@ func (m *BeginResponse) Reset() { *m = BeginResponse{} } func (m *BeginResponse) String() string { return proto.CompactTextString(m) } func (*BeginResponse) ProtoMessage() {} func (*BeginResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{21} + return fileDescriptor_5c6ac9b241082464, []int{21} } + func (m *BeginResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginResponse.Unmarshal(m, b) } func (m *BeginResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginResponse.Marshal(b, m, deterministic) } -func (dst *BeginResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginResponse.Merge(dst, src) +func (m *BeginResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginResponse.Merge(m, src) } func (m *BeginResponse) XXX_Size() int { return xxx_messageInfo_BeginResponse.Size(m) @@ -1953,16 +1996,17 @@ func (m *CommitRequest) Reset() { *m = CommitRequest{} } func (m *CommitRequest) String() string { return proto.CompactTextString(m) } func (*CommitRequest) ProtoMessage() {} func (*CommitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{22} + return fileDescriptor_5c6ac9b241082464, []int{22} } + func (m *CommitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitRequest.Unmarshal(m, b) } func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic) } -func (dst *CommitRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitRequest.Merge(dst, src) +func (m *CommitRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitRequest.Merge(m, src) } func (m *CommitRequest) XXX_Size() int { return xxx_messageInfo_CommitRequest.Size(m) @@ -2012,16 +2056,17 @@ func (m *CommitResponse) Reset() { *m = CommitResponse{} } func (m *CommitResponse) String() string { return proto.CompactTextString(m) } func (*CommitResponse) ProtoMessage() {} func (*CommitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{23} + return fileDescriptor_5c6ac9b241082464, []int{23} } + func (m *CommitResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitResponse.Unmarshal(m, b) } func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic) } -func (dst *CommitResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitResponse.Merge(dst, src) +func (m *CommitResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitResponse.Merge(m, src) } func (m *CommitResponse) XXX_Size() int { return xxx_messageInfo_CommitResponse.Size(m) @@ -2047,16 +2092,17 @@ func (m *RollbackRequest) Reset() { *m = RollbackRequest{} } func (m *RollbackRequest) String() string { return proto.CompactTextString(m) } func (*RollbackRequest) ProtoMessage() {} func (*RollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{24} + return fileDescriptor_5c6ac9b241082464, []int{24} } + func (m *RollbackRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RollbackRequest.Unmarshal(m, b) } func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic) } -func (dst *RollbackRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RollbackRequest.Merge(dst, src) +func (m *RollbackRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackRequest.Merge(m, src) } func (m *RollbackRequest) XXX_Size() int { return xxx_messageInfo_RollbackRequest.Size(m) @@ -2106,16 +2152,17 @@ func (m *RollbackResponse) Reset() { *m = RollbackResponse{} } func (m *RollbackResponse) String() string { return proto.CompactTextString(m) } func (*RollbackResponse) ProtoMessage() {} func (*RollbackResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{25} + return fileDescriptor_5c6ac9b241082464, []int{25} } + func (m *RollbackResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RollbackResponse.Unmarshal(m, b) } func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic) } -func (dst *RollbackResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RollbackResponse.Merge(dst, src) +func (m *RollbackResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackResponse.Merge(m, src) } func (m *RollbackResponse) XXX_Size() int { return xxx_messageInfo_RollbackResponse.Size(m) @@ -2142,16 +2189,17 @@ func (m *PrepareRequest) Reset() { *m = PrepareRequest{} } func (m *PrepareRequest) String() string { return proto.CompactTextString(m) } func (*PrepareRequest) ProtoMessage() {} func (*PrepareRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{26} + return fileDescriptor_5c6ac9b241082464, []int{26} } + func (m *PrepareRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PrepareRequest.Unmarshal(m, b) } func (m *PrepareRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PrepareRequest.Marshal(b, m, deterministic) } -func (dst *PrepareRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PrepareRequest.Merge(dst, src) +func (m *PrepareRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PrepareRequest.Merge(m, src) } func (m *PrepareRequest) XXX_Size() int { return xxx_messageInfo_PrepareRequest.Size(m) @@ -2208,16 +2256,17 @@ func (m *PrepareResponse) Reset() { *m = PrepareResponse{} } func (m *PrepareResponse) String() string { return proto.CompactTextString(m) } func (*PrepareResponse) ProtoMessage() {} func (*PrepareResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{27} + return fileDescriptor_5c6ac9b241082464, []int{27} } + func (m *PrepareResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PrepareResponse.Unmarshal(m, b) } func (m *PrepareResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PrepareResponse.Marshal(b, m, deterministic) } -func (dst *PrepareResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PrepareResponse.Merge(dst, src) +func (m *PrepareResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PrepareResponse.Merge(m, src) } func (m *PrepareResponse) XXX_Size() int { return xxx_messageInfo_PrepareResponse.Size(m) @@ -2243,16 +2292,17 @@ func (m *CommitPreparedRequest) Reset() { *m = CommitPreparedRequest{} } func (m *CommitPreparedRequest) String() string { return proto.CompactTextString(m) } func (*CommitPreparedRequest) ProtoMessage() {} func (*CommitPreparedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{28} + return fileDescriptor_5c6ac9b241082464, []int{28} } + func (m *CommitPreparedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitPreparedRequest.Unmarshal(m, b) } func (m *CommitPreparedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitPreparedRequest.Marshal(b, m, deterministic) } -func (dst *CommitPreparedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitPreparedRequest.Merge(dst, src) +func (m *CommitPreparedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitPreparedRequest.Merge(m, src) } func (m *CommitPreparedRequest) XXX_Size() int { return xxx_messageInfo_CommitPreparedRequest.Size(m) @@ -2302,16 +2352,17 @@ func (m *CommitPreparedResponse) Reset() { *m = CommitPreparedResponse{} func (m *CommitPreparedResponse) String() string { return proto.CompactTextString(m) } func (*CommitPreparedResponse) ProtoMessage() {} func (*CommitPreparedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{29} + return fileDescriptor_5c6ac9b241082464, []int{29} } + func (m *CommitPreparedResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitPreparedResponse.Unmarshal(m, b) } func (m *CommitPreparedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitPreparedResponse.Marshal(b, m, deterministic) } -func (dst *CommitPreparedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitPreparedResponse.Merge(dst, src) +func (m *CommitPreparedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitPreparedResponse.Merge(m, src) } func (m *CommitPreparedResponse) XXX_Size() int { return xxx_messageInfo_CommitPreparedResponse.Size(m) @@ -2338,16 +2389,17 @@ func (m *RollbackPreparedRequest) Reset() { *m = RollbackPreparedRequest func (m *RollbackPreparedRequest) String() string { return proto.CompactTextString(m) } func (*RollbackPreparedRequest) ProtoMessage() {} func (*RollbackPreparedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{30} + return fileDescriptor_5c6ac9b241082464, []int{30} } + func (m *RollbackPreparedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RollbackPreparedRequest.Unmarshal(m, b) } func (m *RollbackPreparedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RollbackPreparedRequest.Marshal(b, m, deterministic) } -func (dst *RollbackPreparedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RollbackPreparedRequest.Merge(dst, src) +func (m *RollbackPreparedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackPreparedRequest.Merge(m, src) } func (m *RollbackPreparedRequest) XXX_Size() int { return xxx_messageInfo_RollbackPreparedRequest.Size(m) @@ -2404,16 +2456,17 @@ func (m *RollbackPreparedResponse) Reset() { *m = RollbackPreparedRespon func (m *RollbackPreparedResponse) String() string { return proto.CompactTextString(m) } func (*RollbackPreparedResponse) ProtoMessage() {} func (*RollbackPreparedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{31} + return fileDescriptor_5c6ac9b241082464, []int{31} } + func (m *RollbackPreparedResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RollbackPreparedResponse.Unmarshal(m, b) } func (m *RollbackPreparedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RollbackPreparedResponse.Marshal(b, m, deterministic) } -func (dst *RollbackPreparedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RollbackPreparedResponse.Merge(dst, src) +func (m *RollbackPreparedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackPreparedResponse.Merge(m, src) } func (m *RollbackPreparedResponse) XXX_Size() int { return xxx_messageInfo_RollbackPreparedResponse.Size(m) @@ -2440,16 +2493,17 @@ func (m *CreateTransactionRequest) Reset() { *m = CreateTransactionReque func (m *CreateTransactionRequest) String() string { return proto.CompactTextString(m) } func (*CreateTransactionRequest) ProtoMessage() {} func (*CreateTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{32} + return fileDescriptor_5c6ac9b241082464, []int{32} } + func (m *CreateTransactionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTransactionRequest.Unmarshal(m, b) } func (m *CreateTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateTransactionRequest.Marshal(b, m, deterministic) } -func (dst *CreateTransactionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateTransactionRequest.Merge(dst, src) +func (m *CreateTransactionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateTransactionRequest.Merge(m, src) } func (m *CreateTransactionRequest) XXX_Size() int { return xxx_messageInfo_CreateTransactionRequest.Size(m) @@ -2506,16 +2560,17 @@ func (m *CreateTransactionResponse) Reset() { *m = CreateTransactionResp func (m *CreateTransactionResponse) String() string { return proto.CompactTextString(m) } func (*CreateTransactionResponse) ProtoMessage() {} func (*CreateTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{33} + return fileDescriptor_5c6ac9b241082464, []int{33} } + func (m *CreateTransactionResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CreateTransactionResponse.Unmarshal(m, b) } func (m *CreateTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CreateTransactionResponse.Marshal(b, m, deterministic) } -func (dst *CreateTransactionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateTransactionResponse.Merge(dst, src) +func (m *CreateTransactionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CreateTransactionResponse.Merge(m, src) } func (m *CreateTransactionResponse) XXX_Size() int { return xxx_messageInfo_CreateTransactionResponse.Size(m) @@ -2542,16 +2597,17 @@ func (m *StartCommitRequest) Reset() { *m = StartCommitRequest{} } func (m *StartCommitRequest) String() string { return proto.CompactTextString(m) } func (*StartCommitRequest) ProtoMessage() {} func (*StartCommitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{34} + return fileDescriptor_5c6ac9b241082464, []int{34} } + func (m *StartCommitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartCommitRequest.Unmarshal(m, b) } func (m *StartCommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartCommitRequest.Marshal(b, m, deterministic) } -func (dst *StartCommitRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartCommitRequest.Merge(dst, src) +func (m *StartCommitRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartCommitRequest.Merge(m, src) } func (m *StartCommitRequest) XXX_Size() int { return xxx_messageInfo_StartCommitRequest.Size(m) @@ -2608,16 +2664,17 @@ func (m *StartCommitResponse) Reset() { *m = StartCommitResponse{} } func (m *StartCommitResponse) String() string { return proto.CompactTextString(m) } func (*StartCommitResponse) ProtoMessage() {} func (*StartCommitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{35} + return fileDescriptor_5c6ac9b241082464, []int{35} } + func (m *StartCommitResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartCommitResponse.Unmarshal(m, b) } func (m *StartCommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartCommitResponse.Marshal(b, m, deterministic) } -func (dst *StartCommitResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartCommitResponse.Merge(dst, src) +func (m *StartCommitResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartCommitResponse.Merge(m, src) } func (m *StartCommitResponse) XXX_Size() int { return xxx_messageInfo_StartCommitResponse.Size(m) @@ -2644,16 +2701,17 @@ func (m *SetRollbackRequest) Reset() { *m = SetRollbackRequest{} } func (m *SetRollbackRequest) String() string { return proto.CompactTextString(m) } func (*SetRollbackRequest) ProtoMessage() {} func (*SetRollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{36} + return fileDescriptor_5c6ac9b241082464, []int{36} } + func (m *SetRollbackRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetRollbackRequest.Unmarshal(m, b) } func (m *SetRollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetRollbackRequest.Marshal(b, m, deterministic) } -func (dst *SetRollbackRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetRollbackRequest.Merge(dst, src) +func (m *SetRollbackRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetRollbackRequest.Merge(m, src) } func (m *SetRollbackRequest) XXX_Size() int { return xxx_messageInfo_SetRollbackRequest.Size(m) @@ -2710,16 +2768,17 @@ func (m *SetRollbackResponse) Reset() { *m = SetRollbackResponse{} } func (m *SetRollbackResponse) String() string { return proto.CompactTextString(m) } func (*SetRollbackResponse) ProtoMessage() {} func (*SetRollbackResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{37} + return fileDescriptor_5c6ac9b241082464, []int{37} } + func (m *SetRollbackResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetRollbackResponse.Unmarshal(m, b) } func (m *SetRollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetRollbackResponse.Marshal(b, m, deterministic) } -func (dst *SetRollbackResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetRollbackResponse.Merge(dst, src) +func (m *SetRollbackResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetRollbackResponse.Merge(m, src) } func (m *SetRollbackResponse) XXX_Size() int { return xxx_messageInfo_SetRollbackResponse.Size(m) @@ -2745,16 +2804,17 @@ func (m *ConcludeTransactionRequest) Reset() { *m = ConcludeTransactionR func (m *ConcludeTransactionRequest) String() string { return proto.CompactTextString(m) } func (*ConcludeTransactionRequest) ProtoMessage() {} func (*ConcludeTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{38} + return fileDescriptor_5c6ac9b241082464, []int{38} } + func (m *ConcludeTransactionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConcludeTransactionRequest.Unmarshal(m, b) } func (m *ConcludeTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ConcludeTransactionRequest.Marshal(b, m, deterministic) } -func (dst *ConcludeTransactionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConcludeTransactionRequest.Merge(dst, src) +func (m *ConcludeTransactionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConcludeTransactionRequest.Merge(m, src) } func (m *ConcludeTransactionRequest) XXX_Size() int { return xxx_messageInfo_ConcludeTransactionRequest.Size(m) @@ -2804,16 +2864,17 @@ func (m *ConcludeTransactionResponse) Reset() { *m = ConcludeTransaction func (m *ConcludeTransactionResponse) String() string { return proto.CompactTextString(m) } func (*ConcludeTransactionResponse) ProtoMessage() {} func (*ConcludeTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{39} + return fileDescriptor_5c6ac9b241082464, []int{39} } + func (m *ConcludeTransactionResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ConcludeTransactionResponse.Unmarshal(m, b) } func (m *ConcludeTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ConcludeTransactionResponse.Marshal(b, m, deterministic) } -func (dst *ConcludeTransactionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConcludeTransactionResponse.Merge(dst, src) +func (m *ConcludeTransactionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConcludeTransactionResponse.Merge(m, src) } func (m *ConcludeTransactionResponse) XXX_Size() int { return xxx_messageInfo_ConcludeTransactionResponse.Size(m) @@ -2839,16 +2900,17 @@ func (m *ReadTransactionRequest) Reset() { *m = ReadTransactionRequest{} func (m *ReadTransactionRequest) String() string { return proto.CompactTextString(m) } func (*ReadTransactionRequest) ProtoMessage() {} func (*ReadTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{40} + return fileDescriptor_5c6ac9b241082464, []int{40} } + func (m *ReadTransactionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReadTransactionRequest.Unmarshal(m, b) } func (m *ReadTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ReadTransactionRequest.Marshal(b, m, deterministic) } -func (dst *ReadTransactionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReadTransactionRequest.Merge(dst, src) +func (m *ReadTransactionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReadTransactionRequest.Merge(m, src) } func (m *ReadTransactionRequest) XXX_Size() int { return xxx_messageInfo_ReadTransactionRequest.Size(m) @@ -2899,16 +2961,17 @@ func (m *ReadTransactionResponse) Reset() { *m = ReadTransactionResponse func (m *ReadTransactionResponse) String() string { return proto.CompactTextString(m) } func (*ReadTransactionResponse) ProtoMessage() {} func (*ReadTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{41} + return fileDescriptor_5c6ac9b241082464, []int{41} } + func (m *ReadTransactionResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReadTransactionResponse.Unmarshal(m, b) } func (m *ReadTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ReadTransactionResponse.Marshal(b, m, deterministic) } -func (dst *ReadTransactionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReadTransactionResponse.Merge(dst, src) +func (m *ReadTransactionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReadTransactionResponse.Merge(m, src) } func (m *ReadTransactionResponse) XXX_Size() int { return xxx_messageInfo_ReadTransactionResponse.Size(m) @@ -2942,16 +3005,17 @@ func (m *BeginExecuteRequest) Reset() { *m = BeginExecuteRequest{} } func (m *BeginExecuteRequest) String() string { return proto.CompactTextString(m) } func (*BeginExecuteRequest) ProtoMessage() {} func (*BeginExecuteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{42} + return fileDescriptor_5c6ac9b241082464, []int{42} } + func (m *BeginExecuteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginExecuteRequest.Unmarshal(m, b) } func (m *BeginExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginExecuteRequest.Marshal(b, m, deterministic) } -func (dst *BeginExecuteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginExecuteRequest.Merge(dst, src) +func (m *BeginExecuteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginExecuteRequest.Merge(m, src) } func (m *BeginExecuteRequest) XXX_Size() int { return xxx_messageInfo_BeginExecuteRequest.Size(m) @@ -3015,16 +3079,17 @@ func (m *BeginExecuteResponse) Reset() { *m = BeginExecuteResponse{} } func (m *BeginExecuteResponse) String() string { return proto.CompactTextString(m) } func (*BeginExecuteResponse) ProtoMessage() {} func (*BeginExecuteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{43} + return fileDescriptor_5c6ac9b241082464, []int{43} } + func (m *BeginExecuteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginExecuteResponse.Unmarshal(m, b) } func (m *BeginExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginExecuteResponse.Marshal(b, m, deterministic) } -func (dst *BeginExecuteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginExecuteResponse.Merge(dst, src) +func (m *BeginExecuteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginExecuteResponse.Merge(m, src) } func (m *BeginExecuteResponse) XXX_Size() int { return xxx_messageInfo_BeginExecuteResponse.Size(m) @@ -3073,16 +3138,17 @@ func (m *BeginExecuteBatchRequest) Reset() { *m = BeginExecuteBatchReque func (m *BeginExecuteBatchRequest) String() string { return proto.CompactTextString(m) } func (*BeginExecuteBatchRequest) ProtoMessage() {} func (*BeginExecuteBatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{44} + return fileDescriptor_5c6ac9b241082464, []int{44} } + func (m *BeginExecuteBatchRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginExecuteBatchRequest.Unmarshal(m, b) } func (m *BeginExecuteBatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginExecuteBatchRequest.Marshal(b, m, deterministic) } -func (dst *BeginExecuteBatchRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginExecuteBatchRequest.Merge(dst, src) +func (m *BeginExecuteBatchRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginExecuteBatchRequest.Merge(m, src) } func (m *BeginExecuteBatchRequest) XXX_Size() int { return xxx_messageInfo_BeginExecuteBatchRequest.Size(m) @@ -3153,16 +3219,17 @@ func (m *BeginExecuteBatchResponse) Reset() { *m = BeginExecuteBatchResp func (m *BeginExecuteBatchResponse) String() string { return proto.CompactTextString(m) } func (*BeginExecuteBatchResponse) ProtoMessage() {} func (*BeginExecuteBatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{45} + return fileDescriptor_5c6ac9b241082464, []int{45} } + func (m *BeginExecuteBatchResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginExecuteBatchResponse.Unmarshal(m, b) } func (m *BeginExecuteBatchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginExecuteBatchResponse.Marshal(b, m, deterministic) } -func (dst *BeginExecuteBatchResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginExecuteBatchResponse.Merge(dst, src) +func (m *BeginExecuteBatchResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginExecuteBatchResponse.Merge(m, src) } func (m *BeginExecuteBatchResponse) XXX_Size() int { return xxx_messageInfo_BeginExecuteBatchResponse.Size(m) @@ -3210,16 +3277,17 @@ func (m *MessageStreamRequest) Reset() { *m = MessageStreamRequest{} } func (m *MessageStreamRequest) String() string { return proto.CompactTextString(m) } func (*MessageStreamRequest) ProtoMessage() {} func (*MessageStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{46} + return fileDescriptor_5c6ac9b241082464, []int{46} } + func (m *MessageStreamRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageStreamRequest.Unmarshal(m, b) } func (m *MessageStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageStreamRequest.Marshal(b, m, deterministic) } -func (dst *MessageStreamRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageStreamRequest.Merge(dst, src) +func (m *MessageStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageStreamRequest.Merge(m, src) } func (m *MessageStreamRequest) XXX_Size() int { return xxx_messageInfo_MessageStreamRequest.Size(m) @@ -3270,16 +3338,17 @@ func (m *MessageStreamResponse) Reset() { *m = MessageStreamResponse{} } func (m *MessageStreamResponse) String() string { return proto.CompactTextString(m) } func (*MessageStreamResponse) ProtoMessage() {} func (*MessageStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{47} + return fileDescriptor_5c6ac9b241082464, []int{47} } + func (m *MessageStreamResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageStreamResponse.Unmarshal(m, b) } func (m *MessageStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageStreamResponse.Marshal(b, m, deterministic) } -func (dst *MessageStreamResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageStreamResponse.Merge(dst, src) +func (m *MessageStreamResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageStreamResponse.Merge(m, src) } func (m *MessageStreamResponse) XXX_Size() int { return xxx_messageInfo_MessageStreamResponse.Size(m) @@ -3314,16 +3383,17 @@ func (m *MessageAckRequest) Reset() { *m = MessageAckRequest{} } func (m *MessageAckRequest) String() string { return proto.CompactTextString(m) } func (*MessageAckRequest) ProtoMessage() {} func (*MessageAckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{48} + return fileDescriptor_5c6ac9b241082464, []int{48} } + func (m *MessageAckRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageAckRequest.Unmarshal(m, b) } func (m *MessageAckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageAckRequest.Marshal(b, m, deterministic) } -func (dst *MessageAckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageAckRequest.Merge(dst, src) +func (m *MessageAckRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageAckRequest.Merge(m, src) } func (m *MessageAckRequest) XXX_Size() int { return xxx_messageInfo_MessageAckRequest.Size(m) @@ -3384,16 +3454,17 @@ func (m *MessageAckResponse) Reset() { *m = MessageAckResponse{} } func (m *MessageAckResponse) String() string { return proto.CompactTextString(m) } func (*MessageAckResponse) ProtoMessage() {} func (*MessageAckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{49} + return fileDescriptor_5c6ac9b241082464, []int{49} } + func (m *MessageAckResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageAckResponse.Unmarshal(m, b) } func (m *MessageAckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageAckResponse.Marshal(b, m, deterministic) } -func (dst *MessageAckResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageAckResponse.Merge(dst, src) +func (m *MessageAckResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageAckResponse.Merge(m, src) } func (m *MessageAckResponse) XXX_Size() int { return xxx_messageInfo_MessageAckResponse.Size(m) @@ -3432,16 +3503,17 @@ func (m *SplitQueryRequest) Reset() { *m = SplitQueryRequest{} } func (m *SplitQueryRequest) String() string { return proto.CompactTextString(m) } func (*SplitQueryRequest) ProtoMessage() {} func (*SplitQueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{50} + return fileDescriptor_5c6ac9b241082464, []int{50} } + func (m *SplitQueryRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryRequest.Unmarshal(m, b) } func (m *SplitQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryRequest.Marshal(b, m, deterministic) } -func (dst *SplitQueryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryRequest.Merge(dst, src) +func (m *SplitQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryRequest.Merge(m, src) } func (m *SplitQueryRequest) XXX_Size() int { return xxx_messageInfo_SplitQueryRequest.Size(m) @@ -3523,16 +3595,17 @@ func (m *QuerySplit) Reset() { *m = QuerySplit{} } func (m *QuerySplit) String() string { return proto.CompactTextString(m) } func (*QuerySplit) ProtoMessage() {} func (*QuerySplit) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{51} + return fileDescriptor_5c6ac9b241082464, []int{51} } + func (m *QuerySplit) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_QuerySplit.Unmarshal(m, b) } func (m *QuerySplit) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_QuerySplit.Marshal(b, m, deterministic) } -func (dst *QuerySplit) XXX_Merge(src proto.Message) { - xxx_messageInfo_QuerySplit.Merge(dst, src) +func (m *QuerySplit) XXX_Merge(src proto.Message) { + xxx_messageInfo_QuerySplit.Merge(m, src) } func (m *QuerySplit) XXX_Size() int { return xxx_messageInfo_QuerySplit.Size(m) @@ -3570,16 +3643,17 @@ func (m *SplitQueryResponse) Reset() { *m = SplitQueryResponse{} } func (m *SplitQueryResponse) String() string { return proto.CompactTextString(m) } func (*SplitQueryResponse) ProtoMessage() {} func (*SplitQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{52} + return fileDescriptor_5c6ac9b241082464, []int{52} } + func (m *SplitQueryResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryResponse.Unmarshal(m, b) } func (m *SplitQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryResponse.Marshal(b, m, deterministic) } -func (dst *SplitQueryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryResponse.Merge(dst, src) +func (m *SplitQueryResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryResponse.Merge(m, src) } func (m *SplitQueryResponse) XXX_Size() int { return xxx_messageInfo_SplitQueryResponse.Size(m) @@ -3608,16 +3682,17 @@ func (m *StreamHealthRequest) Reset() { *m = StreamHealthRequest{} } func (m *StreamHealthRequest) String() string { return proto.CompactTextString(m) } func (*StreamHealthRequest) ProtoMessage() {} func (*StreamHealthRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{53} + return fileDescriptor_5c6ac9b241082464, []int{53} } + func (m *StreamHealthRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamHealthRequest.Unmarshal(m, b) } func (m *StreamHealthRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamHealthRequest.Marshal(b, m, deterministic) } -func (dst *StreamHealthRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamHealthRequest.Merge(dst, src) +func (m *StreamHealthRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamHealthRequest.Merge(m, src) } func (m *StreamHealthRequest) XXX_Size() int { return xxx_messageInfo_StreamHealthRequest.Size(m) @@ -3667,16 +3742,17 @@ func (m *RealtimeStats) Reset() { *m = RealtimeStats{} } func (m *RealtimeStats) String() string { return proto.CompactTextString(m) } func (*RealtimeStats) ProtoMessage() {} func (*RealtimeStats) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{54} + return fileDescriptor_5c6ac9b241082464, []int{54} } + func (m *RealtimeStats) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RealtimeStats.Unmarshal(m, b) } func (m *RealtimeStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RealtimeStats.Marshal(b, m, deterministic) } -func (dst *RealtimeStats) XXX_Merge(src proto.Message) { - xxx_messageInfo_RealtimeStats.Merge(dst, src) +func (m *RealtimeStats) XXX_Merge(src proto.Message) { + xxx_messageInfo_RealtimeStats.Merge(m, src) } func (m *RealtimeStats) XXX_Size() int { return xxx_messageInfo_RealtimeStats.Size(m) @@ -3755,16 +3831,17 @@ func (m *AggregateStats) Reset() { *m = AggregateStats{} } func (m *AggregateStats) String() string { return proto.CompactTextString(m) } func (*AggregateStats) ProtoMessage() {} func (*AggregateStats) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{55} + return fileDescriptor_5c6ac9b241082464, []int{55} } + func (m *AggregateStats) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AggregateStats.Unmarshal(m, b) } func (m *AggregateStats) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AggregateStats.Marshal(b, m, deterministic) } -func (dst *AggregateStats) XXX_Merge(src proto.Message) { - xxx_messageInfo_AggregateStats.Merge(dst, src) +func (m *AggregateStats) XXX_Merge(src proto.Message) { + xxx_messageInfo_AggregateStats.Merge(m, src) } func (m *AggregateStats) XXX_Size() int { return xxx_messageInfo_AggregateStats.Size(m) @@ -3867,16 +3944,17 @@ func (m *StreamHealthResponse) Reset() { *m = StreamHealthResponse{} } func (m *StreamHealthResponse) String() string { return proto.CompactTextString(m) } func (*StreamHealthResponse) ProtoMessage() {} func (*StreamHealthResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{56} + return fileDescriptor_5c6ac9b241082464, []int{56} } + func (m *StreamHealthResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamHealthResponse.Unmarshal(m, b) } func (m *StreamHealthResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamHealthResponse.Marshal(b, m, deterministic) } -func (dst *StreamHealthResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamHealthResponse.Merge(dst, src) +func (m *StreamHealthResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamHealthResponse.Merge(m, src) } func (m *StreamHealthResponse) XXX_Size() int { return xxx_messageInfo_StreamHealthResponse.Size(m) @@ -3951,16 +4029,17 @@ func (m *UpdateStreamRequest) Reset() { *m = UpdateStreamRequest{} } func (m *UpdateStreamRequest) String() string { return proto.CompactTextString(m) } func (*UpdateStreamRequest) ProtoMessage() {} func (*UpdateStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{57} + return fileDescriptor_5c6ac9b241082464, []int{57} } + func (m *UpdateStreamRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateStreamRequest.Unmarshal(m, b) } func (m *UpdateStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateStreamRequest.Marshal(b, m, deterministic) } -func (dst *UpdateStreamRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateStreamRequest.Merge(dst, src) +func (m *UpdateStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateStreamRequest.Merge(m, src) } func (m *UpdateStreamRequest) XXX_Size() int { return xxx_messageInfo_UpdateStreamRequest.Size(m) @@ -4018,16 +4097,17 @@ func (m *UpdateStreamResponse) Reset() { *m = UpdateStreamResponse{} } func (m *UpdateStreamResponse) String() string { return proto.CompactTextString(m) } func (*UpdateStreamResponse) ProtoMessage() {} func (*UpdateStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{58} + return fileDescriptor_5c6ac9b241082464, []int{58} } + func (m *UpdateStreamResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateStreamResponse.Unmarshal(m, b) } func (m *UpdateStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateStreamResponse.Marshal(b, m, deterministic) } -func (dst *UpdateStreamResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateStreamResponse.Merge(dst, src) +func (m *UpdateStreamResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateStreamResponse.Merge(m, src) } func (m *UpdateStreamResponse) XXX_Size() int { return xxx_messageInfo_UpdateStreamResponse.Size(m) @@ -4060,16 +4140,17 @@ func (m *TransactionMetadata) Reset() { *m = TransactionMetadata{} } func (m *TransactionMetadata) String() string { return proto.CompactTextString(m) } func (*TransactionMetadata) ProtoMessage() {} func (*TransactionMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_query_1f9acea6b6c417bb, []int{59} + return fileDescriptor_5c6ac9b241082464, []int{59} } + func (m *TransactionMetadata) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TransactionMetadata.Unmarshal(m, b) } func (m *TransactionMetadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TransactionMetadata.Marshal(b, m, deterministic) } -func (dst *TransactionMetadata) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionMetadata.Merge(dst, src) +func (m *TransactionMetadata) XXX_Merge(src proto.Message) { + xxx_messageInfo_TransactionMetadata.Merge(m, src) } func (m *TransactionMetadata) XXX_Size() int { return xxx_messageInfo_TransactionMetadata.Size(m) @@ -4109,6 +4190,15 @@ func (m *TransactionMetadata) GetParticipants() []*Target { } func init() { + proto.RegisterEnum("query.MySqlFlag", MySqlFlag_name, MySqlFlag_value) + proto.RegisterEnum("query.Flag", Flag_name, Flag_value) + proto.RegisterEnum("query.Type", Type_name, Type_value) + proto.RegisterEnum("query.TransactionState", TransactionState_name, TransactionState_value) + proto.RegisterEnum("query.ExecuteOptions_IncludedFields", ExecuteOptions_IncludedFields_name, ExecuteOptions_IncludedFields_value) + proto.RegisterEnum("query.ExecuteOptions_Workload", ExecuteOptions_Workload_name, ExecuteOptions_Workload_value) + proto.RegisterEnum("query.ExecuteOptions_TransactionIsolation", ExecuteOptions_TransactionIsolation_name, ExecuteOptions_TransactionIsolation_value) + proto.RegisterEnum("query.StreamEvent_Statement_Category", StreamEvent_Statement_Category_name, StreamEvent_Statement_Category_value) + proto.RegisterEnum("query.SplitQueryRequest_Algorithm", SplitQueryRequest_Algorithm_name, SplitQueryRequest_Algorithm_value) proto.RegisterType((*Target)(nil), "query.Target") proto.RegisterType((*VTGateCallerID)(nil), "query.VTGateCallerID") proto.RegisterType((*EventToken)(nil), "query.EventToken") @@ -4171,20 +4261,11 @@ func init() { proto.RegisterType((*UpdateStreamRequest)(nil), "query.UpdateStreamRequest") proto.RegisterType((*UpdateStreamResponse)(nil), "query.UpdateStreamResponse") proto.RegisterType((*TransactionMetadata)(nil), "query.TransactionMetadata") - proto.RegisterEnum("query.MySqlFlag", MySqlFlag_name, MySqlFlag_value) - proto.RegisterEnum("query.Flag", Flag_name, Flag_value) - proto.RegisterEnum("query.Type", Type_name, Type_value) - proto.RegisterEnum("query.TransactionState", TransactionState_name, TransactionState_value) - proto.RegisterEnum("query.ExecuteOptions_IncludedFields", ExecuteOptions_IncludedFields_name, ExecuteOptions_IncludedFields_value) - proto.RegisterEnum("query.ExecuteOptions_Workload", ExecuteOptions_Workload_name, ExecuteOptions_Workload_value) - proto.RegisterEnum("query.ExecuteOptions_TransactionIsolation", ExecuteOptions_TransactionIsolation_name, ExecuteOptions_TransactionIsolation_value) - proto.RegisterEnum("query.StreamEvent_Statement_Category", StreamEvent_Statement_Category_name, StreamEvent_Statement_Category_value) - proto.RegisterEnum("query.SplitQueryRequest_Algorithm", SplitQueryRequest_Algorithm_name, SplitQueryRequest_Algorithm_value) } -func init() { proto.RegisterFile("query.proto", fileDescriptor_query_1f9acea6b6c417bb) } +func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) } -var fileDescriptor_query_1f9acea6b6c417bb = []byte{ +var fileDescriptor_5c6ac9b241082464 = []byte{ // 3270 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcb, 0x73, 0x1b, 0xc9, 0x79, 0xd7, 0xe0, 0x45, 0xe0, 0x03, 0x01, 0x36, 0x1b, 0xa4, 0x84, 0xe5, 0xbe, 0xe8, 0xb1, 0xd7, diff --git a/go/vt/proto/queryservice/queryservice.pb.go b/go/vt/proto/queryservice/queryservice.pb.go index ac8303d162..1447b4458e 100644 --- a/go/vt/proto/queryservice/queryservice.pb.go +++ b/go/vt/proto/queryservice/queryservice.pb.go @@ -1,17 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: queryservice.proto -package queryservice // import "vitess.io/vitess/go/vt/proto/queryservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" -import query "vitess.io/vitess/go/vt/proto/query" +package queryservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" + query "vitess.io/vitess/go/vt/proto/query" ) // Reference imports to suppress errors if they are not otherwise used. @@ -23,7 +24,49 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("queryservice.proto", fileDescriptor_4bd2dde8711f22e3) } + +var fileDescriptor_4bd2dde8711f22e3 = []byte{ + // 563 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0x4f, 0x6f, 0xd3, 0x4c, + 0x10, 0xc6, 0xdf, 0xf7, 0xd0, 0x06, 0x4d, 0x52, 0x28, 0x5b, 0x0a, 0xd4, 0x2d, 0x69, 0xe9, 0x0d, + 0x21, 0x25, 0x08, 0x90, 0x90, 0x2a, 0x71, 0x68, 0x2c, 0x2a, 0x50, 0xc5, 0x3f, 0x87, 0x56, 0x88, + 0x03, 0xd2, 0xc6, 0x5e, 0x05, 0xab, 0x8e, 0xd7, 0xf5, 0x6e, 0x52, 0xf8, 0x7c, 0x7c, 0x31, 0x84, + 0xd7, 0x33, 0xde, 0xdd, 0xd8, 0xdc, 0xb2, 0xcf, 0x33, 0xf3, 0xd3, 0x78, 0x27, 0x33, 0x0b, 0xec, + 0x7a, 0x29, 0xca, 0x5f, 0x4a, 0x94, 0xab, 0x34, 0x16, 0xa3, 0xa2, 0x94, 0x5a, 0xb2, 0x81, 0xad, + 0x05, 0xfd, 0xea, 0x64, 0xac, 0x60, 0x7b, 0x96, 0xe6, 0x99, 0x9c, 0x27, 0x5c, 0x73, 0xa3, 0x3c, + 0xff, 0xbd, 0x05, 0x1b, 0x9f, 0xff, 0x46, 0xb0, 0x13, 0xe8, 0xbd, 0xf9, 0x29, 0xe2, 0xa5, 0x16, + 0x6c, 0x77, 0x64, 0x92, 0xea, 0x73, 0x24, 0xae, 0x97, 0x42, 0xe9, 0xe0, 0xbe, 0x2f, 0xab, 0x42, + 0xe6, 0x4a, 0x1c, 0xff, 0xc7, 0xde, 0xc1, 0xa0, 0x16, 0x27, 0x5c, 0xc7, 0x3f, 0x58, 0xe0, 0x46, + 0x56, 0x22, 0x52, 0xf6, 0x5b, 0x3d, 0x42, 0x7d, 0x80, 0xad, 0xa9, 0x2e, 0x05, 0x5f, 0x60, 0x31, + 0x18, 0xef, 0xa8, 0x08, 0x3b, 0x68, 0x37, 0x91, 0xf6, 0xec, 0x7f, 0xf6, 0x12, 0x36, 0x26, 0x62, + 0x9e, 0xe6, 0x6c, 0xa7, 0x0e, 0xad, 0x4e, 0x98, 0x7f, 0xcf, 0x15, 0xa9, 0x8a, 0x57, 0xb0, 0x19, + 0xca, 0xc5, 0x22, 0xd5, 0x0c, 0x23, 0xcc, 0x11, 0xf3, 0x76, 0x3d, 0x95, 0x12, 0x5f, 0xc3, 0xad, + 0x48, 0x66, 0xd9, 0x8c, 0xc7, 0x57, 0x0c, 0xef, 0x0b, 0x05, 0x4c, 0x7e, 0xb0, 0xa6, 0x53, 0xfa, + 0x09, 0xf4, 0x3e, 0x95, 0xa2, 0xe0, 0x65, 0xd3, 0x84, 0xfa, 0xec, 0x37, 0x81, 0x64, 0xca, 0xfd, + 0x08, 0xb7, 0x4d, 0x39, 0xb5, 0x95, 0xb0, 0x03, 0xa7, 0x4a, 0x94, 0x91, 0xf4, 0xa8, 0xc3, 0x25, + 0xe0, 0x05, 0x6c, 0x63, 0x89, 0x84, 0x1c, 0x7a, 0xb5, 0xfb, 0xd0, 0xc3, 0x4e, 0x9f, 0xb0, 0x5f, + 0xe1, 0x6e, 0x58, 0x0a, 0xae, 0xc5, 0x97, 0x92, 0xe7, 0x8a, 0xc7, 0x3a, 0x95, 0x39, 0xc3, 0xbc, + 0x35, 0x07, 0xc1, 0x47, 0xdd, 0x01, 0x44, 0x3e, 0x83, 0xfe, 0x54, 0xf3, 0x52, 0xd7, 0xad, 0xdb, + 0xa3, 0x3f, 0x07, 0x69, 0x48, 0x0b, 0xda, 0x2c, 0x87, 0x23, 0x34, 0xf5, 0x91, 0x38, 0x8d, 0xb6, + 0xc6, 0xb1, 0x2d, 0xe2, 0x7c, 0x87, 0x9d, 0x50, 0xe6, 0x71, 0xb6, 0x4c, 0x9c, 0x6f, 0x7d, 0x4c, + 0x17, 0xbf, 0xe6, 0x21, 0xf7, 0xf8, 0x5f, 0x21, 0xc4, 0x8f, 0xe0, 0x4e, 0x24, 0x78, 0x62, 0xb3, + 0xb1, 0xa9, 0x9e, 0x8e, 0xdc, 0x61, 0x97, 0x6d, 0x8f, 0x72, 0x35, 0x0c, 0x38, 0x7e, 0x81, 0x3d, + 0x21, 0xde, 0xf4, 0xed, 0xb7, 0x7a, 0x76, 0xa3, 0x6d, 0xc7, 0xac, 0x86, 0xc3, 0x96, 0x1c, 0x67, + 0x3f, 0x1c, 0x75, 0x07, 0xd8, 0x4b, 0xe2, 0xbd, 0x50, 0x8a, 0xcf, 0x85, 0x19, 0x7c, 0x5a, 0x12, + 0x8e, 0xea, 0x2f, 0x09, 0xcf, 0xb4, 0x96, 0x44, 0x08, 0x50, 0x9b, 0xa7, 0xf1, 0x15, 0x7b, 0xe8, + 0xc6, 0x9f, 0x36, 0xed, 0xde, 0x6b, 0x71, 0xa8, 0xa8, 0x10, 0x60, 0x5a, 0x64, 0xa9, 0x36, 0xeb, + 0x14, 0x21, 0x8d, 0xe4, 0x43, 0x6c, 0x87, 0x20, 0xe7, 0x30, 0x30, 0xf5, 0xbd, 0x15, 0x3c, 0xd3, + 0xcd, 0x26, 0xb5, 0x45, 0xff, 0xfa, 0x5d, 0xcf, 0xfa, 0xac, 0x73, 0x18, 0x5c, 0x14, 0x09, 0xd7, + 0x78, 0x4b, 0x08, 0xb3, 0x45, 0x1f, 0xe6, 0x7a, 0x16, 0xec, 0x0c, 0x7a, 0x97, 0xc4, 0xb1, 0xde, + 0x91, 0x4b, 0x9f, 0xd3, 0xe6, 0x59, 0x9c, 0x08, 0xfa, 0x28, 0xcb, 0x1b, 0xc5, 0x86, 0x6d, 0xf1, + 0xf2, 0x46, 0x35, 0x0b, 0xa5, 0xcb, 0x6f, 0x98, 0x93, 0xa7, 0xdf, 0x9e, 0xac, 0x52, 0x2d, 0x94, + 0x1a, 0xa5, 0x72, 0x6c, 0x7e, 0x8d, 0xe7, 0x72, 0xbc, 0xd2, 0xe3, 0xea, 0x95, 0x1b, 0xdb, 0x2f, + 0xe2, 0x6c, 0xb3, 0xd2, 0x5e, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x23, 0x8f, 0x51, 0x3c, + 0x07, 0x00, 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -502,6 +545,80 @@ type QueryServer interface { VStreamRows(*binlogdata.VStreamRowsRequest, Query_VStreamRowsServer) error } +// UnimplementedQueryServer can be embedded to have forward compatible implementations. +type UnimplementedQueryServer struct { +} + +func (*UnimplementedQueryServer) Execute(ctx context.Context, req *query.ExecuteRequest) (*query.ExecuteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Execute not implemented") +} +func (*UnimplementedQueryServer) ExecuteBatch(ctx context.Context, req *query.ExecuteBatchRequest) (*query.ExecuteBatchResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteBatch not implemented") +} +func (*UnimplementedQueryServer) StreamExecute(req *query.StreamExecuteRequest, srv Query_StreamExecuteServer) error { + return status.Errorf(codes.Unimplemented, "method StreamExecute not implemented") +} +func (*UnimplementedQueryServer) Begin(ctx context.Context, req *query.BeginRequest) (*query.BeginResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Begin not implemented") +} +func (*UnimplementedQueryServer) Commit(ctx context.Context, req *query.CommitRequest) (*query.CommitResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Commit not implemented") +} +func (*UnimplementedQueryServer) Rollback(ctx context.Context, req *query.RollbackRequest) (*query.RollbackResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Rollback not implemented") +} +func (*UnimplementedQueryServer) Prepare(ctx context.Context, req *query.PrepareRequest) (*query.PrepareResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Prepare not implemented") +} +func (*UnimplementedQueryServer) CommitPrepared(ctx context.Context, req *query.CommitPreparedRequest) (*query.CommitPreparedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CommitPrepared not implemented") +} +func (*UnimplementedQueryServer) RollbackPrepared(ctx context.Context, req *query.RollbackPreparedRequest) (*query.RollbackPreparedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RollbackPrepared not implemented") +} +func (*UnimplementedQueryServer) CreateTransaction(ctx context.Context, req *query.CreateTransactionRequest) (*query.CreateTransactionResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method CreateTransaction not implemented") +} +func (*UnimplementedQueryServer) StartCommit(ctx context.Context, req *query.StartCommitRequest) (*query.StartCommitResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StartCommit not implemented") +} +func (*UnimplementedQueryServer) SetRollback(ctx context.Context, req *query.SetRollbackRequest) (*query.SetRollbackResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetRollback not implemented") +} +func (*UnimplementedQueryServer) ConcludeTransaction(ctx context.Context, req *query.ConcludeTransactionRequest) (*query.ConcludeTransactionResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ConcludeTransaction not implemented") +} +func (*UnimplementedQueryServer) ReadTransaction(ctx context.Context, req *query.ReadTransactionRequest) (*query.ReadTransactionResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReadTransaction not implemented") +} +func (*UnimplementedQueryServer) BeginExecute(ctx context.Context, req *query.BeginExecuteRequest) (*query.BeginExecuteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BeginExecute not implemented") +} +func (*UnimplementedQueryServer) BeginExecuteBatch(ctx context.Context, req *query.BeginExecuteBatchRequest) (*query.BeginExecuteBatchResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method BeginExecuteBatch not implemented") +} +func (*UnimplementedQueryServer) MessageStream(req *query.MessageStreamRequest, srv Query_MessageStreamServer) error { + return status.Errorf(codes.Unimplemented, "method MessageStream not implemented") +} +func (*UnimplementedQueryServer) MessageAck(ctx context.Context, req *query.MessageAckRequest) (*query.MessageAckResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method MessageAck not implemented") +} +func (*UnimplementedQueryServer) SplitQuery(ctx context.Context, req *query.SplitQueryRequest) (*query.SplitQueryResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SplitQuery not implemented") +} +func (*UnimplementedQueryServer) StreamHealth(req *query.StreamHealthRequest, srv Query_StreamHealthServer) error { + return status.Errorf(codes.Unimplemented, "method StreamHealth not implemented") +} +func (*UnimplementedQueryServer) UpdateStream(req *query.UpdateStreamRequest, srv Query_UpdateStreamServer) error { + return status.Errorf(codes.Unimplemented, "method UpdateStream not implemented") +} +func (*UnimplementedQueryServer) VStream(req *binlogdata.VStreamRequest, srv Query_VStreamServer) error { + return status.Errorf(codes.Unimplemented, "method VStream not implemented") +} +func (*UnimplementedQueryServer) VStreamRows(req *binlogdata.VStreamRowsRequest, srv Query_VStreamRowsServer) error { + return status.Errorf(codes.Unimplemented, "method VStreamRows not implemented") +} + func RegisterQueryServer(s *grpc.Server, srv QueryServer) { s.RegisterService(&_Query_serviceDesc, srv) } @@ -1045,45 +1162,3 @@ var _Query_serviceDesc = grpc.ServiceDesc{ }, Metadata: "queryservice.proto", } - -func init() { proto.RegisterFile("queryservice.proto", fileDescriptor_queryservice_98b01c0566d3f32e) } - -var fileDescriptor_queryservice_98b01c0566d3f32e = []byte{ - // 563 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x95, 0x4f, 0x6f, 0xd3, 0x4c, - 0x10, 0xc6, 0xdf, 0xf7, 0xd0, 0x06, 0x4d, 0x52, 0x28, 0x5b, 0x0a, 0xd4, 0x2d, 0x69, 0xe9, 0x0d, - 0x21, 0x25, 0x08, 0x90, 0x90, 0x2a, 0x71, 0x68, 0x2c, 0x2a, 0x50, 0xc5, 0x3f, 0x87, 0x56, 0x88, - 0x03, 0xd2, 0xc6, 0x5e, 0x05, 0xab, 0x8e, 0xd7, 0xf5, 0x6e, 0x52, 0xf8, 0x7c, 0x7c, 0x31, 0x84, - 0xd7, 0x33, 0xde, 0xdd, 0xd8, 0xdc, 0xb2, 0xcf, 0x33, 0xf3, 0xd3, 0x78, 0x27, 0x33, 0x0b, 0xec, - 0x7a, 0x29, 0xca, 0x5f, 0x4a, 0x94, 0xab, 0x34, 0x16, 0xa3, 0xa2, 0x94, 0x5a, 0xb2, 0x81, 0xad, - 0x05, 0xfd, 0xea, 0x64, 0xac, 0x60, 0x7b, 0x96, 0xe6, 0x99, 0x9c, 0x27, 0x5c, 0x73, 0xa3, 0x3c, - 0xff, 0xbd, 0x05, 0x1b, 0x9f, 0xff, 0x46, 0xb0, 0x13, 0xe8, 0xbd, 0xf9, 0x29, 0xe2, 0xa5, 0x16, - 0x6c, 0x77, 0x64, 0x92, 0xea, 0x73, 0x24, 0xae, 0x97, 0x42, 0xe9, 0xe0, 0xbe, 0x2f, 0xab, 0x42, - 0xe6, 0x4a, 0x1c, 0xff, 0xc7, 0xde, 0xc1, 0xa0, 0x16, 0x27, 0x5c, 0xc7, 0x3f, 0x58, 0xe0, 0x46, - 0x56, 0x22, 0x52, 0xf6, 0x5b, 0x3d, 0x42, 0x7d, 0x80, 0xad, 0xa9, 0x2e, 0x05, 0x5f, 0x60, 0x31, - 0x18, 0xef, 0xa8, 0x08, 0x3b, 0x68, 0x37, 0x91, 0xf6, 0xec, 0x7f, 0xf6, 0x12, 0x36, 0x26, 0x62, - 0x9e, 0xe6, 0x6c, 0xa7, 0x0e, 0xad, 0x4e, 0x98, 0x7f, 0xcf, 0x15, 0xa9, 0x8a, 0x57, 0xb0, 0x19, - 0xca, 0xc5, 0x22, 0xd5, 0x0c, 0x23, 0xcc, 0x11, 0xf3, 0x76, 0x3d, 0x95, 0x12, 0x5f, 0xc3, 0xad, - 0x48, 0x66, 0xd9, 0x8c, 0xc7, 0x57, 0x0c, 0xef, 0x0b, 0x05, 0x4c, 0x7e, 0xb0, 0xa6, 0x53, 0xfa, - 0x09, 0xf4, 0x3e, 0x95, 0xa2, 0xe0, 0x65, 0xd3, 0x84, 0xfa, 0xec, 0x37, 0x81, 0x64, 0xca, 0xfd, - 0x08, 0xb7, 0x4d, 0x39, 0xb5, 0x95, 0xb0, 0x03, 0xa7, 0x4a, 0x94, 0x91, 0xf4, 0xa8, 0xc3, 0x25, - 0xe0, 0x05, 0x6c, 0x63, 0x89, 0x84, 0x1c, 0x7a, 0xb5, 0xfb, 0xd0, 0xc3, 0x4e, 0x9f, 0xb0, 0x5f, - 0xe1, 0x6e, 0x58, 0x0a, 0xae, 0xc5, 0x97, 0x92, 0xe7, 0x8a, 0xc7, 0x3a, 0x95, 0x39, 0xc3, 0xbc, - 0x35, 0x07, 0xc1, 0x47, 0xdd, 0x01, 0x44, 0x3e, 0x83, 0xfe, 0x54, 0xf3, 0x52, 0xd7, 0xad, 0xdb, - 0xa3, 0x3f, 0x07, 0x69, 0x48, 0x0b, 0xda, 0x2c, 0x87, 0x23, 0x34, 0xf5, 0x91, 0x38, 0x8d, 0xb6, - 0xc6, 0xb1, 0x2d, 0xe2, 0x7c, 0x87, 0x9d, 0x50, 0xe6, 0x71, 0xb6, 0x4c, 0x9c, 0x6f, 0x7d, 0x4c, - 0x17, 0xbf, 0xe6, 0x21, 0xf7, 0xf8, 0x5f, 0x21, 0xc4, 0x8f, 0xe0, 0x4e, 0x24, 0x78, 0x62, 0xb3, - 0xb1, 0xa9, 0x9e, 0x8e, 0xdc, 0x61, 0x97, 0x6d, 0x8f, 0x72, 0x35, 0x0c, 0x38, 0x7e, 0x81, 0x3d, - 0x21, 0xde, 0xf4, 0xed, 0xb7, 0x7a, 0x76, 0xa3, 0x6d, 0xc7, 0xac, 0x86, 0xc3, 0x96, 0x1c, 0x67, - 0x3f, 0x1c, 0x75, 0x07, 0xd8, 0x4b, 0xe2, 0xbd, 0x50, 0x8a, 0xcf, 0x85, 0x19, 0x7c, 0x5a, 0x12, - 0x8e, 0xea, 0x2f, 0x09, 0xcf, 0xb4, 0x96, 0x44, 0x08, 0x50, 0x9b, 0xa7, 0xf1, 0x15, 0x7b, 0xe8, - 0xc6, 0x9f, 0x36, 0xed, 0xde, 0x6b, 0x71, 0xa8, 0xa8, 0x10, 0x60, 0x5a, 0x64, 0xa9, 0x36, 0xeb, - 0x14, 0x21, 0x8d, 0xe4, 0x43, 0x6c, 0x87, 0x20, 0xe7, 0x30, 0x30, 0xf5, 0xbd, 0x15, 0x3c, 0xd3, - 0xcd, 0x26, 0xb5, 0x45, 0xff, 0xfa, 0x5d, 0xcf, 0xfa, 0xac, 0x73, 0x18, 0x5c, 0x14, 0x09, 0xd7, - 0x78, 0x4b, 0x08, 0xb3, 0x45, 0x1f, 0xe6, 0x7a, 0x16, 0xec, 0x0c, 0x7a, 0x97, 0xc4, 0xb1, 0xde, - 0x91, 0x4b, 0x9f, 0xd3, 0xe6, 0x59, 0x9c, 0x08, 0xfa, 0x28, 0xcb, 0x1b, 0xc5, 0x86, 0x6d, 0xf1, - 0xf2, 0x46, 0x35, 0x0b, 0xa5, 0xcb, 0x6f, 0x98, 0x93, 0xa7, 0xdf, 0x9e, 0xac, 0x52, 0x2d, 0x94, - 0x1a, 0xa5, 0x72, 0x6c, 0x7e, 0x8d, 0xe7, 0x72, 0xbc, 0xd2, 0xe3, 0xea, 0x95, 0x1b, 0xdb, 0x2f, - 0xe2, 0x6c, 0xb3, 0xd2, 0x5e, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x23, 0x8f, 0x51, 0x3c, - 0x07, 0x00, 0x00, -} diff --git a/go/vt/proto/replicationdata/replicationdata.pb.go b/go/vt/proto/replicationdata/replicationdata.pb.go index 5104477b7c..3fd65b925c 100644 --- a/go/vt/proto/replicationdata/replicationdata.pb.go +++ b/go/vt/proto/replicationdata/replicationdata.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: replicationdata.proto -package replicationdata // import "vitess.io/vitess/go/vt/proto/replicationdata" +package replicationdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Status is the replication status for MySQL (returned by 'show slave status' // and parsed into a Position and fields). @@ -37,16 +39,17 @@ func (m *Status) Reset() { *m = Status{} } func (m *Status) String() string { return proto.CompactTextString(m) } func (*Status) ProtoMessage() {} func (*Status) Descriptor() ([]byte, []int) { - return fileDescriptor_replicationdata_1dfa1a45cfa5e522, []int{0} + return fileDescriptor_ee8ee22b8c4b9d06, []int{0} } + func (m *Status) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Status.Unmarshal(m, b) } func (m *Status) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Status.Marshal(b, m, deterministic) } -func (dst *Status) XXX_Merge(src proto.Message) { - xxx_messageInfo_Status.Merge(dst, src) +func (m *Status) XXX_Merge(src proto.Message) { + xxx_messageInfo_Status.Merge(m, src) } func (m *Status) XXX_Size() int { return xxx_messageInfo_Status.Size(m) @@ -110,11 +113,9 @@ func init() { proto.RegisterType((*Status)(nil), "replicationdata.Status") } -func init() { - proto.RegisterFile("replicationdata.proto", fileDescriptor_replicationdata_1dfa1a45cfa5e522) -} +func init() { proto.RegisterFile("replicationdata.proto", fileDescriptor_ee8ee22b8c4b9d06) } -var fileDescriptor_replicationdata_1dfa1a45cfa5e522 = []byte{ +var fileDescriptor_ee8ee22b8c4b9d06 = []byte{ // 264 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xc1, 0x4a, 0x03, 0x31, 0x10, 0x86, 0xd9, 0x6a, 0xd7, 0x1a, 0xd1, 0x6a, 0xb4, 0x10, 0xbc, 0xb8, 0x78, 0x5a, 0x44, 0x36, diff --git a/go/vt/proto/tableacl/tableacl.pb.go b/go/vt/proto/tableacl/tableacl.pb.go index 917663e342..bce52b0d6d 100644 --- a/go/vt/proto/tableacl/tableacl.pb.go +++ b/go/vt/proto/tableacl/tableacl.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: tableacl.proto -package tableacl // import "vitess.io/vitess/go/vt/proto/tableacl" +package tableacl -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // TableGroupSpec defines ACLs for a group of tables. type TableGroupSpec struct { @@ -35,16 +37,17 @@ func (m *TableGroupSpec) Reset() { *m = TableGroupSpec{} } func (m *TableGroupSpec) String() string { return proto.CompactTextString(m) } func (*TableGroupSpec) ProtoMessage() {} func (*TableGroupSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_tableacl_82b5f1376534b35e, []int{0} + return fileDescriptor_7d0bedb248a1632e, []int{0} } + func (m *TableGroupSpec) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TableGroupSpec.Unmarshal(m, b) } func (m *TableGroupSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TableGroupSpec.Marshal(b, m, deterministic) } -func (dst *TableGroupSpec) XXX_Merge(src proto.Message) { - xxx_messageInfo_TableGroupSpec.Merge(dst, src) +func (m *TableGroupSpec) XXX_Merge(src proto.Message) { + xxx_messageInfo_TableGroupSpec.Merge(m, src) } func (m *TableGroupSpec) XXX_Size() int { return xxx_messageInfo_TableGroupSpec.Size(m) @@ -101,16 +104,17 @@ func (m *Config) Reset() { *m = Config{} } func (m *Config) String() string { return proto.CompactTextString(m) } func (*Config) ProtoMessage() {} func (*Config) Descriptor() ([]byte, []int) { - return fileDescriptor_tableacl_82b5f1376534b35e, []int{1} + return fileDescriptor_7d0bedb248a1632e, []int{1} } + func (m *Config) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Config.Unmarshal(m, b) } func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Config.Marshal(b, m, deterministic) } -func (dst *Config) XXX_Merge(src proto.Message) { - xxx_messageInfo_Config.Merge(dst, src) +func (m *Config) XXX_Merge(src proto.Message) { + xxx_messageInfo_Config.Merge(m, src) } func (m *Config) XXX_Size() int { return xxx_messageInfo_Config.Size(m) @@ -133,9 +137,9 @@ func init() { proto.RegisterType((*Config)(nil), "tableacl.Config") } -func init() { proto.RegisterFile("tableacl.proto", fileDescriptor_tableacl_82b5f1376534b35e) } +func init() { proto.RegisterFile("tableacl.proto", fileDescriptor_7d0bedb248a1632e) } -var fileDescriptor_tableacl_82b5f1376534b35e = []byte{ +var fileDescriptor_7d0bedb248a1632e = []byte{ // 232 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x90, 0xc1, 0x4b, 0xc3, 0x30, 0x14, 0xc6, 0x89, 0x9d, 0xd5, 0xbd, 0xc9, 0x0e, 0x41, 0x34, 0xc7, 0x32, 0x10, 0x7b, 0x6a, 0x40, diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go index c574ee39be..79887e76f6 100644 --- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go +++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go @@ -1,15 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: tabletmanagerdata.proto -package tabletmanagerdata // import "vitess.io/vitess/go/vt/proto/tabletmanagerdata" +package tabletmanagerdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import logutil "vitess.io/vitess/go/vt/proto/logutil" -import query "vitess.io/vitess/go/vt/proto/query" -import replicationdata "vitess.io/vitess/go/vt/proto/replicationdata" -import topodata "vitess.io/vitess/go/vt/proto/topodata" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + logutil "vitess.io/vitess/go/vt/proto/logutil" + query "vitess.io/vitess/go/vt/proto/query" + replicationdata "vitess.io/vitess/go/vt/proto/replicationdata" + topodata "vitess.io/vitess/go/vt/proto/topodata" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type TableDefinition struct { // the table name @@ -46,16 +48,17 @@ func (m *TableDefinition) Reset() { *m = TableDefinition{} } func (m *TableDefinition) String() string { return proto.CompactTextString(m) } func (*TableDefinition) ProtoMessage() {} func (*TableDefinition) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{0} + return fileDescriptor_ff9ac4f89e61ffa4, []int{0} } + func (m *TableDefinition) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TableDefinition.Unmarshal(m, b) } func (m *TableDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TableDefinition.Marshal(b, m, deterministic) } -func (dst *TableDefinition) XXX_Merge(src proto.Message) { - xxx_messageInfo_TableDefinition.Merge(dst, src) +func (m *TableDefinition) XXX_Merge(src proto.Message) { + xxx_messageInfo_TableDefinition.Merge(m, src) } func (m *TableDefinition) XXX_Size() int { return xxx_messageInfo_TableDefinition.Size(m) @@ -128,16 +131,17 @@ func (m *SchemaDefinition) Reset() { *m = SchemaDefinition{} } func (m *SchemaDefinition) String() string { return proto.CompactTextString(m) } func (*SchemaDefinition) ProtoMessage() {} func (*SchemaDefinition) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{1} + return fileDescriptor_ff9ac4f89e61ffa4, []int{1} } + func (m *SchemaDefinition) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SchemaDefinition.Unmarshal(m, b) } func (m *SchemaDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SchemaDefinition.Marshal(b, m, deterministic) } -func (dst *SchemaDefinition) XXX_Merge(src proto.Message) { - xxx_messageInfo_SchemaDefinition.Merge(dst, src) +func (m *SchemaDefinition) XXX_Merge(src proto.Message) { + xxx_messageInfo_SchemaDefinition.Merge(m, src) } func (m *SchemaDefinition) XXX_Size() int { return xxx_messageInfo_SchemaDefinition.Size(m) @@ -183,16 +187,17 @@ func (m *SchemaChangeResult) Reset() { *m = SchemaChangeResult{} } func (m *SchemaChangeResult) String() string { return proto.CompactTextString(m) } func (*SchemaChangeResult) ProtoMessage() {} func (*SchemaChangeResult) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{2} + return fileDescriptor_ff9ac4f89e61ffa4, []int{2} } + func (m *SchemaChangeResult) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SchemaChangeResult.Unmarshal(m, b) } func (m *SchemaChangeResult) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SchemaChangeResult.Marshal(b, m, deterministic) } -func (dst *SchemaChangeResult) XXX_Merge(src proto.Message) { - xxx_messageInfo_SchemaChangeResult.Merge(dst, src) +func (m *SchemaChangeResult) XXX_Merge(src proto.Message) { + xxx_messageInfo_SchemaChangeResult.Merge(m, src) } func (m *SchemaChangeResult) XXX_Size() int { return xxx_messageInfo_SchemaChangeResult.Size(m) @@ -234,16 +239,17 @@ func (m *UserPermission) Reset() { *m = UserPermission{} } func (m *UserPermission) String() string { return proto.CompactTextString(m) } func (*UserPermission) ProtoMessage() {} func (*UserPermission) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{3} + return fileDescriptor_ff9ac4f89e61ffa4, []int{3} } + func (m *UserPermission) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UserPermission.Unmarshal(m, b) } func (m *UserPermission) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UserPermission.Marshal(b, m, deterministic) } -func (dst *UserPermission) XXX_Merge(src proto.Message) { - xxx_messageInfo_UserPermission.Merge(dst, src) +func (m *UserPermission) XXX_Merge(src proto.Message) { + xxx_messageInfo_UserPermission.Merge(m, src) } func (m *UserPermission) XXX_Size() int { return xxx_messageInfo_UserPermission.Size(m) @@ -298,16 +304,17 @@ func (m *DbPermission) Reset() { *m = DbPermission{} } func (m *DbPermission) String() string { return proto.CompactTextString(m) } func (*DbPermission) ProtoMessage() {} func (*DbPermission) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{4} + return fileDescriptor_ff9ac4f89e61ffa4, []int{4} } + func (m *DbPermission) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DbPermission.Unmarshal(m, b) } func (m *DbPermission) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DbPermission.Marshal(b, m, deterministic) } -func (dst *DbPermission) XXX_Merge(src proto.Message) { - xxx_messageInfo_DbPermission.Merge(dst, src) +func (m *DbPermission) XXX_Merge(src proto.Message) { + xxx_messageInfo_DbPermission.Merge(m, src) } func (m *DbPermission) XXX_Size() int { return xxx_messageInfo_DbPermission.Size(m) @@ -360,16 +367,17 @@ func (m *Permissions) Reset() { *m = Permissions{} } func (m *Permissions) String() string { return proto.CompactTextString(m) } func (*Permissions) ProtoMessage() {} func (*Permissions) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{5} + return fileDescriptor_ff9ac4f89e61ffa4, []int{5} } + func (m *Permissions) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Permissions.Unmarshal(m, b) } func (m *Permissions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Permissions.Marshal(b, m, deterministic) } -func (dst *Permissions) XXX_Merge(src proto.Message) { - xxx_messageInfo_Permissions.Merge(dst, src) +func (m *Permissions) XXX_Merge(src proto.Message) { + xxx_messageInfo_Permissions.Merge(m, src) } func (m *Permissions) XXX_Size() int { return xxx_messageInfo_Permissions.Size(m) @@ -405,16 +413,17 @@ func (m *PingRequest) Reset() { *m = PingRequest{} } func (m *PingRequest) String() string { return proto.CompactTextString(m) } func (*PingRequest) ProtoMessage() {} func (*PingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{6} + return fileDescriptor_ff9ac4f89e61ffa4, []int{6} } + func (m *PingRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingRequest.Unmarshal(m, b) } func (m *PingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PingRequest.Marshal(b, m, deterministic) } -func (dst *PingRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PingRequest.Merge(dst, src) +func (m *PingRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PingRequest.Merge(m, src) } func (m *PingRequest) XXX_Size() int { return xxx_messageInfo_PingRequest.Size(m) @@ -443,16 +452,17 @@ func (m *PingResponse) Reset() { *m = PingResponse{} } func (m *PingResponse) String() string { return proto.CompactTextString(m) } func (*PingResponse) ProtoMessage() {} func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{7} + return fileDescriptor_ff9ac4f89e61ffa4, []int{7} } + func (m *PingResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PingResponse.Unmarshal(m, b) } func (m *PingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PingResponse.Marshal(b, m, deterministic) } -func (dst *PingResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PingResponse.Merge(dst, src) +func (m *PingResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PingResponse.Merge(m, src) } func (m *PingResponse) XXX_Size() int { return xxx_messageInfo_PingResponse.Size(m) @@ -482,16 +492,17 @@ func (m *SleepRequest) Reset() { *m = SleepRequest{} } func (m *SleepRequest) String() string { return proto.CompactTextString(m) } func (*SleepRequest) ProtoMessage() {} func (*SleepRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{8} + return fileDescriptor_ff9ac4f89e61ffa4, []int{8} } + func (m *SleepRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SleepRequest.Unmarshal(m, b) } func (m *SleepRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SleepRequest.Marshal(b, m, deterministic) } -func (dst *SleepRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SleepRequest.Merge(dst, src) +func (m *SleepRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SleepRequest.Merge(m, src) } func (m *SleepRequest) XXX_Size() int { return xxx_messageInfo_SleepRequest.Size(m) @@ -519,16 +530,17 @@ func (m *SleepResponse) Reset() { *m = SleepResponse{} } func (m *SleepResponse) String() string { return proto.CompactTextString(m) } func (*SleepResponse) ProtoMessage() {} func (*SleepResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{9} + return fileDescriptor_ff9ac4f89e61ffa4, []int{9} } + func (m *SleepResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SleepResponse.Unmarshal(m, b) } func (m *SleepResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SleepResponse.Marshal(b, m, deterministic) } -func (dst *SleepResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SleepResponse.Merge(dst, src) +func (m *SleepResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SleepResponse.Merge(m, src) } func (m *SleepResponse) XXX_Size() int { return xxx_messageInfo_SleepResponse.Size(m) @@ -552,16 +564,17 @@ func (m *ExecuteHookRequest) Reset() { *m = ExecuteHookRequest{} } func (m *ExecuteHookRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteHookRequest) ProtoMessage() {} func (*ExecuteHookRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{10} + return fileDescriptor_ff9ac4f89e61ffa4, []int{10} } + func (m *ExecuteHookRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteHookRequest.Unmarshal(m, b) } func (m *ExecuteHookRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteHookRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteHookRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteHookRequest.Merge(dst, src) +func (m *ExecuteHookRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteHookRequest.Merge(m, src) } func (m *ExecuteHookRequest) XXX_Size() int { return xxx_messageInfo_ExecuteHookRequest.Size(m) @@ -606,16 +619,17 @@ func (m *ExecuteHookResponse) Reset() { *m = ExecuteHookResponse{} } func (m *ExecuteHookResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteHookResponse) ProtoMessage() {} func (*ExecuteHookResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{11} + return fileDescriptor_ff9ac4f89e61ffa4, []int{11} } + func (m *ExecuteHookResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteHookResponse.Unmarshal(m, b) } func (m *ExecuteHookResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteHookResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteHookResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteHookResponse.Merge(dst, src) +func (m *ExecuteHookResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteHookResponse.Merge(m, src) } func (m *ExecuteHookResponse) XXX_Size() int { return xxx_messageInfo_ExecuteHookResponse.Size(m) @@ -660,16 +674,17 @@ func (m *GetSchemaRequest) Reset() { *m = GetSchemaRequest{} } func (m *GetSchemaRequest) String() string { return proto.CompactTextString(m) } func (*GetSchemaRequest) ProtoMessage() {} func (*GetSchemaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{12} + return fileDescriptor_ff9ac4f89e61ffa4, []int{12} } + func (m *GetSchemaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSchemaRequest.Unmarshal(m, b) } func (m *GetSchemaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetSchemaRequest.Marshal(b, m, deterministic) } -func (dst *GetSchemaRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSchemaRequest.Merge(dst, src) +func (m *GetSchemaRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSchemaRequest.Merge(m, src) } func (m *GetSchemaRequest) XXX_Size() int { return xxx_messageInfo_GetSchemaRequest.Size(m) @@ -712,16 +727,17 @@ func (m *GetSchemaResponse) Reset() { *m = GetSchemaResponse{} } func (m *GetSchemaResponse) String() string { return proto.CompactTextString(m) } func (*GetSchemaResponse) ProtoMessage() {} func (*GetSchemaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{13} + return fileDescriptor_ff9ac4f89e61ffa4, []int{13} } + func (m *GetSchemaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSchemaResponse.Unmarshal(m, b) } func (m *GetSchemaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetSchemaResponse.Marshal(b, m, deterministic) } -func (dst *GetSchemaResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSchemaResponse.Merge(dst, src) +func (m *GetSchemaResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSchemaResponse.Merge(m, src) } func (m *GetSchemaResponse) XXX_Size() int { return xxx_messageInfo_GetSchemaResponse.Size(m) @@ -749,16 +765,17 @@ func (m *GetPermissionsRequest) Reset() { *m = GetPermissionsRequest{} } func (m *GetPermissionsRequest) String() string { return proto.CompactTextString(m) } func (*GetPermissionsRequest) ProtoMessage() {} func (*GetPermissionsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{14} + return fileDescriptor_ff9ac4f89e61ffa4, []int{14} } + func (m *GetPermissionsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetPermissionsRequest.Unmarshal(m, b) } func (m *GetPermissionsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetPermissionsRequest.Marshal(b, m, deterministic) } -func (dst *GetPermissionsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetPermissionsRequest.Merge(dst, src) +func (m *GetPermissionsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetPermissionsRequest.Merge(m, src) } func (m *GetPermissionsRequest) XXX_Size() int { return xxx_messageInfo_GetPermissionsRequest.Size(m) @@ -780,16 +797,17 @@ func (m *GetPermissionsResponse) Reset() { *m = GetPermissionsResponse{} func (m *GetPermissionsResponse) String() string { return proto.CompactTextString(m) } func (*GetPermissionsResponse) ProtoMessage() {} func (*GetPermissionsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{15} + return fileDescriptor_ff9ac4f89e61ffa4, []int{15} } + func (m *GetPermissionsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetPermissionsResponse.Unmarshal(m, b) } func (m *GetPermissionsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetPermissionsResponse.Marshal(b, m, deterministic) } -func (dst *GetPermissionsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetPermissionsResponse.Merge(dst, src) +func (m *GetPermissionsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetPermissionsResponse.Merge(m, src) } func (m *GetPermissionsResponse) XXX_Size() int { return xxx_messageInfo_GetPermissionsResponse.Size(m) @@ -817,16 +835,17 @@ func (m *SetReadOnlyRequest) Reset() { *m = SetReadOnlyRequest{} } func (m *SetReadOnlyRequest) String() string { return proto.CompactTextString(m) } func (*SetReadOnlyRequest) ProtoMessage() {} func (*SetReadOnlyRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{16} + return fileDescriptor_ff9ac4f89e61ffa4, []int{16} } + func (m *SetReadOnlyRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetReadOnlyRequest.Unmarshal(m, b) } func (m *SetReadOnlyRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetReadOnlyRequest.Marshal(b, m, deterministic) } -func (dst *SetReadOnlyRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetReadOnlyRequest.Merge(dst, src) +func (m *SetReadOnlyRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetReadOnlyRequest.Merge(m, src) } func (m *SetReadOnlyRequest) XXX_Size() int { return xxx_messageInfo_SetReadOnlyRequest.Size(m) @@ -847,16 +866,17 @@ func (m *SetReadOnlyResponse) Reset() { *m = SetReadOnlyResponse{} } func (m *SetReadOnlyResponse) String() string { return proto.CompactTextString(m) } func (*SetReadOnlyResponse) ProtoMessage() {} func (*SetReadOnlyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{17} + return fileDescriptor_ff9ac4f89e61ffa4, []int{17} } + func (m *SetReadOnlyResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetReadOnlyResponse.Unmarshal(m, b) } func (m *SetReadOnlyResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetReadOnlyResponse.Marshal(b, m, deterministic) } -func (dst *SetReadOnlyResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetReadOnlyResponse.Merge(dst, src) +func (m *SetReadOnlyResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetReadOnlyResponse.Merge(m, src) } func (m *SetReadOnlyResponse) XXX_Size() int { return xxx_messageInfo_SetReadOnlyResponse.Size(m) @@ -877,16 +897,17 @@ func (m *SetReadWriteRequest) Reset() { *m = SetReadWriteRequest{} } func (m *SetReadWriteRequest) String() string { return proto.CompactTextString(m) } func (*SetReadWriteRequest) ProtoMessage() {} func (*SetReadWriteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{18} + return fileDescriptor_ff9ac4f89e61ffa4, []int{18} } + func (m *SetReadWriteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetReadWriteRequest.Unmarshal(m, b) } func (m *SetReadWriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetReadWriteRequest.Marshal(b, m, deterministic) } -func (dst *SetReadWriteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetReadWriteRequest.Merge(dst, src) +func (m *SetReadWriteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetReadWriteRequest.Merge(m, src) } func (m *SetReadWriteRequest) XXX_Size() int { return xxx_messageInfo_SetReadWriteRequest.Size(m) @@ -907,16 +928,17 @@ func (m *SetReadWriteResponse) Reset() { *m = SetReadWriteResponse{} } func (m *SetReadWriteResponse) String() string { return proto.CompactTextString(m) } func (*SetReadWriteResponse) ProtoMessage() {} func (*SetReadWriteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{19} + return fileDescriptor_ff9ac4f89e61ffa4, []int{19} } + func (m *SetReadWriteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetReadWriteResponse.Unmarshal(m, b) } func (m *SetReadWriteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetReadWriteResponse.Marshal(b, m, deterministic) } -func (dst *SetReadWriteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetReadWriteResponse.Merge(dst, src) +func (m *SetReadWriteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetReadWriteResponse.Merge(m, src) } func (m *SetReadWriteResponse) XXX_Size() int { return xxx_messageInfo_SetReadWriteResponse.Size(m) @@ -938,16 +960,17 @@ func (m *ChangeTypeRequest) Reset() { *m = ChangeTypeRequest{} } func (m *ChangeTypeRequest) String() string { return proto.CompactTextString(m) } func (*ChangeTypeRequest) ProtoMessage() {} func (*ChangeTypeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{20} + return fileDescriptor_ff9ac4f89e61ffa4, []int{20} } + func (m *ChangeTypeRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChangeTypeRequest.Unmarshal(m, b) } func (m *ChangeTypeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ChangeTypeRequest.Marshal(b, m, deterministic) } -func (dst *ChangeTypeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChangeTypeRequest.Merge(dst, src) +func (m *ChangeTypeRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ChangeTypeRequest.Merge(m, src) } func (m *ChangeTypeRequest) XXX_Size() int { return xxx_messageInfo_ChangeTypeRequest.Size(m) @@ -975,16 +998,17 @@ func (m *ChangeTypeResponse) Reset() { *m = ChangeTypeResponse{} } func (m *ChangeTypeResponse) String() string { return proto.CompactTextString(m) } func (*ChangeTypeResponse) ProtoMessage() {} func (*ChangeTypeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{21} + return fileDescriptor_ff9ac4f89e61ffa4, []int{21} } + func (m *ChangeTypeResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ChangeTypeResponse.Unmarshal(m, b) } func (m *ChangeTypeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ChangeTypeResponse.Marshal(b, m, deterministic) } -func (dst *ChangeTypeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ChangeTypeResponse.Merge(dst, src) +func (m *ChangeTypeResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ChangeTypeResponse.Merge(m, src) } func (m *ChangeTypeResponse) XXX_Size() int { return xxx_messageInfo_ChangeTypeResponse.Size(m) @@ -1005,16 +1029,17 @@ func (m *RefreshStateRequest) Reset() { *m = RefreshStateRequest{} } func (m *RefreshStateRequest) String() string { return proto.CompactTextString(m) } func (*RefreshStateRequest) ProtoMessage() {} func (*RefreshStateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{22} + return fileDescriptor_ff9ac4f89e61ffa4, []int{22} } + func (m *RefreshStateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RefreshStateRequest.Unmarshal(m, b) } func (m *RefreshStateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RefreshStateRequest.Marshal(b, m, deterministic) } -func (dst *RefreshStateRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RefreshStateRequest.Merge(dst, src) +func (m *RefreshStateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshStateRequest.Merge(m, src) } func (m *RefreshStateRequest) XXX_Size() int { return xxx_messageInfo_RefreshStateRequest.Size(m) @@ -1035,16 +1060,17 @@ func (m *RefreshStateResponse) Reset() { *m = RefreshStateResponse{} } func (m *RefreshStateResponse) String() string { return proto.CompactTextString(m) } func (*RefreshStateResponse) ProtoMessage() {} func (*RefreshStateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{23} + return fileDescriptor_ff9ac4f89e61ffa4, []int{23} } + func (m *RefreshStateResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RefreshStateResponse.Unmarshal(m, b) } func (m *RefreshStateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RefreshStateResponse.Marshal(b, m, deterministic) } -func (dst *RefreshStateResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RefreshStateResponse.Merge(dst, src) +func (m *RefreshStateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RefreshStateResponse.Merge(m, src) } func (m *RefreshStateResponse) XXX_Size() int { return xxx_messageInfo_RefreshStateResponse.Size(m) @@ -1065,16 +1091,17 @@ func (m *RunHealthCheckRequest) Reset() { *m = RunHealthCheckRequest{} } func (m *RunHealthCheckRequest) String() string { return proto.CompactTextString(m) } func (*RunHealthCheckRequest) ProtoMessage() {} func (*RunHealthCheckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{24} + return fileDescriptor_ff9ac4f89e61ffa4, []int{24} } + func (m *RunHealthCheckRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RunHealthCheckRequest.Unmarshal(m, b) } func (m *RunHealthCheckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RunHealthCheckRequest.Marshal(b, m, deterministic) } -func (dst *RunHealthCheckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunHealthCheckRequest.Merge(dst, src) +func (m *RunHealthCheckRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RunHealthCheckRequest.Merge(m, src) } func (m *RunHealthCheckRequest) XXX_Size() int { return xxx_messageInfo_RunHealthCheckRequest.Size(m) @@ -1095,16 +1122,17 @@ func (m *RunHealthCheckResponse) Reset() { *m = RunHealthCheckResponse{} func (m *RunHealthCheckResponse) String() string { return proto.CompactTextString(m) } func (*RunHealthCheckResponse) ProtoMessage() {} func (*RunHealthCheckResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{25} + return fileDescriptor_ff9ac4f89e61ffa4, []int{25} } + func (m *RunHealthCheckResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RunHealthCheckResponse.Unmarshal(m, b) } func (m *RunHealthCheckResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RunHealthCheckResponse.Marshal(b, m, deterministic) } -func (dst *RunHealthCheckResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RunHealthCheckResponse.Merge(dst, src) +func (m *RunHealthCheckResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RunHealthCheckResponse.Merge(m, src) } func (m *RunHealthCheckResponse) XXX_Size() int { return xxx_messageInfo_RunHealthCheckResponse.Size(m) @@ -1126,16 +1154,17 @@ func (m *IgnoreHealthErrorRequest) Reset() { *m = IgnoreHealthErrorReque func (m *IgnoreHealthErrorRequest) String() string { return proto.CompactTextString(m) } func (*IgnoreHealthErrorRequest) ProtoMessage() {} func (*IgnoreHealthErrorRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{26} + return fileDescriptor_ff9ac4f89e61ffa4, []int{26} } + func (m *IgnoreHealthErrorRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IgnoreHealthErrorRequest.Unmarshal(m, b) } func (m *IgnoreHealthErrorRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_IgnoreHealthErrorRequest.Marshal(b, m, deterministic) } -func (dst *IgnoreHealthErrorRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_IgnoreHealthErrorRequest.Merge(dst, src) +func (m *IgnoreHealthErrorRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_IgnoreHealthErrorRequest.Merge(m, src) } func (m *IgnoreHealthErrorRequest) XXX_Size() int { return xxx_messageInfo_IgnoreHealthErrorRequest.Size(m) @@ -1163,16 +1192,17 @@ func (m *IgnoreHealthErrorResponse) Reset() { *m = IgnoreHealthErrorResp func (m *IgnoreHealthErrorResponse) String() string { return proto.CompactTextString(m) } func (*IgnoreHealthErrorResponse) ProtoMessage() {} func (*IgnoreHealthErrorResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{27} + return fileDescriptor_ff9ac4f89e61ffa4, []int{27} } + func (m *IgnoreHealthErrorResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IgnoreHealthErrorResponse.Unmarshal(m, b) } func (m *IgnoreHealthErrorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_IgnoreHealthErrorResponse.Marshal(b, m, deterministic) } -func (dst *IgnoreHealthErrorResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_IgnoreHealthErrorResponse.Merge(dst, src) +func (m *IgnoreHealthErrorResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_IgnoreHealthErrorResponse.Merge(m, src) } func (m *IgnoreHealthErrorResponse) XXX_Size() int { return xxx_messageInfo_IgnoreHealthErrorResponse.Size(m) @@ -1197,16 +1227,17 @@ func (m *ReloadSchemaRequest) Reset() { *m = ReloadSchemaRequest{} } func (m *ReloadSchemaRequest) String() string { return proto.CompactTextString(m) } func (*ReloadSchemaRequest) ProtoMessage() {} func (*ReloadSchemaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{28} + return fileDescriptor_ff9ac4f89e61ffa4, []int{28} } + func (m *ReloadSchemaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReloadSchemaRequest.Unmarshal(m, b) } func (m *ReloadSchemaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ReloadSchemaRequest.Marshal(b, m, deterministic) } -func (dst *ReloadSchemaRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReloadSchemaRequest.Merge(dst, src) +func (m *ReloadSchemaRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReloadSchemaRequest.Merge(m, src) } func (m *ReloadSchemaRequest) XXX_Size() int { return xxx_messageInfo_ReloadSchemaRequest.Size(m) @@ -1234,16 +1265,17 @@ func (m *ReloadSchemaResponse) Reset() { *m = ReloadSchemaResponse{} } func (m *ReloadSchemaResponse) String() string { return proto.CompactTextString(m) } func (*ReloadSchemaResponse) ProtoMessage() {} func (*ReloadSchemaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{29} + return fileDescriptor_ff9ac4f89e61ffa4, []int{29} } + func (m *ReloadSchemaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ReloadSchemaResponse.Unmarshal(m, b) } func (m *ReloadSchemaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ReloadSchemaResponse.Marshal(b, m, deterministic) } -func (dst *ReloadSchemaResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ReloadSchemaResponse.Merge(dst, src) +func (m *ReloadSchemaResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ReloadSchemaResponse.Merge(m, src) } func (m *ReloadSchemaResponse) XXX_Size() int { return xxx_messageInfo_ReloadSchemaResponse.Size(m) @@ -1265,16 +1297,17 @@ func (m *PreflightSchemaRequest) Reset() { *m = PreflightSchemaRequest{} func (m *PreflightSchemaRequest) String() string { return proto.CompactTextString(m) } func (*PreflightSchemaRequest) ProtoMessage() {} func (*PreflightSchemaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{30} + return fileDescriptor_ff9ac4f89e61ffa4, []int{30} } + func (m *PreflightSchemaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PreflightSchemaRequest.Unmarshal(m, b) } func (m *PreflightSchemaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PreflightSchemaRequest.Marshal(b, m, deterministic) } -func (dst *PreflightSchemaRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PreflightSchemaRequest.Merge(dst, src) +func (m *PreflightSchemaRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PreflightSchemaRequest.Merge(m, src) } func (m *PreflightSchemaRequest) XXX_Size() int { return xxx_messageInfo_PreflightSchemaRequest.Size(m) @@ -1305,16 +1338,17 @@ func (m *PreflightSchemaResponse) Reset() { *m = PreflightSchemaResponse func (m *PreflightSchemaResponse) String() string { return proto.CompactTextString(m) } func (*PreflightSchemaResponse) ProtoMessage() {} func (*PreflightSchemaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{31} + return fileDescriptor_ff9ac4f89e61ffa4, []int{31} } + func (m *PreflightSchemaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PreflightSchemaResponse.Unmarshal(m, b) } func (m *PreflightSchemaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PreflightSchemaResponse.Marshal(b, m, deterministic) } -func (dst *PreflightSchemaResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PreflightSchemaResponse.Merge(dst, src) +func (m *PreflightSchemaResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PreflightSchemaResponse.Merge(m, src) } func (m *PreflightSchemaResponse) XXX_Size() int { return xxx_messageInfo_PreflightSchemaResponse.Size(m) @@ -1347,16 +1381,17 @@ func (m *ApplySchemaRequest) Reset() { *m = ApplySchemaRequest{} } func (m *ApplySchemaRequest) String() string { return proto.CompactTextString(m) } func (*ApplySchemaRequest) ProtoMessage() {} func (*ApplySchemaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{32} + return fileDescriptor_ff9ac4f89e61ffa4, []int{32} } + func (m *ApplySchemaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplySchemaRequest.Unmarshal(m, b) } func (m *ApplySchemaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ApplySchemaRequest.Marshal(b, m, deterministic) } -func (dst *ApplySchemaRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ApplySchemaRequest.Merge(dst, src) +func (m *ApplySchemaRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ApplySchemaRequest.Merge(m, src) } func (m *ApplySchemaRequest) XXX_Size() int { return xxx_messageInfo_ApplySchemaRequest.Size(m) @@ -1414,16 +1449,17 @@ func (m *ApplySchemaResponse) Reset() { *m = ApplySchemaResponse{} } func (m *ApplySchemaResponse) String() string { return proto.CompactTextString(m) } func (*ApplySchemaResponse) ProtoMessage() {} func (*ApplySchemaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{33} + return fileDescriptor_ff9ac4f89e61ffa4, []int{33} } + func (m *ApplySchemaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ApplySchemaResponse.Unmarshal(m, b) } func (m *ApplySchemaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ApplySchemaResponse.Marshal(b, m, deterministic) } -func (dst *ApplySchemaResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ApplySchemaResponse.Merge(dst, src) +func (m *ApplySchemaResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ApplySchemaResponse.Merge(m, src) } func (m *ApplySchemaResponse) XXX_Size() int { return xxx_messageInfo_ApplySchemaResponse.Size(m) @@ -1458,16 +1494,17 @@ func (m *LockTablesRequest) Reset() { *m = LockTablesRequest{} } func (m *LockTablesRequest) String() string { return proto.CompactTextString(m) } func (*LockTablesRequest) ProtoMessage() {} func (*LockTablesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{34} + return fileDescriptor_ff9ac4f89e61ffa4, []int{34} } + func (m *LockTablesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LockTablesRequest.Unmarshal(m, b) } func (m *LockTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_LockTablesRequest.Marshal(b, m, deterministic) } -func (dst *LockTablesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_LockTablesRequest.Merge(dst, src) +func (m *LockTablesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_LockTablesRequest.Merge(m, src) } func (m *LockTablesRequest) XXX_Size() int { return xxx_messageInfo_LockTablesRequest.Size(m) @@ -1488,16 +1525,17 @@ func (m *LockTablesResponse) Reset() { *m = LockTablesResponse{} } func (m *LockTablesResponse) String() string { return proto.CompactTextString(m) } func (*LockTablesResponse) ProtoMessage() {} func (*LockTablesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{35} + return fileDescriptor_ff9ac4f89e61ffa4, []int{35} } + func (m *LockTablesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_LockTablesResponse.Unmarshal(m, b) } func (m *LockTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_LockTablesResponse.Marshal(b, m, deterministic) } -func (dst *LockTablesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_LockTablesResponse.Merge(dst, src) +func (m *LockTablesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_LockTablesResponse.Merge(m, src) } func (m *LockTablesResponse) XXX_Size() int { return xxx_messageInfo_LockTablesResponse.Size(m) @@ -1518,16 +1556,17 @@ func (m *UnlockTablesRequest) Reset() { *m = UnlockTablesRequest{} } func (m *UnlockTablesRequest) String() string { return proto.CompactTextString(m) } func (*UnlockTablesRequest) ProtoMessage() {} func (*UnlockTablesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{36} + return fileDescriptor_ff9ac4f89e61ffa4, []int{36} } + func (m *UnlockTablesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UnlockTablesRequest.Unmarshal(m, b) } func (m *UnlockTablesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UnlockTablesRequest.Marshal(b, m, deterministic) } -func (dst *UnlockTablesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UnlockTablesRequest.Merge(dst, src) +func (m *UnlockTablesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UnlockTablesRequest.Merge(m, src) } func (m *UnlockTablesRequest) XXX_Size() int { return xxx_messageInfo_UnlockTablesRequest.Size(m) @@ -1548,16 +1587,17 @@ func (m *UnlockTablesResponse) Reset() { *m = UnlockTablesResponse{} } func (m *UnlockTablesResponse) String() string { return proto.CompactTextString(m) } func (*UnlockTablesResponse) ProtoMessage() {} func (*UnlockTablesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{37} + return fileDescriptor_ff9ac4f89e61ffa4, []int{37} } + func (m *UnlockTablesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UnlockTablesResponse.Unmarshal(m, b) } func (m *UnlockTablesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UnlockTablesResponse.Marshal(b, m, deterministic) } -func (dst *UnlockTablesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_UnlockTablesResponse.Merge(dst, src) +func (m *UnlockTablesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UnlockTablesResponse.Merge(m, src) } func (m *UnlockTablesResponse) XXX_Size() int { return xxx_messageInfo_UnlockTablesResponse.Size(m) @@ -1583,16 +1623,17 @@ func (m *ExecuteFetchAsDbaRequest) Reset() { *m = ExecuteFetchAsDbaReque func (m *ExecuteFetchAsDbaRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteFetchAsDbaRequest) ProtoMessage() {} func (*ExecuteFetchAsDbaRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{38} + return fileDescriptor_ff9ac4f89e61ffa4, []int{38} } + func (m *ExecuteFetchAsDbaRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteFetchAsDbaRequest.Unmarshal(m, b) } func (m *ExecuteFetchAsDbaRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteFetchAsDbaRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteFetchAsDbaRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteFetchAsDbaRequest.Merge(dst, src) +func (m *ExecuteFetchAsDbaRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteFetchAsDbaRequest.Merge(m, src) } func (m *ExecuteFetchAsDbaRequest) XXX_Size() int { return xxx_messageInfo_ExecuteFetchAsDbaRequest.Size(m) @@ -1649,16 +1690,17 @@ func (m *ExecuteFetchAsDbaResponse) Reset() { *m = ExecuteFetchAsDbaResp func (m *ExecuteFetchAsDbaResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteFetchAsDbaResponse) ProtoMessage() {} func (*ExecuteFetchAsDbaResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{39} + return fileDescriptor_ff9ac4f89e61ffa4, []int{39} } + func (m *ExecuteFetchAsDbaResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteFetchAsDbaResponse.Unmarshal(m, b) } func (m *ExecuteFetchAsDbaResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteFetchAsDbaResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteFetchAsDbaResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteFetchAsDbaResponse.Merge(dst, src) +func (m *ExecuteFetchAsDbaResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteFetchAsDbaResponse.Merge(m, src) } func (m *ExecuteFetchAsDbaResponse) XXX_Size() int { return xxx_messageInfo_ExecuteFetchAsDbaResponse.Size(m) @@ -1690,16 +1732,17 @@ func (m *ExecuteFetchAsAllPrivsRequest) Reset() { *m = ExecuteFetchAsAll func (m *ExecuteFetchAsAllPrivsRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteFetchAsAllPrivsRequest) ProtoMessage() {} func (*ExecuteFetchAsAllPrivsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{40} + return fileDescriptor_ff9ac4f89e61ffa4, []int{40} } + func (m *ExecuteFetchAsAllPrivsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteFetchAsAllPrivsRequest.Unmarshal(m, b) } func (m *ExecuteFetchAsAllPrivsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteFetchAsAllPrivsRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteFetchAsAllPrivsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteFetchAsAllPrivsRequest.Merge(dst, src) +func (m *ExecuteFetchAsAllPrivsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteFetchAsAllPrivsRequest.Merge(m, src) } func (m *ExecuteFetchAsAllPrivsRequest) XXX_Size() int { return xxx_messageInfo_ExecuteFetchAsAllPrivsRequest.Size(m) @@ -1749,16 +1792,17 @@ func (m *ExecuteFetchAsAllPrivsResponse) Reset() { *m = ExecuteFetchAsAl func (m *ExecuteFetchAsAllPrivsResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteFetchAsAllPrivsResponse) ProtoMessage() {} func (*ExecuteFetchAsAllPrivsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{41} + return fileDescriptor_ff9ac4f89e61ffa4, []int{41} } + func (m *ExecuteFetchAsAllPrivsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteFetchAsAllPrivsResponse.Unmarshal(m, b) } func (m *ExecuteFetchAsAllPrivsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteFetchAsAllPrivsResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteFetchAsAllPrivsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteFetchAsAllPrivsResponse.Merge(dst, src) +func (m *ExecuteFetchAsAllPrivsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteFetchAsAllPrivsResponse.Merge(m, src) } func (m *ExecuteFetchAsAllPrivsResponse) XXX_Size() int { return xxx_messageInfo_ExecuteFetchAsAllPrivsResponse.Size(m) @@ -1788,16 +1832,17 @@ func (m *ExecuteFetchAsAppRequest) Reset() { *m = ExecuteFetchAsAppReque func (m *ExecuteFetchAsAppRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteFetchAsAppRequest) ProtoMessage() {} func (*ExecuteFetchAsAppRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{42} + return fileDescriptor_ff9ac4f89e61ffa4, []int{42} } + func (m *ExecuteFetchAsAppRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteFetchAsAppRequest.Unmarshal(m, b) } func (m *ExecuteFetchAsAppRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteFetchAsAppRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteFetchAsAppRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteFetchAsAppRequest.Merge(dst, src) +func (m *ExecuteFetchAsAppRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteFetchAsAppRequest.Merge(m, src) } func (m *ExecuteFetchAsAppRequest) XXX_Size() int { return xxx_messageInfo_ExecuteFetchAsAppRequest.Size(m) @@ -1833,16 +1878,17 @@ func (m *ExecuteFetchAsAppResponse) Reset() { *m = ExecuteFetchAsAppResp func (m *ExecuteFetchAsAppResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteFetchAsAppResponse) ProtoMessage() {} func (*ExecuteFetchAsAppResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{43} + return fileDescriptor_ff9ac4f89e61ffa4, []int{43} } + func (m *ExecuteFetchAsAppResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteFetchAsAppResponse.Unmarshal(m, b) } func (m *ExecuteFetchAsAppResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteFetchAsAppResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteFetchAsAppResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteFetchAsAppResponse.Merge(dst, src) +func (m *ExecuteFetchAsAppResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteFetchAsAppResponse.Merge(m, src) } func (m *ExecuteFetchAsAppResponse) XXX_Size() int { return xxx_messageInfo_ExecuteFetchAsAppResponse.Size(m) @@ -1870,16 +1916,17 @@ func (m *SlaveStatusRequest) Reset() { *m = SlaveStatusRequest{} } func (m *SlaveStatusRequest) String() string { return proto.CompactTextString(m) } func (*SlaveStatusRequest) ProtoMessage() {} func (*SlaveStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{44} + return fileDescriptor_ff9ac4f89e61ffa4, []int{44} } + func (m *SlaveStatusRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SlaveStatusRequest.Unmarshal(m, b) } func (m *SlaveStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SlaveStatusRequest.Marshal(b, m, deterministic) } -func (dst *SlaveStatusRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveStatusRequest.Merge(dst, src) +func (m *SlaveStatusRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SlaveStatusRequest.Merge(m, src) } func (m *SlaveStatusRequest) XXX_Size() int { return xxx_messageInfo_SlaveStatusRequest.Size(m) @@ -1901,16 +1948,17 @@ func (m *SlaveStatusResponse) Reset() { *m = SlaveStatusResponse{} } func (m *SlaveStatusResponse) String() string { return proto.CompactTextString(m) } func (*SlaveStatusResponse) ProtoMessage() {} func (*SlaveStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{45} + return fileDescriptor_ff9ac4f89e61ffa4, []int{45} } + func (m *SlaveStatusResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SlaveStatusResponse.Unmarshal(m, b) } func (m *SlaveStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SlaveStatusResponse.Marshal(b, m, deterministic) } -func (dst *SlaveStatusResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveStatusResponse.Merge(dst, src) +func (m *SlaveStatusResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SlaveStatusResponse.Merge(m, src) } func (m *SlaveStatusResponse) XXX_Size() int { return xxx_messageInfo_SlaveStatusResponse.Size(m) @@ -1938,16 +1986,17 @@ func (m *MasterPositionRequest) Reset() { *m = MasterPositionRequest{} } func (m *MasterPositionRequest) String() string { return proto.CompactTextString(m) } func (*MasterPositionRequest) ProtoMessage() {} func (*MasterPositionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{46} + return fileDescriptor_ff9ac4f89e61ffa4, []int{46} } + func (m *MasterPositionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MasterPositionRequest.Unmarshal(m, b) } func (m *MasterPositionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MasterPositionRequest.Marshal(b, m, deterministic) } -func (dst *MasterPositionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MasterPositionRequest.Merge(dst, src) +func (m *MasterPositionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MasterPositionRequest.Merge(m, src) } func (m *MasterPositionRequest) XXX_Size() int { return xxx_messageInfo_MasterPositionRequest.Size(m) @@ -1969,16 +2018,17 @@ func (m *MasterPositionResponse) Reset() { *m = MasterPositionResponse{} func (m *MasterPositionResponse) String() string { return proto.CompactTextString(m) } func (*MasterPositionResponse) ProtoMessage() {} func (*MasterPositionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{47} + return fileDescriptor_ff9ac4f89e61ffa4, []int{47} } + func (m *MasterPositionResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MasterPositionResponse.Unmarshal(m, b) } func (m *MasterPositionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MasterPositionResponse.Marshal(b, m, deterministic) } -func (dst *MasterPositionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MasterPositionResponse.Merge(dst, src) +func (m *MasterPositionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MasterPositionResponse.Merge(m, src) } func (m *MasterPositionResponse) XXX_Size() int { return xxx_messageInfo_MasterPositionResponse.Size(m) @@ -2006,16 +2056,17 @@ func (m *StopSlaveRequest) Reset() { *m = StopSlaveRequest{} } func (m *StopSlaveRequest) String() string { return proto.CompactTextString(m) } func (*StopSlaveRequest) ProtoMessage() {} func (*StopSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{48} + return fileDescriptor_ff9ac4f89e61ffa4, []int{48} } + func (m *StopSlaveRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopSlaveRequest.Unmarshal(m, b) } func (m *StopSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StopSlaveRequest.Marshal(b, m, deterministic) } -func (dst *StopSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveRequest.Merge(dst, src) +func (m *StopSlaveRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StopSlaveRequest.Merge(m, src) } func (m *StopSlaveRequest) XXX_Size() int { return xxx_messageInfo_StopSlaveRequest.Size(m) @@ -2036,16 +2087,17 @@ func (m *StopSlaveResponse) Reset() { *m = StopSlaveResponse{} } func (m *StopSlaveResponse) String() string { return proto.CompactTextString(m) } func (*StopSlaveResponse) ProtoMessage() {} func (*StopSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{49} + return fileDescriptor_ff9ac4f89e61ffa4, []int{49} } + func (m *StopSlaveResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopSlaveResponse.Unmarshal(m, b) } func (m *StopSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StopSlaveResponse.Marshal(b, m, deterministic) } -func (dst *StopSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveResponse.Merge(dst, src) +func (m *StopSlaveResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StopSlaveResponse.Merge(m, src) } func (m *StopSlaveResponse) XXX_Size() int { return xxx_messageInfo_StopSlaveResponse.Size(m) @@ -2068,16 +2120,17 @@ func (m *StopSlaveMinimumRequest) Reset() { *m = StopSlaveMinimumRequest func (m *StopSlaveMinimumRequest) String() string { return proto.CompactTextString(m) } func (*StopSlaveMinimumRequest) ProtoMessage() {} func (*StopSlaveMinimumRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{50} + return fileDescriptor_ff9ac4f89e61ffa4, []int{50} } + func (m *StopSlaveMinimumRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopSlaveMinimumRequest.Unmarshal(m, b) } func (m *StopSlaveMinimumRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StopSlaveMinimumRequest.Marshal(b, m, deterministic) } -func (dst *StopSlaveMinimumRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveMinimumRequest.Merge(dst, src) +func (m *StopSlaveMinimumRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StopSlaveMinimumRequest.Merge(m, src) } func (m *StopSlaveMinimumRequest) XXX_Size() int { return xxx_messageInfo_StopSlaveMinimumRequest.Size(m) @@ -2113,16 +2166,17 @@ func (m *StopSlaveMinimumResponse) Reset() { *m = StopSlaveMinimumRespon func (m *StopSlaveMinimumResponse) String() string { return proto.CompactTextString(m) } func (*StopSlaveMinimumResponse) ProtoMessage() {} func (*StopSlaveMinimumResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{51} + return fileDescriptor_ff9ac4f89e61ffa4, []int{51} } + func (m *StopSlaveMinimumResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopSlaveMinimumResponse.Unmarshal(m, b) } func (m *StopSlaveMinimumResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StopSlaveMinimumResponse.Marshal(b, m, deterministic) } -func (dst *StopSlaveMinimumResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopSlaveMinimumResponse.Merge(dst, src) +func (m *StopSlaveMinimumResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StopSlaveMinimumResponse.Merge(m, src) } func (m *StopSlaveMinimumResponse) XXX_Size() int { return xxx_messageInfo_StopSlaveMinimumResponse.Size(m) @@ -2150,16 +2204,17 @@ func (m *StartSlaveRequest) Reset() { *m = StartSlaveRequest{} } func (m *StartSlaveRequest) String() string { return proto.CompactTextString(m) } func (*StartSlaveRequest) ProtoMessage() {} func (*StartSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{52} + return fileDescriptor_ff9ac4f89e61ffa4, []int{52} } + func (m *StartSlaveRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartSlaveRequest.Unmarshal(m, b) } func (m *StartSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartSlaveRequest.Marshal(b, m, deterministic) } -func (dst *StartSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveRequest.Merge(dst, src) +func (m *StartSlaveRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartSlaveRequest.Merge(m, src) } func (m *StartSlaveRequest) XXX_Size() int { return xxx_messageInfo_StartSlaveRequest.Size(m) @@ -2180,16 +2235,17 @@ func (m *StartSlaveResponse) Reset() { *m = StartSlaveResponse{} } func (m *StartSlaveResponse) String() string { return proto.CompactTextString(m) } func (*StartSlaveResponse) ProtoMessage() {} func (*StartSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{53} + return fileDescriptor_ff9ac4f89e61ffa4, []int{53} } + func (m *StartSlaveResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartSlaveResponse.Unmarshal(m, b) } func (m *StartSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartSlaveResponse.Marshal(b, m, deterministic) } -func (dst *StartSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveResponse.Merge(dst, src) +func (m *StartSlaveResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartSlaveResponse.Merge(m, src) } func (m *StartSlaveResponse) XXX_Size() int { return xxx_messageInfo_StartSlaveResponse.Size(m) @@ -2212,16 +2268,17 @@ func (m *StartSlaveUntilAfterRequest) Reset() { *m = StartSlaveUntilAfte func (m *StartSlaveUntilAfterRequest) String() string { return proto.CompactTextString(m) } func (*StartSlaveUntilAfterRequest) ProtoMessage() {} func (*StartSlaveUntilAfterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{54} + return fileDescriptor_ff9ac4f89e61ffa4, []int{54} } + func (m *StartSlaveUntilAfterRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartSlaveUntilAfterRequest.Unmarshal(m, b) } func (m *StartSlaveUntilAfterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartSlaveUntilAfterRequest.Marshal(b, m, deterministic) } -func (dst *StartSlaveUntilAfterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveUntilAfterRequest.Merge(dst, src) +func (m *StartSlaveUntilAfterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartSlaveUntilAfterRequest.Merge(m, src) } func (m *StartSlaveUntilAfterRequest) XXX_Size() int { return xxx_messageInfo_StartSlaveUntilAfterRequest.Size(m) @@ -2256,16 +2313,17 @@ func (m *StartSlaveUntilAfterResponse) Reset() { *m = StartSlaveUntilAft func (m *StartSlaveUntilAfterResponse) String() string { return proto.CompactTextString(m) } func (*StartSlaveUntilAfterResponse) ProtoMessage() {} func (*StartSlaveUntilAfterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{55} + return fileDescriptor_ff9ac4f89e61ffa4, []int{55} } + func (m *StartSlaveUntilAfterResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StartSlaveUntilAfterResponse.Unmarshal(m, b) } func (m *StartSlaveUntilAfterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StartSlaveUntilAfterResponse.Marshal(b, m, deterministic) } -func (dst *StartSlaveUntilAfterResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StartSlaveUntilAfterResponse.Merge(dst, src) +func (m *StartSlaveUntilAfterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StartSlaveUntilAfterResponse.Merge(m, src) } func (m *StartSlaveUntilAfterResponse) XXX_Size() int { return xxx_messageInfo_StartSlaveUntilAfterResponse.Size(m) @@ -2290,16 +2348,17 @@ func (m *TabletExternallyReparentedRequest) Reset() { *m = TabletExterna func (m *TabletExternallyReparentedRequest) String() string { return proto.CompactTextString(m) } func (*TabletExternallyReparentedRequest) ProtoMessage() {} func (*TabletExternallyReparentedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{56} + return fileDescriptor_ff9ac4f89e61ffa4, []int{56} } + func (m *TabletExternallyReparentedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TabletExternallyReparentedRequest.Unmarshal(m, b) } func (m *TabletExternallyReparentedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TabletExternallyReparentedRequest.Marshal(b, m, deterministic) } -func (dst *TabletExternallyReparentedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TabletExternallyReparentedRequest.Merge(dst, src) +func (m *TabletExternallyReparentedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_TabletExternallyReparentedRequest.Merge(m, src) } func (m *TabletExternallyReparentedRequest) XXX_Size() int { return xxx_messageInfo_TabletExternallyReparentedRequest.Size(m) @@ -2327,16 +2386,17 @@ func (m *TabletExternallyReparentedResponse) Reset() { *m = TabletExtern func (m *TabletExternallyReparentedResponse) String() string { return proto.CompactTextString(m) } func (*TabletExternallyReparentedResponse) ProtoMessage() {} func (*TabletExternallyReparentedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{57} + return fileDescriptor_ff9ac4f89e61ffa4, []int{57} } + func (m *TabletExternallyReparentedResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TabletExternallyReparentedResponse.Unmarshal(m, b) } func (m *TabletExternallyReparentedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TabletExternallyReparentedResponse.Marshal(b, m, deterministic) } -func (dst *TabletExternallyReparentedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TabletExternallyReparentedResponse.Merge(dst, src) +func (m *TabletExternallyReparentedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_TabletExternallyReparentedResponse.Merge(m, src) } func (m *TabletExternallyReparentedResponse) XXX_Size() int { return xxx_messageInfo_TabletExternallyReparentedResponse.Size(m) @@ -2357,16 +2417,17 @@ func (m *TabletExternallyElectedRequest) Reset() { *m = TabletExternally func (m *TabletExternallyElectedRequest) String() string { return proto.CompactTextString(m) } func (*TabletExternallyElectedRequest) ProtoMessage() {} func (*TabletExternallyElectedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{58} + return fileDescriptor_ff9ac4f89e61ffa4, []int{58} } + func (m *TabletExternallyElectedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TabletExternallyElectedRequest.Unmarshal(m, b) } func (m *TabletExternallyElectedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TabletExternallyElectedRequest.Marshal(b, m, deterministic) } -func (dst *TabletExternallyElectedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_TabletExternallyElectedRequest.Merge(dst, src) +func (m *TabletExternallyElectedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_TabletExternallyElectedRequest.Merge(m, src) } func (m *TabletExternallyElectedRequest) XXX_Size() int { return xxx_messageInfo_TabletExternallyElectedRequest.Size(m) @@ -2387,16 +2448,17 @@ func (m *TabletExternallyElectedResponse) Reset() { *m = TabletExternall func (m *TabletExternallyElectedResponse) String() string { return proto.CompactTextString(m) } func (*TabletExternallyElectedResponse) ProtoMessage() {} func (*TabletExternallyElectedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{59} + return fileDescriptor_ff9ac4f89e61ffa4, []int{59} } + func (m *TabletExternallyElectedResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TabletExternallyElectedResponse.Unmarshal(m, b) } func (m *TabletExternallyElectedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TabletExternallyElectedResponse.Marshal(b, m, deterministic) } -func (dst *TabletExternallyElectedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_TabletExternallyElectedResponse.Merge(dst, src) +func (m *TabletExternallyElectedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_TabletExternallyElectedResponse.Merge(m, src) } func (m *TabletExternallyElectedResponse) XXX_Size() int { return xxx_messageInfo_TabletExternallyElectedResponse.Size(m) @@ -2417,16 +2479,17 @@ func (m *GetSlavesRequest) Reset() { *m = GetSlavesRequest{} } func (m *GetSlavesRequest) String() string { return proto.CompactTextString(m) } func (*GetSlavesRequest) ProtoMessage() {} func (*GetSlavesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{60} + return fileDescriptor_ff9ac4f89e61ffa4, []int{60} } + func (m *GetSlavesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSlavesRequest.Unmarshal(m, b) } func (m *GetSlavesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetSlavesRequest.Marshal(b, m, deterministic) } -func (dst *GetSlavesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSlavesRequest.Merge(dst, src) +func (m *GetSlavesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSlavesRequest.Merge(m, src) } func (m *GetSlavesRequest) XXX_Size() int { return xxx_messageInfo_GetSlavesRequest.Size(m) @@ -2448,16 +2511,17 @@ func (m *GetSlavesResponse) Reset() { *m = GetSlavesResponse{} } func (m *GetSlavesResponse) String() string { return proto.CompactTextString(m) } func (*GetSlavesResponse) ProtoMessage() {} func (*GetSlavesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{61} + return fileDescriptor_ff9ac4f89e61ffa4, []int{61} } + func (m *GetSlavesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSlavesResponse.Unmarshal(m, b) } func (m *GetSlavesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetSlavesResponse.Marshal(b, m, deterministic) } -func (dst *GetSlavesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSlavesResponse.Merge(dst, src) +func (m *GetSlavesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSlavesResponse.Merge(m, src) } func (m *GetSlavesResponse) XXX_Size() int { return xxx_messageInfo_GetSlavesResponse.Size(m) @@ -2485,16 +2549,17 @@ func (m *ResetReplicationRequest) Reset() { *m = ResetReplicationRequest func (m *ResetReplicationRequest) String() string { return proto.CompactTextString(m) } func (*ResetReplicationRequest) ProtoMessage() {} func (*ResetReplicationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{62} + return fileDescriptor_ff9ac4f89e61ffa4, []int{62} } + func (m *ResetReplicationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResetReplicationRequest.Unmarshal(m, b) } func (m *ResetReplicationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResetReplicationRequest.Marshal(b, m, deterministic) } -func (dst *ResetReplicationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResetReplicationRequest.Merge(dst, src) +func (m *ResetReplicationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResetReplicationRequest.Merge(m, src) } func (m *ResetReplicationRequest) XXX_Size() int { return xxx_messageInfo_ResetReplicationRequest.Size(m) @@ -2515,16 +2580,17 @@ func (m *ResetReplicationResponse) Reset() { *m = ResetReplicationRespon func (m *ResetReplicationResponse) String() string { return proto.CompactTextString(m) } func (*ResetReplicationResponse) ProtoMessage() {} func (*ResetReplicationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{63} + return fileDescriptor_ff9ac4f89e61ffa4, []int{63} } + func (m *ResetReplicationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResetReplicationResponse.Unmarshal(m, b) } func (m *ResetReplicationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResetReplicationResponse.Marshal(b, m, deterministic) } -func (dst *ResetReplicationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResetReplicationResponse.Merge(dst, src) +func (m *ResetReplicationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResetReplicationResponse.Merge(m, src) } func (m *ResetReplicationResponse) XXX_Size() int { return xxx_messageInfo_ResetReplicationResponse.Size(m) @@ -2546,16 +2612,17 @@ func (m *VReplicationExecRequest) Reset() { *m = VReplicationExecRequest func (m *VReplicationExecRequest) String() string { return proto.CompactTextString(m) } func (*VReplicationExecRequest) ProtoMessage() {} func (*VReplicationExecRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{64} + return fileDescriptor_ff9ac4f89e61ffa4, []int{64} } + func (m *VReplicationExecRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VReplicationExecRequest.Unmarshal(m, b) } func (m *VReplicationExecRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VReplicationExecRequest.Marshal(b, m, deterministic) } -func (dst *VReplicationExecRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_VReplicationExecRequest.Merge(dst, src) +func (m *VReplicationExecRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_VReplicationExecRequest.Merge(m, src) } func (m *VReplicationExecRequest) XXX_Size() int { return xxx_messageInfo_VReplicationExecRequest.Size(m) @@ -2584,16 +2651,17 @@ func (m *VReplicationExecResponse) Reset() { *m = VReplicationExecRespon func (m *VReplicationExecResponse) String() string { return proto.CompactTextString(m) } func (*VReplicationExecResponse) ProtoMessage() {} func (*VReplicationExecResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{65} + return fileDescriptor_ff9ac4f89e61ffa4, []int{65} } + func (m *VReplicationExecResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VReplicationExecResponse.Unmarshal(m, b) } func (m *VReplicationExecResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VReplicationExecResponse.Marshal(b, m, deterministic) } -func (dst *VReplicationExecResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_VReplicationExecResponse.Merge(dst, src) +func (m *VReplicationExecResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_VReplicationExecResponse.Merge(m, src) } func (m *VReplicationExecResponse) XXX_Size() int { return xxx_messageInfo_VReplicationExecResponse.Size(m) @@ -2623,16 +2691,17 @@ func (m *VReplicationWaitForPosRequest) Reset() { *m = VReplicationWaitF func (m *VReplicationWaitForPosRequest) String() string { return proto.CompactTextString(m) } func (*VReplicationWaitForPosRequest) ProtoMessage() {} func (*VReplicationWaitForPosRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{66} + return fileDescriptor_ff9ac4f89e61ffa4, []int{66} } + func (m *VReplicationWaitForPosRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VReplicationWaitForPosRequest.Unmarshal(m, b) } func (m *VReplicationWaitForPosRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VReplicationWaitForPosRequest.Marshal(b, m, deterministic) } -func (dst *VReplicationWaitForPosRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_VReplicationWaitForPosRequest.Merge(dst, src) +func (m *VReplicationWaitForPosRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_VReplicationWaitForPosRequest.Merge(m, src) } func (m *VReplicationWaitForPosRequest) XXX_Size() int { return xxx_messageInfo_VReplicationWaitForPosRequest.Size(m) @@ -2667,16 +2736,17 @@ func (m *VReplicationWaitForPosResponse) Reset() { *m = VReplicationWait func (m *VReplicationWaitForPosResponse) String() string { return proto.CompactTextString(m) } func (*VReplicationWaitForPosResponse) ProtoMessage() {} func (*VReplicationWaitForPosResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{67} + return fileDescriptor_ff9ac4f89e61ffa4, []int{67} } + func (m *VReplicationWaitForPosResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VReplicationWaitForPosResponse.Unmarshal(m, b) } func (m *VReplicationWaitForPosResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VReplicationWaitForPosResponse.Marshal(b, m, deterministic) } -func (dst *VReplicationWaitForPosResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_VReplicationWaitForPosResponse.Merge(dst, src) +func (m *VReplicationWaitForPosResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_VReplicationWaitForPosResponse.Merge(m, src) } func (m *VReplicationWaitForPosResponse) XXX_Size() int { return xxx_messageInfo_VReplicationWaitForPosResponse.Size(m) @@ -2697,16 +2767,17 @@ func (m *InitMasterRequest) Reset() { *m = InitMasterRequest{} } func (m *InitMasterRequest) String() string { return proto.CompactTextString(m) } func (*InitMasterRequest) ProtoMessage() {} func (*InitMasterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{68} + return fileDescriptor_ff9ac4f89e61ffa4, []int{68} } + func (m *InitMasterRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitMasterRequest.Unmarshal(m, b) } func (m *InitMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_InitMasterRequest.Marshal(b, m, deterministic) } -func (dst *InitMasterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_InitMasterRequest.Merge(dst, src) +func (m *InitMasterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_InitMasterRequest.Merge(m, src) } func (m *InitMasterRequest) XXX_Size() int { return xxx_messageInfo_InitMasterRequest.Size(m) @@ -2728,16 +2799,17 @@ func (m *InitMasterResponse) Reset() { *m = InitMasterResponse{} } func (m *InitMasterResponse) String() string { return proto.CompactTextString(m) } func (*InitMasterResponse) ProtoMessage() {} func (*InitMasterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{69} + return fileDescriptor_ff9ac4f89e61ffa4, []int{69} } + func (m *InitMasterResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitMasterResponse.Unmarshal(m, b) } func (m *InitMasterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_InitMasterResponse.Marshal(b, m, deterministic) } -func (dst *InitMasterResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_InitMasterResponse.Merge(dst, src) +func (m *InitMasterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_InitMasterResponse.Merge(m, src) } func (m *InitMasterResponse) XXX_Size() int { return xxx_messageInfo_InitMasterResponse.Size(m) @@ -2769,16 +2841,17 @@ func (m *PopulateReparentJournalRequest) Reset() { *m = PopulateReparent func (m *PopulateReparentJournalRequest) String() string { return proto.CompactTextString(m) } func (*PopulateReparentJournalRequest) ProtoMessage() {} func (*PopulateReparentJournalRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{70} + return fileDescriptor_ff9ac4f89e61ffa4, []int{70} } + func (m *PopulateReparentJournalRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PopulateReparentJournalRequest.Unmarshal(m, b) } func (m *PopulateReparentJournalRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PopulateReparentJournalRequest.Marshal(b, m, deterministic) } -func (dst *PopulateReparentJournalRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PopulateReparentJournalRequest.Merge(dst, src) +func (m *PopulateReparentJournalRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PopulateReparentJournalRequest.Merge(m, src) } func (m *PopulateReparentJournalRequest) XXX_Size() int { return xxx_messageInfo_PopulateReparentJournalRequest.Size(m) @@ -2827,16 +2900,17 @@ func (m *PopulateReparentJournalResponse) Reset() { *m = PopulateReparen func (m *PopulateReparentJournalResponse) String() string { return proto.CompactTextString(m) } func (*PopulateReparentJournalResponse) ProtoMessage() {} func (*PopulateReparentJournalResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{71} + return fileDescriptor_ff9ac4f89e61ffa4, []int{71} } + func (m *PopulateReparentJournalResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PopulateReparentJournalResponse.Unmarshal(m, b) } func (m *PopulateReparentJournalResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PopulateReparentJournalResponse.Marshal(b, m, deterministic) } -func (dst *PopulateReparentJournalResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PopulateReparentJournalResponse.Merge(dst, src) +func (m *PopulateReparentJournalResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PopulateReparentJournalResponse.Merge(m, src) } func (m *PopulateReparentJournalResponse) XXX_Size() int { return xxx_messageInfo_PopulateReparentJournalResponse.Size(m) @@ -2860,16 +2934,17 @@ func (m *InitSlaveRequest) Reset() { *m = InitSlaveRequest{} } func (m *InitSlaveRequest) String() string { return proto.CompactTextString(m) } func (*InitSlaveRequest) ProtoMessage() {} func (*InitSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{72} + return fileDescriptor_ff9ac4f89e61ffa4, []int{72} } + func (m *InitSlaveRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitSlaveRequest.Unmarshal(m, b) } func (m *InitSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_InitSlaveRequest.Marshal(b, m, deterministic) } -func (dst *InitSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_InitSlaveRequest.Merge(dst, src) +func (m *InitSlaveRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_InitSlaveRequest.Merge(m, src) } func (m *InitSlaveRequest) XXX_Size() int { return xxx_messageInfo_InitSlaveRequest.Size(m) @@ -2911,16 +2986,17 @@ func (m *InitSlaveResponse) Reset() { *m = InitSlaveResponse{} } func (m *InitSlaveResponse) String() string { return proto.CompactTextString(m) } func (*InitSlaveResponse) ProtoMessage() {} func (*InitSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{73} + return fileDescriptor_ff9ac4f89e61ffa4, []int{73} } + func (m *InitSlaveResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_InitSlaveResponse.Unmarshal(m, b) } func (m *InitSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_InitSlaveResponse.Marshal(b, m, deterministic) } -func (dst *InitSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_InitSlaveResponse.Merge(dst, src) +func (m *InitSlaveResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_InitSlaveResponse.Merge(m, src) } func (m *InitSlaveResponse) XXX_Size() int { return xxx_messageInfo_InitSlaveResponse.Size(m) @@ -2941,16 +3017,17 @@ func (m *DemoteMasterRequest) Reset() { *m = DemoteMasterRequest{} } func (m *DemoteMasterRequest) String() string { return proto.CompactTextString(m) } func (*DemoteMasterRequest) ProtoMessage() {} func (*DemoteMasterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{74} + return fileDescriptor_ff9ac4f89e61ffa4, []int{74} } + func (m *DemoteMasterRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DemoteMasterRequest.Unmarshal(m, b) } func (m *DemoteMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DemoteMasterRequest.Marshal(b, m, deterministic) } -func (dst *DemoteMasterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DemoteMasterRequest.Merge(dst, src) +func (m *DemoteMasterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_DemoteMasterRequest.Merge(m, src) } func (m *DemoteMasterRequest) XXX_Size() int { return xxx_messageInfo_DemoteMasterRequest.Size(m) @@ -2972,16 +3049,17 @@ func (m *DemoteMasterResponse) Reset() { *m = DemoteMasterResponse{} } func (m *DemoteMasterResponse) String() string { return proto.CompactTextString(m) } func (*DemoteMasterResponse) ProtoMessage() {} func (*DemoteMasterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{75} + return fileDescriptor_ff9ac4f89e61ffa4, []int{75} } + func (m *DemoteMasterResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_DemoteMasterResponse.Unmarshal(m, b) } func (m *DemoteMasterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_DemoteMasterResponse.Marshal(b, m, deterministic) } -func (dst *DemoteMasterResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DemoteMasterResponse.Merge(dst, src) +func (m *DemoteMasterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_DemoteMasterResponse.Merge(m, src) } func (m *DemoteMasterResponse) XXX_Size() int { return xxx_messageInfo_DemoteMasterResponse.Size(m) @@ -3009,16 +3087,17 @@ func (m *UndoDemoteMasterRequest) Reset() { *m = UndoDemoteMasterRequest func (m *UndoDemoteMasterRequest) String() string { return proto.CompactTextString(m) } func (*UndoDemoteMasterRequest) ProtoMessage() {} func (*UndoDemoteMasterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{76} + return fileDescriptor_ff9ac4f89e61ffa4, []int{76} } + func (m *UndoDemoteMasterRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UndoDemoteMasterRequest.Unmarshal(m, b) } func (m *UndoDemoteMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UndoDemoteMasterRequest.Marshal(b, m, deterministic) } -func (dst *UndoDemoteMasterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UndoDemoteMasterRequest.Merge(dst, src) +func (m *UndoDemoteMasterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UndoDemoteMasterRequest.Merge(m, src) } func (m *UndoDemoteMasterRequest) XXX_Size() int { return xxx_messageInfo_UndoDemoteMasterRequest.Size(m) @@ -3039,16 +3118,17 @@ func (m *UndoDemoteMasterResponse) Reset() { *m = UndoDemoteMasterRespon func (m *UndoDemoteMasterResponse) String() string { return proto.CompactTextString(m) } func (*UndoDemoteMasterResponse) ProtoMessage() {} func (*UndoDemoteMasterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{77} + return fileDescriptor_ff9ac4f89e61ffa4, []int{77} } + func (m *UndoDemoteMasterResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UndoDemoteMasterResponse.Unmarshal(m, b) } func (m *UndoDemoteMasterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UndoDemoteMasterResponse.Marshal(b, m, deterministic) } -func (dst *UndoDemoteMasterResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_UndoDemoteMasterResponse.Merge(dst, src) +func (m *UndoDemoteMasterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UndoDemoteMasterResponse.Merge(m, src) } func (m *UndoDemoteMasterResponse) XXX_Size() int { return xxx_messageInfo_UndoDemoteMasterResponse.Size(m) @@ -3070,16 +3150,17 @@ func (m *PromoteSlaveWhenCaughtUpRequest) Reset() { *m = PromoteSlaveWhe func (m *PromoteSlaveWhenCaughtUpRequest) String() string { return proto.CompactTextString(m) } func (*PromoteSlaveWhenCaughtUpRequest) ProtoMessage() {} func (*PromoteSlaveWhenCaughtUpRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{78} + return fileDescriptor_ff9ac4f89e61ffa4, []int{78} } + func (m *PromoteSlaveWhenCaughtUpRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PromoteSlaveWhenCaughtUpRequest.Unmarshal(m, b) } func (m *PromoteSlaveWhenCaughtUpRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PromoteSlaveWhenCaughtUpRequest.Marshal(b, m, deterministic) } -func (dst *PromoteSlaveWhenCaughtUpRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PromoteSlaveWhenCaughtUpRequest.Merge(dst, src) +func (m *PromoteSlaveWhenCaughtUpRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PromoteSlaveWhenCaughtUpRequest.Merge(m, src) } func (m *PromoteSlaveWhenCaughtUpRequest) XXX_Size() int { return xxx_messageInfo_PromoteSlaveWhenCaughtUpRequest.Size(m) @@ -3108,16 +3189,17 @@ func (m *PromoteSlaveWhenCaughtUpResponse) Reset() { *m = PromoteSlaveWh func (m *PromoteSlaveWhenCaughtUpResponse) String() string { return proto.CompactTextString(m) } func (*PromoteSlaveWhenCaughtUpResponse) ProtoMessage() {} func (*PromoteSlaveWhenCaughtUpResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{79} + return fileDescriptor_ff9ac4f89e61ffa4, []int{79} } + func (m *PromoteSlaveWhenCaughtUpResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PromoteSlaveWhenCaughtUpResponse.Unmarshal(m, b) } func (m *PromoteSlaveWhenCaughtUpResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PromoteSlaveWhenCaughtUpResponse.Marshal(b, m, deterministic) } -func (dst *PromoteSlaveWhenCaughtUpResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PromoteSlaveWhenCaughtUpResponse.Merge(dst, src) +func (m *PromoteSlaveWhenCaughtUpResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PromoteSlaveWhenCaughtUpResponse.Merge(m, src) } func (m *PromoteSlaveWhenCaughtUpResponse) XXX_Size() int { return xxx_messageInfo_PromoteSlaveWhenCaughtUpResponse.Size(m) @@ -3145,16 +3227,17 @@ func (m *SlaveWasPromotedRequest) Reset() { *m = SlaveWasPromotedRequest func (m *SlaveWasPromotedRequest) String() string { return proto.CompactTextString(m) } func (*SlaveWasPromotedRequest) ProtoMessage() {} func (*SlaveWasPromotedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{80} + return fileDescriptor_ff9ac4f89e61ffa4, []int{80} } + func (m *SlaveWasPromotedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SlaveWasPromotedRequest.Unmarshal(m, b) } func (m *SlaveWasPromotedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SlaveWasPromotedRequest.Marshal(b, m, deterministic) } -func (dst *SlaveWasPromotedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasPromotedRequest.Merge(dst, src) +func (m *SlaveWasPromotedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SlaveWasPromotedRequest.Merge(m, src) } func (m *SlaveWasPromotedRequest) XXX_Size() int { return xxx_messageInfo_SlaveWasPromotedRequest.Size(m) @@ -3175,16 +3258,17 @@ func (m *SlaveWasPromotedResponse) Reset() { *m = SlaveWasPromotedRespon func (m *SlaveWasPromotedResponse) String() string { return proto.CompactTextString(m) } func (*SlaveWasPromotedResponse) ProtoMessage() {} func (*SlaveWasPromotedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{81} + return fileDescriptor_ff9ac4f89e61ffa4, []int{81} } + func (m *SlaveWasPromotedResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SlaveWasPromotedResponse.Unmarshal(m, b) } func (m *SlaveWasPromotedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SlaveWasPromotedResponse.Marshal(b, m, deterministic) } -func (dst *SlaveWasPromotedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasPromotedResponse.Merge(dst, src) +func (m *SlaveWasPromotedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SlaveWasPromotedResponse.Merge(m, src) } func (m *SlaveWasPromotedResponse) XXX_Size() int { return xxx_messageInfo_SlaveWasPromotedResponse.Size(m) @@ -3208,16 +3292,17 @@ func (m *SetMasterRequest) Reset() { *m = SetMasterRequest{} } func (m *SetMasterRequest) String() string { return proto.CompactTextString(m) } func (*SetMasterRequest) ProtoMessage() {} func (*SetMasterRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{82} + return fileDescriptor_ff9ac4f89e61ffa4, []int{82} } + func (m *SetMasterRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMasterRequest.Unmarshal(m, b) } func (m *SetMasterRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetMasterRequest.Marshal(b, m, deterministic) } -func (dst *SetMasterRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetMasterRequest.Merge(dst, src) +func (m *SetMasterRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMasterRequest.Merge(m, src) } func (m *SetMasterRequest) XXX_Size() int { return xxx_messageInfo_SetMasterRequest.Size(m) @@ -3259,16 +3344,17 @@ func (m *SetMasterResponse) Reset() { *m = SetMasterResponse{} } func (m *SetMasterResponse) String() string { return proto.CompactTextString(m) } func (*SetMasterResponse) ProtoMessage() {} func (*SetMasterResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{83} + return fileDescriptor_ff9ac4f89e61ffa4, []int{83} } + func (m *SetMasterResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMasterResponse.Unmarshal(m, b) } func (m *SetMasterResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetMasterResponse.Marshal(b, m, deterministic) } -func (dst *SetMasterResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetMasterResponse.Merge(dst, src) +func (m *SetMasterResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMasterResponse.Merge(m, src) } func (m *SetMasterResponse) XXX_Size() int { return xxx_messageInfo_SetMasterResponse.Size(m) @@ -3291,16 +3377,17 @@ func (m *SlaveWasRestartedRequest) Reset() { *m = SlaveWasRestartedReque func (m *SlaveWasRestartedRequest) String() string { return proto.CompactTextString(m) } func (*SlaveWasRestartedRequest) ProtoMessage() {} func (*SlaveWasRestartedRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{84} + return fileDescriptor_ff9ac4f89e61ffa4, []int{84} } + func (m *SlaveWasRestartedRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SlaveWasRestartedRequest.Unmarshal(m, b) } func (m *SlaveWasRestartedRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SlaveWasRestartedRequest.Marshal(b, m, deterministic) } -func (dst *SlaveWasRestartedRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasRestartedRequest.Merge(dst, src) +func (m *SlaveWasRestartedRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SlaveWasRestartedRequest.Merge(m, src) } func (m *SlaveWasRestartedRequest) XXX_Size() int { return xxx_messageInfo_SlaveWasRestartedRequest.Size(m) @@ -3328,16 +3415,17 @@ func (m *SlaveWasRestartedResponse) Reset() { *m = SlaveWasRestartedResp func (m *SlaveWasRestartedResponse) String() string { return proto.CompactTextString(m) } func (*SlaveWasRestartedResponse) ProtoMessage() {} func (*SlaveWasRestartedResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{85} + return fileDescriptor_ff9ac4f89e61ffa4, []int{85} } + func (m *SlaveWasRestartedResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SlaveWasRestartedResponse.Unmarshal(m, b) } func (m *SlaveWasRestartedResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SlaveWasRestartedResponse.Marshal(b, m, deterministic) } -func (dst *SlaveWasRestartedResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SlaveWasRestartedResponse.Merge(dst, src) +func (m *SlaveWasRestartedResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SlaveWasRestartedResponse.Merge(m, src) } func (m *SlaveWasRestartedResponse) XXX_Size() int { return xxx_messageInfo_SlaveWasRestartedResponse.Size(m) @@ -3358,16 +3446,17 @@ func (m *StopReplicationAndGetStatusRequest) Reset() { *m = StopReplicat func (m *StopReplicationAndGetStatusRequest) String() string { return proto.CompactTextString(m) } func (*StopReplicationAndGetStatusRequest) ProtoMessage() {} func (*StopReplicationAndGetStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{86} + return fileDescriptor_ff9ac4f89e61ffa4, []int{86} } + func (m *StopReplicationAndGetStatusRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopReplicationAndGetStatusRequest.Unmarshal(m, b) } func (m *StopReplicationAndGetStatusRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StopReplicationAndGetStatusRequest.Marshal(b, m, deterministic) } -func (dst *StopReplicationAndGetStatusRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopReplicationAndGetStatusRequest.Merge(dst, src) +func (m *StopReplicationAndGetStatusRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StopReplicationAndGetStatusRequest.Merge(m, src) } func (m *StopReplicationAndGetStatusRequest) XXX_Size() int { return xxx_messageInfo_StopReplicationAndGetStatusRequest.Size(m) @@ -3389,16 +3478,17 @@ func (m *StopReplicationAndGetStatusResponse) Reset() { *m = StopReplica func (m *StopReplicationAndGetStatusResponse) String() string { return proto.CompactTextString(m) } func (*StopReplicationAndGetStatusResponse) ProtoMessage() {} func (*StopReplicationAndGetStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{87} + return fileDescriptor_ff9ac4f89e61ffa4, []int{87} } + func (m *StopReplicationAndGetStatusResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StopReplicationAndGetStatusResponse.Unmarshal(m, b) } func (m *StopReplicationAndGetStatusResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StopReplicationAndGetStatusResponse.Marshal(b, m, deterministic) } -func (dst *StopReplicationAndGetStatusResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StopReplicationAndGetStatusResponse.Merge(dst, src) +func (m *StopReplicationAndGetStatusResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StopReplicationAndGetStatusResponse.Merge(m, src) } func (m *StopReplicationAndGetStatusResponse) XXX_Size() int { return xxx_messageInfo_StopReplicationAndGetStatusResponse.Size(m) @@ -3426,16 +3516,17 @@ func (m *PromoteSlaveRequest) Reset() { *m = PromoteSlaveRequest{} } func (m *PromoteSlaveRequest) String() string { return proto.CompactTextString(m) } func (*PromoteSlaveRequest) ProtoMessage() {} func (*PromoteSlaveRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{88} + return fileDescriptor_ff9ac4f89e61ffa4, []int{88} } + func (m *PromoteSlaveRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PromoteSlaveRequest.Unmarshal(m, b) } func (m *PromoteSlaveRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PromoteSlaveRequest.Marshal(b, m, deterministic) } -func (dst *PromoteSlaveRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PromoteSlaveRequest.Merge(dst, src) +func (m *PromoteSlaveRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_PromoteSlaveRequest.Merge(m, src) } func (m *PromoteSlaveRequest) XXX_Size() int { return xxx_messageInfo_PromoteSlaveRequest.Size(m) @@ -3457,16 +3548,17 @@ func (m *PromoteSlaveResponse) Reset() { *m = PromoteSlaveResponse{} } func (m *PromoteSlaveResponse) String() string { return proto.CompactTextString(m) } func (*PromoteSlaveResponse) ProtoMessage() {} func (*PromoteSlaveResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{89} + return fileDescriptor_ff9ac4f89e61ffa4, []int{89} } + func (m *PromoteSlaveResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_PromoteSlaveResponse.Unmarshal(m, b) } func (m *PromoteSlaveResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_PromoteSlaveResponse.Marshal(b, m, deterministic) } -func (dst *PromoteSlaveResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PromoteSlaveResponse.Merge(dst, src) +func (m *PromoteSlaveResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_PromoteSlaveResponse.Merge(m, src) } func (m *PromoteSlaveResponse) XXX_Size() int { return xxx_messageInfo_PromoteSlaveResponse.Size(m) @@ -3496,16 +3588,17 @@ func (m *BackupRequest) Reset() { *m = BackupRequest{} } func (m *BackupRequest) String() string { return proto.CompactTextString(m) } func (*BackupRequest) ProtoMessage() {} func (*BackupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{90} + return fileDescriptor_ff9ac4f89e61ffa4, []int{90} } + func (m *BackupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BackupRequest.Unmarshal(m, b) } func (m *BackupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BackupRequest.Marshal(b, m, deterministic) } -func (dst *BackupRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BackupRequest.Merge(dst, src) +func (m *BackupRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BackupRequest.Merge(m, src) } func (m *BackupRequest) XXX_Size() int { return xxx_messageInfo_BackupRequest.Size(m) @@ -3541,16 +3634,17 @@ func (m *BackupResponse) Reset() { *m = BackupResponse{} } func (m *BackupResponse) String() string { return proto.CompactTextString(m) } func (*BackupResponse) ProtoMessage() {} func (*BackupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{91} + return fileDescriptor_ff9ac4f89e61ffa4, []int{91} } + func (m *BackupResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BackupResponse.Unmarshal(m, b) } func (m *BackupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BackupResponse.Marshal(b, m, deterministic) } -func (dst *BackupResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BackupResponse.Merge(dst, src) +func (m *BackupResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BackupResponse.Merge(m, src) } func (m *BackupResponse) XXX_Size() int { return xxx_messageInfo_BackupResponse.Size(m) @@ -3578,16 +3672,17 @@ func (m *RestoreFromBackupRequest) Reset() { *m = RestoreFromBackupReque func (m *RestoreFromBackupRequest) String() string { return proto.CompactTextString(m) } func (*RestoreFromBackupRequest) ProtoMessage() {} func (*RestoreFromBackupRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{92} + return fileDescriptor_ff9ac4f89e61ffa4, []int{92} } + func (m *RestoreFromBackupRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestoreFromBackupRequest.Unmarshal(m, b) } func (m *RestoreFromBackupRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RestoreFromBackupRequest.Marshal(b, m, deterministic) } -func (dst *RestoreFromBackupRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RestoreFromBackupRequest.Merge(dst, src) +func (m *RestoreFromBackupRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RestoreFromBackupRequest.Merge(m, src) } func (m *RestoreFromBackupRequest) XXX_Size() int { return xxx_messageInfo_RestoreFromBackupRequest.Size(m) @@ -3609,16 +3704,17 @@ func (m *RestoreFromBackupResponse) Reset() { *m = RestoreFromBackupResp func (m *RestoreFromBackupResponse) String() string { return proto.CompactTextString(m) } func (*RestoreFromBackupResponse) ProtoMessage() {} func (*RestoreFromBackupResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_tabletmanagerdata_3063cd7e973e1b02, []int{93} + return fileDescriptor_ff9ac4f89e61ffa4, []int{93} } + func (m *RestoreFromBackupResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RestoreFromBackupResponse.Unmarshal(m, b) } func (m *RestoreFromBackupResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RestoreFromBackupResponse.Marshal(b, m, deterministic) } -func (dst *RestoreFromBackupResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RestoreFromBackupResponse.Merge(dst, src) +func (m *RestoreFromBackupResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RestoreFromBackupResponse.Merge(m, src) } func (m *RestoreFromBackupResponse) XXX_Size() int { return xxx_messageInfo_RestoreFromBackupResponse.Size(m) @@ -3736,11 +3832,9 @@ func init() { proto.RegisterType((*RestoreFromBackupResponse)(nil), "tabletmanagerdata.RestoreFromBackupResponse") } -func init() { - proto.RegisterFile("tabletmanagerdata.proto", fileDescriptor_tabletmanagerdata_3063cd7e973e1b02) -} +func init() { proto.RegisterFile("tabletmanagerdata.proto", fileDescriptor_ff9ac4f89e61ffa4) } -var fileDescriptor_tabletmanagerdata_3063cd7e973e1b02 = []byte{ +var fileDescriptor_ff9ac4f89e61ffa4 = []byte{ // 2074 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x5b, 0x6f, 0x1b, 0xc7, 0xf5, 0x07, 0x49, 0x49, 0x96, 0x0e, 0x2f, 0x22, 0x97, 0x94, 0x48, 0xc9, 0xff, 0x48, 0xf2, 0xda, diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go index 686c293a38..6be24ad1f7 100644 --- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go +++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: tabletmanagerservice.proto -package tabletmanagerservice // import "vitess.io/vitess/go/vt/proto/tabletmanagerservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import tabletmanagerdata "vitess.io/vitess/go/vt/proto/tabletmanagerdata" +package tabletmanagerservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + tabletmanagerdata "vitess.io/vitess/go/vt/proto/tabletmanagerdata" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,78 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("tabletmanagerservice.proto", fileDescriptor_9ee75fe63cfd9360) } + +var fileDescriptor_9ee75fe63cfd9360 = []byte{ + // 1030 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x98, 0x6d, 0x6f, 0x1b, 0x45, + 0x10, 0xc7, 0xb1, 0x04, 0x95, 0x58, 0x1e, 0xbb, 0xaa, 0x28, 0x0a, 0x12, 0x4f, 0x4d, 0x79, 0x48, + 0x51, 0xdc, 0x34, 0x94, 0xf7, 0x6e, 0x9a, 0xb4, 0x41, 0x8d, 0x30, 0x76, 0x43, 0x10, 0x48, 0x48, + 0x1b, 0x7b, 0xe2, 0x3b, 0x72, 0xde, 0x3d, 0x76, 0xf7, 0xac, 0xe6, 0x15, 0x12, 0x12, 0xaf, 0x90, + 0xf8, 0x4a, 0x7c, 0x35, 0x74, 0x0f, 0xbb, 0x37, 0x6b, 0xcf, 0xad, 0xed, 0x77, 0x91, 0xff, 0xbf, + 0x9d, 0x99, 0x9d, 0x9d, 0x99, 0xdd, 0x1c, 0xdb, 0xb1, 0xe2, 0x32, 0x03, 0x3b, 0x17, 0x52, 0xcc, + 0x40, 0x1b, 0xd0, 0x8b, 0x74, 0x02, 0xfb, 0xb9, 0x56, 0x56, 0xf1, 0x3b, 0x94, 0xb6, 0x73, 0x37, + 0xf8, 0x75, 0x2a, 0xac, 0xa8, 0xf1, 0x47, 0xff, 0xed, 0xb2, 0x77, 0x5e, 0x56, 0xda, 0x59, 0xad, + 0xf1, 0x53, 0xf6, 0xfa, 0x30, 0x95, 0x33, 0xfe, 0xf1, 0xfe, 0xea, 0x9a, 0x52, 0x18, 0xc1, 0x1f, + 0x05, 0x18, 0xbb, 0xf3, 0x49, 0xa7, 0x6e, 0x72, 0x25, 0x0d, 0x7c, 0xfe, 0x1a, 0x7f, 0xc1, 0xde, + 0x18, 0x67, 0x00, 0x39, 0xa7, 0xd8, 0x4a, 0x71, 0xc6, 0x3e, 0xed, 0x06, 0xbc, 0xb5, 0xdf, 0xd8, + 0x5b, 0xc7, 0xaf, 0x60, 0x52, 0x58, 0x78, 0xae, 0xd4, 0x35, 0xbf, 0x4f, 0x2c, 0x41, 0xba, 0xb3, + 0xfc, 0xc5, 0x3a, 0xcc, 0xdb, 0xff, 0x99, 0xbd, 0xf9, 0x0c, 0xec, 0x78, 0x92, 0xc0, 0x5c, 0xf0, + 0x7b, 0xc4, 0x32, 0xaf, 0x3a, 0xdb, 0xbb, 0x71, 0xc8, 0x5b, 0x9e, 0xb1, 0x77, 0x9f, 0x81, 0x1d, + 0x82, 0x9e, 0xa7, 0xc6, 0xa4, 0x4a, 0x1a, 0xfe, 0x15, 0xbd, 0x12, 0x21, 0xce, 0xc7, 0xd7, 0x1b, + 0x90, 0x38, 0x45, 0x63, 0xb0, 0x23, 0x10, 0xd3, 0x1f, 0x64, 0x76, 0x43, 0xa6, 0x08, 0xe9, 0xb1, + 0x14, 0x05, 0x98, 0xb7, 0x2f, 0xd8, 0xdb, 0x8d, 0x70, 0xa1, 0x53, 0x0b, 0x3c, 0xb2, 0xb2, 0x02, + 0x9c, 0x87, 0x2f, 0xd7, 0x72, 0xde, 0xc5, 0xaf, 0x8c, 0x1d, 0x25, 0x42, 0xce, 0xe0, 0xe5, 0x4d, + 0x0e, 0x9c, 0xca, 0x70, 0x2b, 0x3b, 0xf3, 0xf7, 0xd7, 0x50, 0x38, 0xfe, 0x11, 0x5c, 0x69, 0x30, + 0xc9, 0xd8, 0x8a, 0x8e, 0xf8, 0x31, 0x10, 0x8b, 0x3f, 0xe4, 0xf0, 0x59, 0x8f, 0x0a, 0xf9, 0x1c, + 0x44, 0x66, 0x93, 0xa3, 0x04, 0x26, 0xd7, 0xe4, 0x59, 0x87, 0x48, 0xec, 0xac, 0x97, 0x49, 0xef, + 0x28, 0x67, 0xb7, 0x4f, 0x67, 0x52, 0x69, 0xa8, 0xe5, 0x63, 0xad, 0x95, 0xe6, 0x0f, 0x08, 0x0b, + 0x2b, 0x94, 0x73, 0xf7, 0xcd, 0x66, 0x70, 0x98, 0xbd, 0x4c, 0x89, 0x69, 0xd3, 0x23, 0x74, 0xf6, + 0x5a, 0x20, 0x9e, 0x3d, 0xcc, 0x79, 0x17, 0xbf, 0xb3, 0xf7, 0x86, 0x1a, 0xae, 0xb2, 0x74, 0x96, + 0xb8, 0x4e, 0xa4, 0x92, 0xb2, 0xc4, 0x38, 0x47, 0x7b, 0x9b, 0xa0, 0xb8, 0x59, 0x06, 0x79, 0x9e, + 0xdd, 0x34, 0x7e, 0xa8, 0x22, 0x42, 0x7a, 0xac, 0x59, 0x02, 0x0c, 0x57, 0xf2, 0x0b, 0x35, 0xb9, + 0xae, 0xa6, 0xab, 0x21, 0x2b, 0xb9, 0x95, 0x63, 0x95, 0x8c, 0x29, 0x7c, 0x16, 0xe7, 0x32, 0x6b, + 0xcd, 0x53, 0x61, 0x61, 0x20, 0x76, 0x16, 0x21, 0x87, 0x0b, 0xac, 0x19, 0x94, 0x27, 0x60, 0x27, + 0xc9, 0xc0, 0x3c, 0xbd, 0x14, 0x64, 0x81, 0xad, 0x50, 0xb1, 0x02, 0x23, 0x60, 0xef, 0xf1, 0x4f, + 0xf6, 0x41, 0x28, 0x0f, 0xb2, 0x6c, 0xa8, 0xd3, 0x85, 0xe1, 0x0f, 0xd7, 0x5a, 0x72, 0xa8, 0xf3, + 0x7d, 0xb0, 0xc5, 0x8a, 0xee, 0x2d, 0x0f, 0xf2, 0x7c, 0x83, 0x2d, 0x0f, 0xf2, 0x7c, 0xf3, 0x2d, + 0x57, 0x70, 0x30, 0xb1, 0x33, 0xb1, 0x80, 0x72, 0x8c, 0x14, 0x86, 0x9e, 0xd8, 0xad, 0x1e, 0x9d, + 0xd8, 0x18, 0xc3, 0xe3, 0xe8, 0x4c, 0x18, 0x0b, 0x7a, 0xa8, 0x4c, 0x6a, 0x53, 0x25, 0xc9, 0x71, + 0x14, 0x22, 0xb1, 0x71, 0xb4, 0x4c, 0xe2, 0xdb, 0x73, 0x6c, 0x55, 0x5e, 0x45, 0x41, 0xde, 0x9e, + 0x5e, 0x8d, 0xdd, 0x9e, 0x08, 0xf2, 0x96, 0xe7, 0xec, 0x7d, 0xff, 0xf3, 0x59, 0x2a, 0xd3, 0x79, + 0x31, 0xe7, 0x7b, 0xb1, 0xb5, 0x0d, 0xe4, 0xfc, 0x3c, 0xd8, 0x88, 0xc5, 0x6d, 0x3b, 0xb6, 0x42, + 0xdb, 0x7a, 0x27, 0x74, 0x90, 0x4e, 0x8e, 0xb5, 0x2d, 0xa6, 0xbc, 0xf1, 0x1b, 0x76, 0xa7, 0xfd, + 0xfd, 0x5c, 0xda, 0x34, 0x1b, 0x5c, 0x59, 0xd0, 0x7c, 0x3f, 0x6a, 0xa0, 0x05, 0x9d, 0xc3, 0xfe, + 0xc6, 0xbc, 0x77, 0xfd, 0x4f, 0x8f, 0xed, 0xd4, 0x2f, 0xbd, 0xe3, 0x57, 0x16, 0xb4, 0x14, 0x59, + 0x79, 0xb5, 0xe7, 0x42, 0x83, 0xb4, 0x30, 0xe5, 0xdf, 0x12, 0x16, 0xbb, 0x71, 0x17, 0xc7, 0xe3, + 0x2d, 0x57, 0xf9, 0x68, 0xfe, 0xea, 0xb1, 0xbb, 0xcb, 0xe0, 0x71, 0x06, 0x93, 0x32, 0x94, 0x83, + 0x0d, 0x8c, 0x36, 0xac, 0x8b, 0xe3, 0xd1, 0x36, 0x4b, 0x96, 0x5f, 0x7c, 0x65, 0xca, 0x4c, 0xe7, + 0x8b, 0xaf, 0x52, 0xd7, 0xbd, 0xf8, 0x1a, 0x08, 0xd7, 0xec, 0x4f, 0x23, 0xc8, 0xb3, 0x74, 0x22, + 0xca, 0x3e, 0x29, 0x27, 0x00, 0x59, 0xb3, 0xcb, 0x50, 0xac, 0x66, 0x57, 0x59, 0x3c, 0x38, 0xb1, + 0x7a, 0x21, 0x52, 0x7b, 0xa2, 0xca, 0x2e, 0x25, 0x07, 0x27, 0x8d, 0xc6, 0x06, 0x67, 0xd7, 0x0a, + 0xbc, 0xdf, 0x11, 0x98, 0xf2, 0x45, 0xe7, 0x39, 0x72, 0xbf, 0xcb, 0x50, 0x6c, 0xbf, 0xab, 0x2c, + 0xee, 0xd1, 0x53, 0x99, 0xda, 0x7a, 0x18, 0x91, 0x3d, 0xda, 0xca, 0xb1, 0x1e, 0xc5, 0x54, 0x50, + 0x9a, 0x43, 0x95, 0x17, 0x59, 0xf5, 0xb0, 0xab, 0x6b, 0xf7, 0x7b, 0x55, 0x94, 0x45, 0x44, 0x96, + 0x66, 0x07, 0x1b, 0x2b, 0xcd, 0xce, 0x25, 0xb8, 0x34, 0xcb, 0xe0, 0xba, 0xc7, 0xa9, 0x57, 0x63, + 0xa5, 0x89, 0x20, 0xfc, 0x72, 0x78, 0x0a, 0x73, 0x65, 0xa1, 0xc9, 0x1e, 0x75, 0x97, 0x60, 0x20, + 0xf6, 0x72, 0x08, 0x39, 0x5c, 0x0d, 0xe7, 0x72, 0xaa, 0x02, 0x37, 0x7b, 0xe4, 0xc3, 0x23, 0x84, + 0x62, 0xd5, 0xb0, 0xca, 0x7a, 0x77, 0x7f, 0xf7, 0xd8, 0x87, 0x43, 0xad, 0x4a, 0xad, 0xda, 0xec, + 0x45, 0x02, 0xf2, 0x48, 0x14, 0xb3, 0xc4, 0x9e, 0xe7, 0x9c, 0x4c, 0x7f, 0x07, 0xec, 0xfc, 0x1f, + 0x6e, 0xb5, 0x26, 0xb8, 0xa8, 0x2a, 0x59, 0x98, 0x86, 0x9e, 0xd2, 0x17, 0xd5, 0x12, 0x14, 0xbd, + 0xa8, 0x56, 0xd8, 0xe0, 0xc6, 0x05, 0xd7, 0x03, 0xf7, 0xe8, 0xff, 0xb0, 0xc2, 0xbc, 0xee, 0xc6, + 0x21, 0xfc, 0x0c, 0x72, 0x7e, 0x47, 0x60, 0xca, 0x6b, 0x05, 0xa6, 0x3c, 0x16, 0x9d, 0xa7, 0x62, + 0xcf, 0x20, 0x02, 0xf6, 0x1e, 0xff, 0xed, 0xb1, 0x8f, 0xca, 0x3b, 0x19, 0xb5, 0xfb, 0x40, 0x4e, + 0xcb, 0xc9, 0x5a, 0xbf, 0x8b, 0x1e, 0x77, 0xdc, 0xe1, 0x1d, 0xbc, 0x0b, 0xe3, 0xbb, 0x6d, 0x97, + 0xe1, 0x2e, 0xc1, 0x27, 0x4e, 0x76, 0x09, 0x06, 0x62, 0x5d, 0x12, 0x72, 0xde, 0xc5, 0x8f, 0xec, + 0xd6, 0x13, 0x31, 0xb9, 0x2e, 0x72, 0x4e, 0x7d, 0xfd, 0xa8, 0x25, 0x67, 0xf6, 0xb3, 0x08, 0xe1, + 0x0c, 0x3e, 0xec, 0x71, 0xcd, 0x6e, 0x97, 0xd9, 0x55, 0x1a, 0x4e, 0xb4, 0x9a, 0x37, 0xd6, 0x3b, + 0x66, 0x6b, 0x48, 0xc5, 0x0e, 0x8e, 0x80, 0x5b, 0x9f, 0x4f, 0x0e, 0x7f, 0x39, 0x58, 0xa4, 0x16, + 0x8c, 0xd9, 0x4f, 0x55, 0xbf, 0xfe, 0xab, 0x3f, 0x53, 0xfd, 0x85, 0xed, 0x57, 0x5f, 0x98, 0xfa, + 0xd4, 0xf7, 0xa8, 0xcb, 0x5b, 0x95, 0x76, 0xf8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0x75, + 0xbb, 0x5f, 0xca, 0x12, 0x00, 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -692,6 +764,143 @@ type TabletManagerServer interface { RestoreFromBackup(*tabletmanagerdata.RestoreFromBackupRequest, TabletManager_RestoreFromBackupServer) error } +// UnimplementedTabletManagerServer can be embedded to have forward compatible implementations. +type UnimplementedTabletManagerServer struct { +} + +func (*UnimplementedTabletManagerServer) Ping(ctx context.Context, req *tabletmanagerdata.PingRequest) (*tabletmanagerdata.PingResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Ping not implemented") +} +func (*UnimplementedTabletManagerServer) Sleep(ctx context.Context, req *tabletmanagerdata.SleepRequest) (*tabletmanagerdata.SleepResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Sleep not implemented") +} +func (*UnimplementedTabletManagerServer) ExecuteHook(ctx context.Context, req *tabletmanagerdata.ExecuteHookRequest) (*tabletmanagerdata.ExecuteHookResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteHook not implemented") +} +func (*UnimplementedTabletManagerServer) GetSchema(ctx context.Context, req *tabletmanagerdata.GetSchemaRequest) (*tabletmanagerdata.GetSchemaResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetSchema not implemented") +} +func (*UnimplementedTabletManagerServer) GetPermissions(ctx context.Context, req *tabletmanagerdata.GetPermissionsRequest) (*tabletmanagerdata.GetPermissionsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetPermissions not implemented") +} +func (*UnimplementedTabletManagerServer) SetReadOnly(ctx context.Context, req *tabletmanagerdata.SetReadOnlyRequest) (*tabletmanagerdata.SetReadOnlyResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetReadOnly not implemented") +} +func (*UnimplementedTabletManagerServer) SetReadWrite(ctx context.Context, req *tabletmanagerdata.SetReadWriteRequest) (*tabletmanagerdata.SetReadWriteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetReadWrite not implemented") +} +func (*UnimplementedTabletManagerServer) ChangeType(ctx context.Context, req *tabletmanagerdata.ChangeTypeRequest) (*tabletmanagerdata.ChangeTypeResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ChangeType not implemented") +} +func (*UnimplementedTabletManagerServer) RefreshState(ctx context.Context, req *tabletmanagerdata.RefreshStateRequest) (*tabletmanagerdata.RefreshStateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RefreshState not implemented") +} +func (*UnimplementedTabletManagerServer) RunHealthCheck(ctx context.Context, req *tabletmanagerdata.RunHealthCheckRequest) (*tabletmanagerdata.RunHealthCheckResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RunHealthCheck not implemented") +} +func (*UnimplementedTabletManagerServer) IgnoreHealthError(ctx context.Context, req *tabletmanagerdata.IgnoreHealthErrorRequest) (*tabletmanagerdata.IgnoreHealthErrorResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method IgnoreHealthError not implemented") +} +func (*UnimplementedTabletManagerServer) ReloadSchema(ctx context.Context, req *tabletmanagerdata.ReloadSchemaRequest) (*tabletmanagerdata.ReloadSchemaResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ReloadSchema not implemented") +} +func (*UnimplementedTabletManagerServer) PreflightSchema(ctx context.Context, req *tabletmanagerdata.PreflightSchemaRequest) (*tabletmanagerdata.PreflightSchemaResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PreflightSchema not implemented") +} +func (*UnimplementedTabletManagerServer) ApplySchema(ctx context.Context, req *tabletmanagerdata.ApplySchemaRequest) (*tabletmanagerdata.ApplySchemaResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ApplySchema not implemented") +} +func (*UnimplementedTabletManagerServer) LockTables(ctx context.Context, req *tabletmanagerdata.LockTablesRequest) (*tabletmanagerdata.LockTablesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method LockTables not implemented") +} +func (*UnimplementedTabletManagerServer) UnlockTables(ctx context.Context, req *tabletmanagerdata.UnlockTablesRequest) (*tabletmanagerdata.UnlockTablesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UnlockTables not implemented") +} +func (*UnimplementedTabletManagerServer) ExecuteFetchAsDba(ctx context.Context, req *tabletmanagerdata.ExecuteFetchAsDbaRequest) (*tabletmanagerdata.ExecuteFetchAsDbaResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteFetchAsDba not implemented") +} +func (*UnimplementedTabletManagerServer) ExecuteFetchAsAllPrivs(ctx context.Context, req *tabletmanagerdata.ExecuteFetchAsAllPrivsRequest) (*tabletmanagerdata.ExecuteFetchAsAllPrivsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteFetchAsAllPrivs not implemented") +} +func (*UnimplementedTabletManagerServer) ExecuteFetchAsApp(ctx context.Context, req *tabletmanagerdata.ExecuteFetchAsAppRequest) (*tabletmanagerdata.ExecuteFetchAsAppResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteFetchAsApp not implemented") +} +func (*UnimplementedTabletManagerServer) SlaveStatus(ctx context.Context, req *tabletmanagerdata.SlaveStatusRequest) (*tabletmanagerdata.SlaveStatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SlaveStatus not implemented") +} +func (*UnimplementedTabletManagerServer) MasterPosition(ctx context.Context, req *tabletmanagerdata.MasterPositionRequest) (*tabletmanagerdata.MasterPositionResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method MasterPosition not implemented") +} +func (*UnimplementedTabletManagerServer) StopSlave(ctx context.Context, req *tabletmanagerdata.StopSlaveRequest) (*tabletmanagerdata.StopSlaveResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StopSlave not implemented") +} +func (*UnimplementedTabletManagerServer) StopSlaveMinimum(ctx context.Context, req *tabletmanagerdata.StopSlaveMinimumRequest) (*tabletmanagerdata.StopSlaveMinimumResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StopSlaveMinimum not implemented") +} +func (*UnimplementedTabletManagerServer) StartSlave(ctx context.Context, req *tabletmanagerdata.StartSlaveRequest) (*tabletmanagerdata.StartSlaveResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StartSlave not implemented") +} +func (*UnimplementedTabletManagerServer) StartSlaveUntilAfter(ctx context.Context, req *tabletmanagerdata.StartSlaveUntilAfterRequest) (*tabletmanagerdata.StartSlaveUntilAfterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StartSlaveUntilAfter not implemented") +} +func (*UnimplementedTabletManagerServer) TabletExternallyReparented(ctx context.Context, req *tabletmanagerdata.TabletExternallyReparentedRequest) (*tabletmanagerdata.TabletExternallyReparentedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method TabletExternallyReparented not implemented") +} +func (*UnimplementedTabletManagerServer) TabletExternallyElected(ctx context.Context, req *tabletmanagerdata.TabletExternallyElectedRequest) (*tabletmanagerdata.TabletExternallyElectedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method TabletExternallyElected not implemented") +} +func (*UnimplementedTabletManagerServer) GetSlaves(ctx context.Context, req *tabletmanagerdata.GetSlavesRequest) (*tabletmanagerdata.GetSlavesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetSlaves not implemented") +} +func (*UnimplementedTabletManagerServer) VReplicationExec(ctx context.Context, req *tabletmanagerdata.VReplicationExecRequest) (*tabletmanagerdata.VReplicationExecResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method VReplicationExec not implemented") +} +func (*UnimplementedTabletManagerServer) VReplicationWaitForPos(ctx context.Context, req *tabletmanagerdata.VReplicationWaitForPosRequest) (*tabletmanagerdata.VReplicationWaitForPosResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method VReplicationWaitForPos not implemented") +} +func (*UnimplementedTabletManagerServer) ResetReplication(ctx context.Context, req *tabletmanagerdata.ResetReplicationRequest) (*tabletmanagerdata.ResetReplicationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ResetReplication not implemented") +} +func (*UnimplementedTabletManagerServer) InitMaster(ctx context.Context, req *tabletmanagerdata.InitMasterRequest) (*tabletmanagerdata.InitMasterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method InitMaster not implemented") +} +func (*UnimplementedTabletManagerServer) PopulateReparentJournal(ctx context.Context, req *tabletmanagerdata.PopulateReparentJournalRequest) (*tabletmanagerdata.PopulateReparentJournalResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PopulateReparentJournal not implemented") +} +func (*UnimplementedTabletManagerServer) InitSlave(ctx context.Context, req *tabletmanagerdata.InitSlaveRequest) (*tabletmanagerdata.InitSlaveResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method InitSlave not implemented") +} +func (*UnimplementedTabletManagerServer) DemoteMaster(ctx context.Context, req *tabletmanagerdata.DemoteMasterRequest) (*tabletmanagerdata.DemoteMasterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DemoteMaster not implemented") +} +func (*UnimplementedTabletManagerServer) UndoDemoteMaster(ctx context.Context, req *tabletmanagerdata.UndoDemoteMasterRequest) (*tabletmanagerdata.UndoDemoteMasterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UndoDemoteMaster not implemented") +} +func (*UnimplementedTabletManagerServer) PromoteSlaveWhenCaughtUp(ctx context.Context, req *tabletmanagerdata.PromoteSlaveWhenCaughtUpRequest) (*tabletmanagerdata.PromoteSlaveWhenCaughtUpResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PromoteSlaveWhenCaughtUp not implemented") +} +func (*UnimplementedTabletManagerServer) SlaveWasPromoted(ctx context.Context, req *tabletmanagerdata.SlaveWasPromotedRequest) (*tabletmanagerdata.SlaveWasPromotedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SlaveWasPromoted not implemented") +} +func (*UnimplementedTabletManagerServer) SetMaster(ctx context.Context, req *tabletmanagerdata.SetMasterRequest) (*tabletmanagerdata.SetMasterResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetMaster not implemented") +} +func (*UnimplementedTabletManagerServer) SlaveWasRestarted(ctx context.Context, req *tabletmanagerdata.SlaveWasRestartedRequest) (*tabletmanagerdata.SlaveWasRestartedResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SlaveWasRestarted not implemented") +} +func (*UnimplementedTabletManagerServer) StopReplicationAndGetStatus(ctx context.Context, req *tabletmanagerdata.StopReplicationAndGetStatusRequest) (*tabletmanagerdata.StopReplicationAndGetStatusResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method StopReplicationAndGetStatus not implemented") +} +func (*UnimplementedTabletManagerServer) PromoteSlave(ctx context.Context, req *tabletmanagerdata.PromoteSlaveRequest) (*tabletmanagerdata.PromoteSlaveResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method PromoteSlave not implemented") +} +func (*UnimplementedTabletManagerServer) Backup(req *tabletmanagerdata.BackupRequest, srv TabletManager_BackupServer) error { + return status.Errorf(codes.Unimplemented, "method Backup not implemented") +} +func (*UnimplementedTabletManagerServer) RestoreFromBackup(req *tabletmanagerdata.RestoreFromBackupRequest, srv TabletManager_RestoreFromBackupServer) error { + return status.Errorf(codes.Unimplemented, "method RestoreFromBackup not implemented") +} + func RegisterTabletManagerServer(s *grpc.Server, srv TabletManagerServer) { s.RegisterService(&_TabletManager_serviceDesc, srv) } @@ -1681,76 +1890,3 @@ var _TabletManager_serviceDesc = grpc.ServiceDesc{ }, Metadata: "tabletmanagerservice.proto", } - -func init() { - proto.RegisterFile("tabletmanagerservice.proto", fileDescriptor_tabletmanagerservice_0dc181478a076ccc) -} - -var fileDescriptor_tabletmanagerservice_0dc181478a076ccc = []byte{ - // 1030 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x98, 0x6d, 0x6f, 0x1b, 0x45, - 0x10, 0xc7, 0xb1, 0x04, 0x95, 0x58, 0x1e, 0xbb, 0xaa, 0x28, 0x0a, 0x12, 0x4f, 0x4d, 0x79, 0x48, - 0x51, 0xdc, 0x34, 0x94, 0xf7, 0x6e, 0x9a, 0xb4, 0x41, 0x8d, 0x30, 0x76, 0x43, 0x10, 0x48, 0x48, - 0x1b, 0x7b, 0xe2, 0x3b, 0x72, 0xde, 0x3d, 0x76, 0xf7, 0xac, 0xe6, 0x15, 0x12, 0x12, 0xaf, 0x90, - 0xf8, 0x4a, 0x7c, 0x35, 0x74, 0x0f, 0xbb, 0x37, 0x6b, 0xcf, 0xad, 0xed, 0x77, 0x91, 0xff, 0xbf, - 0x9d, 0x99, 0x9d, 0x9d, 0x99, 0xdd, 0x1c, 0xdb, 0xb1, 0xe2, 0x32, 0x03, 0x3b, 0x17, 0x52, 0xcc, - 0x40, 0x1b, 0xd0, 0x8b, 0x74, 0x02, 0xfb, 0xb9, 0x56, 0x56, 0xf1, 0x3b, 0x94, 0xb6, 0x73, 0x37, - 0xf8, 0x75, 0x2a, 0xac, 0xa8, 0xf1, 0x47, 0xff, 0xed, 0xb2, 0x77, 0x5e, 0x56, 0xda, 0x59, 0xad, - 0xf1, 0x53, 0xf6, 0xfa, 0x30, 0x95, 0x33, 0xfe, 0xf1, 0xfe, 0xea, 0x9a, 0x52, 0x18, 0xc1, 0x1f, - 0x05, 0x18, 0xbb, 0xf3, 0x49, 0xa7, 0x6e, 0x72, 0x25, 0x0d, 0x7c, 0xfe, 0x1a, 0x7f, 0xc1, 0xde, - 0x18, 0x67, 0x00, 0x39, 0xa7, 0xd8, 0x4a, 0x71, 0xc6, 0x3e, 0xed, 0x06, 0xbc, 0xb5, 0xdf, 0xd8, - 0x5b, 0xc7, 0xaf, 0x60, 0x52, 0x58, 0x78, 0xae, 0xd4, 0x35, 0xbf, 0x4f, 0x2c, 0x41, 0xba, 0xb3, - 0xfc, 0xc5, 0x3a, 0xcc, 0xdb, 0xff, 0x99, 0xbd, 0xf9, 0x0c, 0xec, 0x78, 0x92, 0xc0, 0x5c, 0xf0, - 0x7b, 0xc4, 0x32, 0xaf, 0x3a, 0xdb, 0xbb, 0x71, 0xc8, 0x5b, 0x9e, 0xb1, 0x77, 0x9f, 0x81, 0x1d, - 0x82, 0x9e, 0xa7, 0xc6, 0xa4, 0x4a, 0x1a, 0xfe, 0x15, 0xbd, 0x12, 0x21, 0xce, 0xc7, 0xd7, 0x1b, - 0x90, 0x38, 0x45, 0x63, 0xb0, 0x23, 0x10, 0xd3, 0x1f, 0x64, 0x76, 0x43, 0xa6, 0x08, 0xe9, 0xb1, - 0x14, 0x05, 0x98, 0xb7, 0x2f, 0xd8, 0xdb, 0x8d, 0x70, 0xa1, 0x53, 0x0b, 0x3c, 0xb2, 0xb2, 0x02, - 0x9c, 0x87, 0x2f, 0xd7, 0x72, 0xde, 0xc5, 0xaf, 0x8c, 0x1d, 0x25, 0x42, 0xce, 0xe0, 0xe5, 0x4d, - 0x0e, 0x9c, 0xca, 0x70, 0x2b, 0x3b, 0xf3, 0xf7, 0xd7, 0x50, 0x38, 0xfe, 0x11, 0x5c, 0x69, 0x30, - 0xc9, 0xd8, 0x8a, 0x8e, 0xf8, 0x31, 0x10, 0x8b, 0x3f, 0xe4, 0xf0, 0x59, 0x8f, 0x0a, 0xf9, 0x1c, - 0x44, 0x66, 0x93, 0xa3, 0x04, 0x26, 0xd7, 0xe4, 0x59, 0x87, 0x48, 0xec, 0xac, 0x97, 0x49, 0xef, - 0x28, 0x67, 0xb7, 0x4f, 0x67, 0x52, 0x69, 0xa8, 0xe5, 0x63, 0xad, 0x95, 0xe6, 0x0f, 0x08, 0x0b, - 0x2b, 0x94, 0x73, 0xf7, 0xcd, 0x66, 0x70, 0x98, 0xbd, 0x4c, 0x89, 0x69, 0xd3, 0x23, 0x74, 0xf6, - 0x5a, 0x20, 0x9e, 0x3d, 0xcc, 0x79, 0x17, 0xbf, 0xb3, 0xf7, 0x86, 0x1a, 0xae, 0xb2, 0x74, 0x96, - 0xb8, 0x4e, 0xa4, 0x92, 0xb2, 0xc4, 0x38, 0x47, 0x7b, 0x9b, 0xa0, 0xb8, 0x59, 0x06, 0x79, 0x9e, - 0xdd, 0x34, 0x7e, 0xa8, 0x22, 0x42, 0x7a, 0xac, 0x59, 0x02, 0x0c, 0x57, 0xf2, 0x0b, 0x35, 0xb9, - 0xae, 0xa6, 0xab, 0x21, 0x2b, 0xb9, 0x95, 0x63, 0x95, 0x8c, 0x29, 0x7c, 0x16, 0xe7, 0x32, 0x6b, - 0xcd, 0x53, 0x61, 0x61, 0x20, 0x76, 0x16, 0x21, 0x87, 0x0b, 0xac, 0x19, 0x94, 0x27, 0x60, 0x27, - 0xc9, 0xc0, 0x3c, 0xbd, 0x14, 0x64, 0x81, 0xad, 0x50, 0xb1, 0x02, 0x23, 0x60, 0xef, 0xf1, 0x4f, - 0xf6, 0x41, 0x28, 0x0f, 0xb2, 0x6c, 0xa8, 0xd3, 0x85, 0xe1, 0x0f, 0xd7, 0x5a, 0x72, 0xa8, 0xf3, - 0x7d, 0xb0, 0xc5, 0x8a, 0xee, 0x2d, 0x0f, 0xf2, 0x7c, 0x83, 0x2d, 0x0f, 0xf2, 0x7c, 0xf3, 0x2d, - 0x57, 0x70, 0x30, 0xb1, 0x33, 0xb1, 0x80, 0x72, 0x8c, 0x14, 0x86, 0x9e, 0xd8, 0xad, 0x1e, 0x9d, - 0xd8, 0x18, 0xc3, 0xe3, 0xe8, 0x4c, 0x18, 0x0b, 0x7a, 0xa8, 0x4c, 0x6a, 0x53, 0x25, 0xc9, 0x71, - 0x14, 0x22, 0xb1, 0x71, 0xb4, 0x4c, 0xe2, 0xdb, 0x73, 0x6c, 0x55, 0x5e, 0x45, 0x41, 0xde, 0x9e, - 0x5e, 0x8d, 0xdd, 0x9e, 0x08, 0xf2, 0x96, 0xe7, 0xec, 0x7d, 0xff, 0xf3, 0x59, 0x2a, 0xd3, 0x79, - 0x31, 0xe7, 0x7b, 0xb1, 0xb5, 0x0d, 0xe4, 0xfc, 0x3c, 0xd8, 0x88, 0xc5, 0x6d, 0x3b, 0xb6, 0x42, - 0xdb, 0x7a, 0x27, 0x74, 0x90, 0x4e, 0x8e, 0xb5, 0x2d, 0xa6, 0xbc, 0xf1, 0x1b, 0x76, 0xa7, 0xfd, - 0xfd, 0x5c, 0xda, 0x34, 0x1b, 0x5c, 0x59, 0xd0, 0x7c, 0x3f, 0x6a, 0xa0, 0x05, 0x9d, 0xc3, 0xfe, - 0xc6, 0xbc, 0x77, 0xfd, 0x4f, 0x8f, 0xed, 0xd4, 0x2f, 0xbd, 0xe3, 0x57, 0x16, 0xb4, 0x14, 0x59, - 0x79, 0xb5, 0xe7, 0x42, 0x83, 0xb4, 0x30, 0xe5, 0xdf, 0x12, 0x16, 0xbb, 0x71, 0x17, 0xc7, 0xe3, - 0x2d, 0x57, 0xf9, 0x68, 0xfe, 0xea, 0xb1, 0xbb, 0xcb, 0xe0, 0x71, 0x06, 0x93, 0x32, 0x94, 0x83, - 0x0d, 0x8c, 0x36, 0xac, 0x8b, 0xe3, 0xd1, 0x36, 0x4b, 0x96, 0x5f, 0x7c, 0x65, 0xca, 0x4c, 0xe7, - 0x8b, 0xaf, 0x52, 0xd7, 0xbd, 0xf8, 0x1a, 0x08, 0xd7, 0xec, 0x4f, 0x23, 0xc8, 0xb3, 0x74, 0x22, - 0xca, 0x3e, 0x29, 0x27, 0x00, 0x59, 0xb3, 0xcb, 0x50, 0xac, 0x66, 0x57, 0x59, 0x3c, 0x38, 0xb1, - 0x7a, 0x21, 0x52, 0x7b, 0xa2, 0xca, 0x2e, 0x25, 0x07, 0x27, 0x8d, 0xc6, 0x06, 0x67, 0xd7, 0x0a, - 0xbc, 0xdf, 0x11, 0x98, 0xf2, 0x45, 0xe7, 0x39, 0x72, 0xbf, 0xcb, 0x50, 0x6c, 0xbf, 0xab, 0x2c, - 0xee, 0xd1, 0x53, 0x99, 0xda, 0x7a, 0x18, 0x91, 0x3d, 0xda, 0xca, 0xb1, 0x1e, 0xc5, 0x54, 0x50, - 0x9a, 0x43, 0x95, 0x17, 0x59, 0xf5, 0xb0, 0xab, 0x6b, 0xf7, 0x7b, 0x55, 0x94, 0x45, 0x44, 0x96, - 0x66, 0x07, 0x1b, 0x2b, 0xcd, 0xce, 0x25, 0xb8, 0x34, 0xcb, 0xe0, 0xba, 0xc7, 0xa9, 0x57, 0x63, - 0xa5, 0x89, 0x20, 0xfc, 0x72, 0x78, 0x0a, 0x73, 0x65, 0xa1, 0xc9, 0x1e, 0x75, 0x97, 0x60, 0x20, - 0xf6, 0x72, 0x08, 0x39, 0x5c, 0x0d, 0xe7, 0x72, 0xaa, 0x02, 0x37, 0x7b, 0xe4, 0xc3, 0x23, 0x84, - 0x62, 0xd5, 0xb0, 0xca, 0x7a, 0x77, 0x7f, 0xf7, 0xd8, 0x87, 0x43, 0xad, 0x4a, 0xad, 0xda, 0xec, - 0x45, 0x02, 0xf2, 0x48, 0x14, 0xb3, 0xc4, 0x9e, 0xe7, 0x9c, 0x4c, 0x7f, 0x07, 0xec, 0xfc, 0x1f, - 0x6e, 0xb5, 0x26, 0xb8, 0xa8, 0x2a, 0x59, 0x98, 0x86, 0x9e, 0xd2, 0x17, 0xd5, 0x12, 0x14, 0xbd, - 0xa8, 0x56, 0xd8, 0xe0, 0xc6, 0x05, 0xd7, 0x03, 0xf7, 0xe8, 0xff, 0xb0, 0xc2, 0xbc, 0xee, 0xc6, - 0x21, 0xfc, 0x0c, 0x72, 0x7e, 0x47, 0x60, 0xca, 0x6b, 0x05, 0xa6, 0x3c, 0x16, 0x9d, 0xa7, 0x62, - 0xcf, 0x20, 0x02, 0xf6, 0x1e, 0xff, 0xed, 0xb1, 0x8f, 0xca, 0x3b, 0x19, 0xb5, 0xfb, 0x40, 0x4e, - 0xcb, 0xc9, 0x5a, 0xbf, 0x8b, 0x1e, 0x77, 0xdc, 0xe1, 0x1d, 0xbc, 0x0b, 0xe3, 0xbb, 0x6d, 0x97, - 0xe1, 0x2e, 0xc1, 0x27, 0x4e, 0x76, 0x09, 0x06, 0x62, 0x5d, 0x12, 0x72, 0xde, 0xc5, 0x8f, 0xec, - 0xd6, 0x13, 0x31, 0xb9, 0x2e, 0x72, 0x4e, 0x7d, 0xfd, 0xa8, 0x25, 0x67, 0xf6, 0xb3, 0x08, 0xe1, - 0x0c, 0x3e, 0xec, 0x71, 0xcd, 0x6e, 0x97, 0xd9, 0x55, 0x1a, 0x4e, 0xb4, 0x9a, 0x37, 0xd6, 0x3b, - 0x66, 0x6b, 0x48, 0xc5, 0x0e, 0x8e, 0x80, 0x5b, 0x9f, 0x4f, 0x0e, 0x7f, 0x39, 0x58, 0xa4, 0x16, - 0x8c, 0xd9, 0x4f, 0x55, 0xbf, 0xfe, 0xab, 0x3f, 0x53, 0xfd, 0x85, 0xed, 0x57, 0x5f, 0x98, 0xfa, - 0xd4, 0xf7, 0xa8, 0xcb, 0x5b, 0x95, 0x76, 0xf8, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0x75, - 0xbb, 0x5f, 0xca, 0x12, 0x00, 0x00, -} diff --git a/go/vt/proto/throttlerdata/throttlerdata.pb.go b/go/vt/proto/throttlerdata/throttlerdata.pb.go index 74788363a4..e80dc8c554 100644 --- a/go/vt/proto/throttlerdata/throttlerdata.pb.go +++ b/go/vt/proto/throttlerdata/throttlerdata.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: throttlerdata.proto -package throttlerdata // import "vitess.io/vitess/go/vt/proto/throttlerdata" +package throttlerdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // MaxRatesRequest is the payload for the MaxRates RPC. type MaxRatesRequest struct { @@ -29,16 +31,17 @@ func (m *MaxRatesRequest) Reset() { *m = MaxRatesRequest{} } func (m *MaxRatesRequest) String() string { return proto.CompactTextString(m) } func (*MaxRatesRequest) ProtoMessage() {} func (*MaxRatesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{0} + return fileDescriptor_b67db2b008a2453d, []int{0} } + func (m *MaxRatesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MaxRatesRequest.Unmarshal(m, b) } func (m *MaxRatesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MaxRatesRequest.Marshal(b, m, deterministic) } -func (dst *MaxRatesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MaxRatesRequest.Merge(dst, src) +func (m *MaxRatesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MaxRatesRequest.Merge(m, src) } func (m *MaxRatesRequest) XXX_Size() int { return xxx_messageInfo_MaxRatesRequest.Size(m) @@ -63,16 +66,17 @@ func (m *MaxRatesResponse) Reset() { *m = MaxRatesResponse{} } func (m *MaxRatesResponse) String() string { return proto.CompactTextString(m) } func (*MaxRatesResponse) ProtoMessage() {} func (*MaxRatesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{1} + return fileDescriptor_b67db2b008a2453d, []int{1} } + func (m *MaxRatesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MaxRatesResponse.Unmarshal(m, b) } func (m *MaxRatesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MaxRatesResponse.Marshal(b, m, deterministic) } -func (dst *MaxRatesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MaxRatesResponse.Merge(dst, src) +func (m *MaxRatesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MaxRatesResponse.Merge(m, src) } func (m *MaxRatesResponse) XXX_Size() int { return xxx_messageInfo_MaxRatesResponse.Size(m) @@ -102,16 +106,17 @@ func (m *SetMaxRateRequest) Reset() { *m = SetMaxRateRequest{} } func (m *SetMaxRateRequest) String() string { return proto.CompactTextString(m) } func (*SetMaxRateRequest) ProtoMessage() {} func (*SetMaxRateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{2} + return fileDescriptor_b67db2b008a2453d, []int{2} } + func (m *SetMaxRateRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMaxRateRequest.Unmarshal(m, b) } func (m *SetMaxRateRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetMaxRateRequest.Marshal(b, m, deterministic) } -func (dst *SetMaxRateRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetMaxRateRequest.Merge(dst, src) +func (m *SetMaxRateRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMaxRateRequest.Merge(m, src) } func (m *SetMaxRateRequest) XXX_Size() int { return xxx_messageInfo_SetMaxRateRequest.Size(m) @@ -142,16 +147,17 @@ func (m *SetMaxRateResponse) Reset() { *m = SetMaxRateResponse{} } func (m *SetMaxRateResponse) String() string { return proto.CompactTextString(m) } func (*SetMaxRateResponse) ProtoMessage() {} func (*SetMaxRateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{3} + return fileDescriptor_b67db2b008a2453d, []int{3} } + func (m *SetMaxRateResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SetMaxRateResponse.Unmarshal(m, b) } func (m *SetMaxRateResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SetMaxRateResponse.Marshal(b, m, deterministic) } -func (dst *SetMaxRateResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SetMaxRateResponse.Merge(dst, src) +func (m *SetMaxRateResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SetMaxRateResponse.Merge(m, src) } func (m *SetMaxRateResponse) XXX_Size() int { return xxx_messageInfo_SetMaxRateResponse.Size(m) @@ -259,16 +265,17 @@ func (m *Configuration) Reset() { *m = Configuration{} } func (m *Configuration) String() string { return proto.CompactTextString(m) } func (*Configuration) ProtoMessage() {} func (*Configuration) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{4} + return fileDescriptor_b67db2b008a2453d, []int{4} } + func (m *Configuration) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Configuration.Unmarshal(m, b) } func (m *Configuration) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Configuration.Marshal(b, m, deterministic) } -func (dst *Configuration) XXX_Merge(src proto.Message) { - xxx_messageInfo_Configuration.Merge(dst, src) +func (m *Configuration) XXX_Merge(src proto.Message) { + xxx_messageInfo_Configuration.Merge(m, src) } func (m *Configuration) XXX_Size() int { return xxx_messageInfo_Configuration.Size(m) @@ -391,16 +398,17 @@ func (m *GetConfigurationRequest) Reset() { *m = GetConfigurationRequest func (m *GetConfigurationRequest) String() string { return proto.CompactTextString(m) } func (*GetConfigurationRequest) ProtoMessage() {} func (*GetConfigurationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{5} + return fileDescriptor_b67db2b008a2453d, []int{5} } + func (m *GetConfigurationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetConfigurationRequest.Unmarshal(m, b) } func (m *GetConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetConfigurationRequest.Marshal(b, m, deterministic) } -func (dst *GetConfigurationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetConfigurationRequest.Merge(dst, src) +func (m *GetConfigurationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetConfigurationRequest.Merge(m, src) } func (m *GetConfigurationRequest) XXX_Size() int { return xxx_messageInfo_GetConfigurationRequest.Size(m) @@ -432,16 +440,17 @@ func (m *GetConfigurationResponse) Reset() { *m = GetConfigurationRespon func (m *GetConfigurationResponse) String() string { return proto.CompactTextString(m) } func (*GetConfigurationResponse) ProtoMessage() {} func (*GetConfigurationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{6} + return fileDescriptor_b67db2b008a2453d, []int{6} } + func (m *GetConfigurationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetConfigurationResponse.Unmarshal(m, b) } func (m *GetConfigurationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetConfigurationResponse.Marshal(b, m, deterministic) } -func (dst *GetConfigurationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetConfigurationResponse.Merge(dst, src) +func (m *GetConfigurationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetConfigurationResponse.Merge(m, src) } func (m *GetConfigurationResponse) XXX_Size() int { return xxx_messageInfo_GetConfigurationResponse.Size(m) @@ -478,16 +487,17 @@ func (m *UpdateConfigurationRequest) Reset() { *m = UpdateConfigurationR func (m *UpdateConfigurationRequest) String() string { return proto.CompactTextString(m) } func (*UpdateConfigurationRequest) ProtoMessage() {} func (*UpdateConfigurationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{7} + return fileDescriptor_b67db2b008a2453d, []int{7} } + func (m *UpdateConfigurationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateConfigurationRequest.Unmarshal(m, b) } func (m *UpdateConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateConfigurationRequest.Marshal(b, m, deterministic) } -func (dst *UpdateConfigurationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateConfigurationRequest.Merge(dst, src) +func (m *UpdateConfigurationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateConfigurationRequest.Merge(m, src) } func (m *UpdateConfigurationRequest) XXX_Size() int { return xxx_messageInfo_UpdateConfigurationRequest.Size(m) @@ -532,16 +542,17 @@ func (m *UpdateConfigurationResponse) Reset() { *m = UpdateConfiguration func (m *UpdateConfigurationResponse) String() string { return proto.CompactTextString(m) } func (*UpdateConfigurationResponse) ProtoMessage() {} func (*UpdateConfigurationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{8} + return fileDescriptor_b67db2b008a2453d, []int{8} } + func (m *UpdateConfigurationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateConfigurationResponse.Unmarshal(m, b) } func (m *UpdateConfigurationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateConfigurationResponse.Marshal(b, m, deterministic) } -func (dst *UpdateConfigurationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateConfigurationResponse.Merge(dst, src) +func (m *UpdateConfigurationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateConfigurationResponse.Merge(m, src) } func (m *UpdateConfigurationResponse) XXX_Size() int { return xxx_messageInfo_UpdateConfigurationResponse.Size(m) @@ -573,16 +584,17 @@ func (m *ResetConfigurationRequest) Reset() { *m = ResetConfigurationReq func (m *ResetConfigurationRequest) String() string { return proto.CompactTextString(m) } func (*ResetConfigurationRequest) ProtoMessage() {} func (*ResetConfigurationRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{9} + return fileDescriptor_b67db2b008a2453d, []int{9} } + func (m *ResetConfigurationRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResetConfigurationRequest.Unmarshal(m, b) } func (m *ResetConfigurationRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResetConfigurationRequest.Marshal(b, m, deterministic) } -func (dst *ResetConfigurationRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResetConfigurationRequest.Merge(dst, src) +func (m *ResetConfigurationRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResetConfigurationRequest.Merge(m, src) } func (m *ResetConfigurationRequest) XXX_Size() int { return xxx_messageInfo_ResetConfigurationRequest.Size(m) @@ -613,16 +625,17 @@ func (m *ResetConfigurationResponse) Reset() { *m = ResetConfigurationRe func (m *ResetConfigurationResponse) String() string { return proto.CompactTextString(m) } func (*ResetConfigurationResponse) ProtoMessage() {} func (*ResetConfigurationResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_throttlerdata_d10a8d735853021e, []int{10} + return fileDescriptor_b67db2b008a2453d, []int{10} } + func (m *ResetConfigurationResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResetConfigurationResponse.Unmarshal(m, b) } func (m *ResetConfigurationResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResetConfigurationResponse.Marshal(b, m, deterministic) } -func (dst *ResetConfigurationResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResetConfigurationResponse.Merge(dst, src) +func (m *ResetConfigurationResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResetConfigurationResponse.Merge(m, src) } func (m *ResetConfigurationResponse) XXX_Size() int { return xxx_messageInfo_ResetConfigurationResponse.Size(m) @@ -656,9 +669,9 @@ func init() { proto.RegisterType((*ResetConfigurationResponse)(nil), "throttlerdata.ResetConfigurationResponse") } -func init() { proto.RegisterFile("throttlerdata.proto", fileDescriptor_throttlerdata_d10a8d735853021e) } +func init() { proto.RegisterFile("throttlerdata.proto", fileDescriptor_b67db2b008a2453d) } -var fileDescriptor_throttlerdata_d10a8d735853021e = []byte{ +var fileDescriptor_b67db2b008a2453d = []byte{ // 734 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0x5f, 0x4f, 0x03, 0x45, 0x10, 0xcf, 0x51, 0x8a, 0x30, 0xa5, 0x40, 0x17, 0x84, 0xa3, 0x18, 0x53, 0x2f, 0x31, 0x36, 0x8d, diff --git a/go/vt/proto/throttlerservice/throttlerservice.pb.go b/go/vt/proto/throttlerservice/throttlerservice.pb.go index 988d592e40..a1fad7d258 100644 --- a/go/vt/proto/throttlerservice/throttlerservice.pb.go +++ b/go/vt/proto/throttlerservice/throttlerservice.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: throttlerservice.proto -package throttlerservice // import "vitess.io/vitess/go/vt/proto/throttlerservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import throttlerdata "vitess.io/vitess/go/vt/proto/throttlerdata" +package throttlerservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + throttlerdata "vitess.io/vitess/go/vt/proto/throttlerdata" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,29 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("throttlerservice.proto", fileDescriptor_33af55db6d07f810) } + +var fileDescriptor_33af55db6d07f810 = []byte{ + // 241 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x3d, 0x4b, 0xc4, 0x40, + 0x10, 0x86, 0x05, 0x41, 0x74, 0xaa, 0x63, 0x0f, 0x2c, 0xae, 0xf0, 0xab, 0x50, 0x4f, 0x30, 0x0b, + 0xfa, 0x0f, 0xb4, 0xb0, 0xba, 0x26, 0xa7, 0x8d, 0xdd, 0xea, 0x8d, 0x71, 0x51, 0x76, 0xe2, 0xce, + 0x24, 0xf8, 0xbf, 0xfd, 0x03, 0x42, 0xe2, 0xae, 0x64, 0xfc, 0xb8, 0x74, 0xe1, 0x7d, 0x9f, 0x7d, + 0x1f, 0x02, 0x03, 0xbb, 0xf2, 0x1c, 0x49, 0xe4, 0x15, 0x23, 0x63, 0x6c, 0xfd, 0x23, 0x16, 0x75, + 0x24, 0x21, 0x33, 0xd1, 0xf9, 0x6c, 0x9a, 0x93, 0x95, 0x13, 0xd7, 0x63, 0x17, 0x1f, 0x9b, 0xb0, + 0x73, 0x9b, 0x72, 0xb3, 0x80, 0xed, 0x85, 0x7b, 0x2f, 0x9d, 0x20, 0x9b, 0xbd, 0x62, 0xc8, 0xa7, + 0xa2, 0xc4, 0xb7, 0x06, 0x59, 0x66, 0xfb, 0x7f, 0xf6, 0x5c, 0x53, 0x60, 0x3c, 0xda, 0x30, 0x4b, + 0x80, 0x25, 0xca, 0x57, 0x61, 0x0e, 0xd4, 0x83, 0xef, 0x2a, 0x4d, 0x1e, 0xfe, 0x43, 0xe4, 0x51, + 0x84, 0xc9, 0x0d, 0xca, 0x35, 0x85, 0x27, 0x5f, 0x35, 0xd1, 0x89, 0xa7, 0x60, 0x8e, 0xd5, 0x43, + 0x0d, 0x24, 0xc1, 0xc9, 0x5a, 0x2e, 0x6b, 0x02, 0x4c, 0xef, 0xea, 0x95, 0x13, 0x1c, 0x9a, 0xe6, + 0x6a, 0xe1, 0x17, 0x26, 0xc9, 0xce, 0xc6, 0xa0, 0xd9, 0xf7, 0x02, 0xa6, 0x44, 0xd6, 0x3f, 0x76, + 0xaa, 0x36, 0x7e, 0x22, 0xc9, 0x36, 0x1f, 0x41, 0x26, 0xd9, 0x95, 0xbd, 0x3f, 0x6f, 0xbd, 0x20, + 0x73, 0xe1, 0xc9, 0xf6, 0x5f, 0xb6, 0x22, 0xdb, 0x8a, 0xed, 0xae, 0xc2, 0xea, 0xdb, 0x79, 0xd8, + 0xea, 0xf2, 0xcb, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0x64, 0xc0, 0xd9, 0x6e, 0x02, 0x00, + 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -131,6 +154,26 @@ type ThrottlerServer interface { ResetConfiguration(context.Context, *throttlerdata.ResetConfigurationRequest) (*throttlerdata.ResetConfigurationResponse, error) } +// UnimplementedThrottlerServer can be embedded to have forward compatible implementations. +type UnimplementedThrottlerServer struct { +} + +func (*UnimplementedThrottlerServer) MaxRates(ctx context.Context, req *throttlerdata.MaxRatesRequest) (*throttlerdata.MaxRatesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method MaxRates not implemented") +} +func (*UnimplementedThrottlerServer) SetMaxRate(ctx context.Context, req *throttlerdata.SetMaxRateRequest) (*throttlerdata.SetMaxRateResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SetMaxRate not implemented") +} +func (*UnimplementedThrottlerServer) GetConfiguration(ctx context.Context, req *throttlerdata.GetConfigurationRequest) (*throttlerdata.GetConfigurationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetConfiguration not implemented") +} +func (*UnimplementedThrottlerServer) UpdateConfiguration(ctx context.Context, req *throttlerdata.UpdateConfigurationRequest) (*throttlerdata.UpdateConfigurationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateConfiguration not implemented") +} +func (*UnimplementedThrottlerServer) ResetConfiguration(ctx context.Context, req *throttlerdata.ResetConfigurationRequest) (*throttlerdata.ResetConfigurationResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ResetConfiguration not implemented") +} + func RegisterThrottlerServer(s *grpc.Server, srv ThrottlerServer) { s.RegisterService(&_Throttler_serviceDesc, srv) } @@ -253,27 +296,3 @@ var _Throttler_serviceDesc = grpc.ServiceDesc{ Streams: []grpc.StreamDesc{}, Metadata: "throttlerservice.proto", } - -func init() { - proto.RegisterFile("throttlerservice.proto", fileDescriptor_throttlerservice_8b1d9f2a5de89835) -} - -var fileDescriptor_throttlerservice_8b1d9f2a5de89835 = []byte{ - // 241 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x3d, 0x4b, 0xc4, 0x40, - 0x10, 0x86, 0x05, 0x41, 0x74, 0xaa, 0x63, 0x0f, 0x2c, 0xae, 0xf0, 0xab, 0x50, 0x4f, 0x30, 0x0b, - 0xfa, 0x0f, 0xb4, 0xb0, 0xba, 0x26, 0xa7, 0x8d, 0xdd, 0xea, 0x8d, 0x71, 0x51, 0x76, 0xe2, 0xce, - 0x24, 0xf8, 0xbf, 0xfd, 0x03, 0x42, 0xe2, 0xae, 0x64, 0xfc, 0xb8, 0x74, 0xe1, 0x7d, 0x9f, 0x7d, - 0x1f, 0x02, 0x03, 0xbb, 0xf2, 0x1c, 0x49, 0xe4, 0x15, 0x23, 0x63, 0x6c, 0xfd, 0x23, 0x16, 0x75, - 0x24, 0x21, 0x33, 0xd1, 0xf9, 0x6c, 0x9a, 0x93, 0x95, 0x13, 0xd7, 0x63, 0x17, 0x1f, 0x9b, 0xb0, - 0x73, 0x9b, 0x72, 0xb3, 0x80, 0xed, 0x85, 0x7b, 0x2f, 0x9d, 0x20, 0x9b, 0xbd, 0x62, 0xc8, 0xa7, - 0xa2, 0xc4, 0xb7, 0x06, 0x59, 0x66, 0xfb, 0x7f, 0xf6, 0x5c, 0x53, 0x60, 0x3c, 0xda, 0x30, 0x4b, - 0x80, 0x25, 0xca, 0x57, 0x61, 0x0e, 0xd4, 0x83, 0xef, 0x2a, 0x4d, 0x1e, 0xfe, 0x43, 0xe4, 0x51, - 0x84, 0xc9, 0x0d, 0xca, 0x35, 0x85, 0x27, 0x5f, 0x35, 0xd1, 0x89, 0xa7, 0x60, 0x8e, 0xd5, 0x43, - 0x0d, 0x24, 0xc1, 0xc9, 0x5a, 0x2e, 0x6b, 0x02, 0x4c, 0xef, 0xea, 0x95, 0x13, 0x1c, 0x9a, 0xe6, - 0x6a, 0xe1, 0x17, 0x26, 0xc9, 0xce, 0xc6, 0xa0, 0xd9, 0xf7, 0x02, 0xa6, 0x44, 0xd6, 0x3f, 0x76, - 0xaa, 0x36, 0x7e, 0x22, 0xc9, 0x36, 0x1f, 0x41, 0x26, 0xd9, 0x95, 0xbd, 0x3f, 0x6f, 0xbd, 0x20, - 0x73, 0xe1, 0xc9, 0xf6, 0x5f, 0xb6, 0x22, 0xdb, 0x8a, 0xed, 0xae, 0xc2, 0xea, 0xdb, 0x79, 0xd8, - 0xea, 0xf2, 0xcb, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x49, 0x64, 0xc0, 0xd9, 0x6e, 0x02, 0x00, - 0x00, -} diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go index 9d59160d86..e3f8c175d0 100644 --- a/go/vt/proto/topodata/topodata.pb.go +++ b/go/vt/proto/topodata/topodata.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: topodata.proto -package topodata // import "vitess.io/vitess/go/vt/proto/topodata" +package topodata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // KeyspaceIdType describes the type of the sharding key for a // range-based sharded keyspace. @@ -38,6 +40,7 @@ var KeyspaceIdType_name = map[int32]string{ 1: "UINT64", 2: "BYTES", } + var KeyspaceIdType_value = map[string]int32{ "UNSET": 0, "UINT64": 1, @@ -47,8 +50,9 @@ var KeyspaceIdType_value = map[string]int32{ func (x KeyspaceIdType) String() string { return proto.EnumName(KeyspaceIdType_name, int32(x)) } + func (KeyspaceIdType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{0} + return fileDescriptor_52c350cb619f972e, []int{0} } // TabletType represents the type of a given tablet. @@ -100,6 +104,7 @@ var TabletType_name = map[int32]string{ 7: "RESTORE", 8: "DRAINED", } + var TabletType_value = map[string]int32{ "UNKNOWN": 0, "MASTER": 1, @@ -116,8 +121,9 @@ var TabletType_value = map[string]int32{ func (x TabletType) String() string { return proto.EnumName(TabletType_name, int32(x)) } + func (TabletType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{1} + return fileDescriptor_52c350cb619f972e, []int{1} } // KeyRange describes a range of sharding keys, when range-based @@ -134,16 +140,17 @@ func (m *KeyRange) Reset() { *m = KeyRange{} } func (m *KeyRange) String() string { return proto.CompactTextString(m) } func (*KeyRange) ProtoMessage() {} func (*KeyRange) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{0} + return fileDescriptor_52c350cb619f972e, []int{0} } + func (m *KeyRange) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_KeyRange.Unmarshal(m, b) } func (m *KeyRange) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_KeyRange.Marshal(b, m, deterministic) } -func (dst *KeyRange) XXX_Merge(src proto.Message) { - xxx_messageInfo_KeyRange.Merge(dst, src) +func (m *KeyRange) XXX_Merge(src proto.Message) { + xxx_messageInfo_KeyRange.Merge(m, src) } func (m *KeyRange) XXX_Size() int { return xxx_messageInfo_KeyRange.Size(m) @@ -184,16 +191,17 @@ func (m *TabletAlias) Reset() { *m = TabletAlias{} } func (m *TabletAlias) String() string { return proto.CompactTextString(m) } func (*TabletAlias) ProtoMessage() {} func (*TabletAlias) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{1} + return fileDescriptor_52c350cb619f972e, []int{1} } + func (m *TabletAlias) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_TabletAlias.Unmarshal(m, b) } func (m *TabletAlias) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_TabletAlias.Marshal(b, m, deterministic) } -func (dst *TabletAlias) XXX_Merge(src proto.Message) { - xxx_messageInfo_TabletAlias.Merge(dst, src) +func (m *TabletAlias) XXX_Merge(src proto.Message) { + xxx_messageInfo_TabletAlias.Merge(m, src) } func (m *TabletAlias) XXX_Size() int { return xxx_messageInfo_TabletAlias.Size(m) @@ -260,16 +268,17 @@ func (m *Tablet) Reset() { *m = Tablet{} } func (m *Tablet) String() string { return proto.CompactTextString(m) } func (*Tablet) ProtoMessage() {} func (*Tablet) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{2} + return fileDescriptor_52c350cb619f972e, []int{2} } + func (m *Tablet) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Tablet.Unmarshal(m, b) } func (m *Tablet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Tablet.Marshal(b, m, deterministic) } -func (dst *Tablet) XXX_Merge(src proto.Message) { - xxx_messageInfo_Tablet.Merge(dst, src) +func (m *Tablet) XXX_Merge(src proto.Message) { + xxx_messageInfo_Tablet.Merge(m, src) } func (m *Tablet) XXX_Size() int { return xxx_messageInfo_Tablet.Size(m) @@ -395,16 +404,17 @@ func (m *Shard) Reset() { *m = Shard{} } func (m *Shard) String() string { return proto.CompactTextString(m) } func (*Shard) ProtoMessage() {} func (*Shard) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{3} + return fileDescriptor_52c350cb619f972e, []int{3} } + func (m *Shard) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Shard.Unmarshal(m, b) } func (m *Shard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Shard.Marshal(b, m, deterministic) } -func (dst *Shard) XXX_Merge(src proto.Message) { - xxx_messageInfo_Shard.Merge(dst, src) +func (m *Shard) XXX_Merge(src proto.Message) { + xxx_messageInfo_Shard.Merge(m, src) } func (m *Shard) XXX_Size() int { return xxx_messageInfo_Shard.Size(m) @@ -470,16 +480,17 @@ func (m *Shard_ServedType) Reset() { *m = Shard_ServedType{} } func (m *Shard_ServedType) String() string { return proto.CompactTextString(m) } func (*Shard_ServedType) ProtoMessage() {} func (*Shard_ServedType) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{3, 0} + return fileDescriptor_52c350cb619f972e, []int{3, 0} } + func (m *Shard_ServedType) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Shard_ServedType.Unmarshal(m, b) } func (m *Shard_ServedType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Shard_ServedType.Marshal(b, m, deterministic) } -func (dst *Shard_ServedType) XXX_Merge(src proto.Message) { - xxx_messageInfo_Shard_ServedType.Merge(dst, src) +func (m *Shard_ServedType) XXX_Merge(src proto.Message) { + xxx_messageInfo_Shard_ServedType.Merge(m, src) } func (m *Shard_ServedType) XXX_Size() int { return xxx_messageInfo_Shard_ServedType.Size(m) @@ -527,16 +538,17 @@ func (m *Shard_SourceShard) Reset() { *m = Shard_SourceShard{} } func (m *Shard_SourceShard) String() string { return proto.CompactTextString(m) } func (*Shard_SourceShard) ProtoMessage() {} func (*Shard_SourceShard) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{3, 1} + return fileDescriptor_52c350cb619f972e, []int{3, 1} } + func (m *Shard_SourceShard) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Shard_SourceShard.Unmarshal(m, b) } func (m *Shard_SourceShard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Shard_SourceShard.Marshal(b, m, deterministic) } -func (dst *Shard_SourceShard) XXX_Merge(src proto.Message) { - xxx_messageInfo_Shard_SourceShard.Merge(dst, src) +func (m *Shard_SourceShard) XXX_Merge(src proto.Message) { + xxx_messageInfo_Shard_SourceShard.Merge(m, src) } func (m *Shard_SourceShard) XXX_Size() int { return xxx_messageInfo_Shard_SourceShard.Size(m) @@ -600,16 +612,17 @@ func (m *Shard_TabletControl) Reset() { *m = Shard_TabletControl{} } func (m *Shard_TabletControl) String() string { return proto.CompactTextString(m) } func (*Shard_TabletControl) ProtoMessage() {} func (*Shard_TabletControl) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{3, 2} + return fileDescriptor_52c350cb619f972e, []int{3, 2} } + func (m *Shard_TabletControl) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Shard_TabletControl.Unmarshal(m, b) } func (m *Shard_TabletControl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Shard_TabletControl.Marshal(b, m, deterministic) } -func (dst *Shard_TabletControl) XXX_Merge(src proto.Message) { - xxx_messageInfo_Shard_TabletControl.Merge(dst, src) +func (m *Shard_TabletControl) XXX_Merge(src proto.Message) { + xxx_messageInfo_Shard_TabletControl.Merge(m, src) } func (m *Shard_TabletControl) XXX_Size() int { return xxx_messageInfo_Shard_TabletControl.Size(m) @@ -668,16 +681,17 @@ func (m *Keyspace) Reset() { *m = Keyspace{} } func (m *Keyspace) String() string { return proto.CompactTextString(m) } func (*Keyspace) ProtoMessage() {} func (*Keyspace) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{4} + return fileDescriptor_52c350cb619f972e, []int{4} } + func (m *Keyspace) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Keyspace.Unmarshal(m, b) } func (m *Keyspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Keyspace.Marshal(b, m, deterministic) } -func (dst *Keyspace) XXX_Merge(src proto.Message) { - xxx_messageInfo_Keyspace.Merge(dst, src) +func (m *Keyspace) XXX_Merge(src proto.Message) { + xxx_messageInfo_Keyspace.Merge(m, src) } func (m *Keyspace) XXX_Size() int { return xxx_messageInfo_Keyspace.Size(m) @@ -727,16 +741,17 @@ func (m *Keyspace_ServedFrom) Reset() { *m = Keyspace_ServedFrom{} } func (m *Keyspace_ServedFrom) String() string { return proto.CompactTextString(m) } func (*Keyspace_ServedFrom) ProtoMessage() {} func (*Keyspace_ServedFrom) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{4, 0} + return fileDescriptor_52c350cb619f972e, []int{4, 0} } + func (m *Keyspace_ServedFrom) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Keyspace_ServedFrom.Unmarshal(m, b) } func (m *Keyspace_ServedFrom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Keyspace_ServedFrom.Marshal(b, m, deterministic) } -func (dst *Keyspace_ServedFrom) XXX_Merge(src proto.Message) { - xxx_messageInfo_Keyspace_ServedFrom.Merge(dst, src) +func (m *Keyspace_ServedFrom) XXX_Merge(src proto.Message) { + xxx_messageInfo_Keyspace_ServedFrom.Merge(m, src) } func (m *Keyspace_ServedFrom) XXX_Size() int { return xxx_messageInfo_Keyspace_ServedFrom.Size(m) @@ -783,16 +798,17 @@ func (m *ShardReplication) Reset() { *m = ShardReplication{} } func (m *ShardReplication) String() string { return proto.CompactTextString(m) } func (*ShardReplication) ProtoMessage() {} func (*ShardReplication) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{5} + return fileDescriptor_52c350cb619f972e, []int{5} } + func (m *ShardReplication) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShardReplication.Unmarshal(m, b) } func (m *ShardReplication) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShardReplication.Marshal(b, m, deterministic) } -func (dst *ShardReplication) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShardReplication.Merge(dst, src) +func (m *ShardReplication) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShardReplication.Merge(m, src) } func (m *ShardReplication) XXX_Size() int { return xxx_messageInfo_ShardReplication.Size(m) @@ -822,16 +838,17 @@ func (m *ShardReplication_Node) Reset() { *m = ShardReplication_Node{} } func (m *ShardReplication_Node) String() string { return proto.CompactTextString(m) } func (*ShardReplication_Node) ProtoMessage() {} func (*ShardReplication_Node) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{5, 0} + return fileDescriptor_52c350cb619f972e, []int{5, 0} } + func (m *ShardReplication_Node) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShardReplication_Node.Unmarshal(m, b) } func (m *ShardReplication_Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShardReplication_Node.Marshal(b, m, deterministic) } -func (dst *ShardReplication_Node) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShardReplication_Node.Merge(dst, src) +func (m *ShardReplication_Node) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShardReplication_Node.Merge(m, src) } func (m *ShardReplication_Node) XXX_Size() int { return xxx_messageInfo_ShardReplication_Node.Size(m) @@ -863,16 +880,17 @@ func (m *ShardReference) Reset() { *m = ShardReference{} } func (m *ShardReference) String() string { return proto.CompactTextString(m) } func (*ShardReference) ProtoMessage() {} func (*ShardReference) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{6} + return fileDescriptor_52c350cb619f972e, []int{6} } + func (m *ShardReference) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShardReference.Unmarshal(m, b) } func (m *ShardReference) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShardReference.Marshal(b, m, deterministic) } -func (dst *ShardReference) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShardReference.Merge(dst, src) +func (m *ShardReference) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShardReference.Merge(m, src) } func (m *ShardReference) XXX_Size() int { return xxx_messageInfo_ShardReference.Size(m) @@ -913,16 +931,17 @@ func (m *ShardTabletControl) Reset() { *m = ShardTabletControl{} } func (m *ShardTabletControl) String() string { return proto.CompactTextString(m) } func (*ShardTabletControl) ProtoMessage() {} func (*ShardTabletControl) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{7} + return fileDescriptor_52c350cb619f972e, []int{7} } + func (m *ShardTabletControl) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ShardTabletControl.Unmarshal(m, b) } func (m *ShardTabletControl) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ShardTabletControl.Marshal(b, m, deterministic) } -func (dst *ShardTabletControl) XXX_Merge(src proto.Message) { - xxx_messageInfo_ShardTabletControl.Merge(dst, src) +func (m *ShardTabletControl) XXX_Merge(src proto.Message) { + xxx_messageInfo_ShardTabletControl.Merge(m, src) } func (m *ShardTabletControl) XXX_Size() int { return xxx_messageInfo_ShardTabletControl.Size(m) @@ -971,16 +990,17 @@ func (m *SrvKeyspace) Reset() { *m = SrvKeyspace{} } func (m *SrvKeyspace) String() string { return proto.CompactTextString(m) } func (*SrvKeyspace) ProtoMessage() {} func (*SrvKeyspace) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{8} + return fileDescriptor_52c350cb619f972e, []int{8} } + func (m *SrvKeyspace) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SrvKeyspace.Unmarshal(m, b) } func (m *SrvKeyspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SrvKeyspace.Marshal(b, m, deterministic) } -func (dst *SrvKeyspace) XXX_Merge(src proto.Message) { - xxx_messageInfo_SrvKeyspace.Merge(dst, src) +func (m *SrvKeyspace) XXX_Merge(src proto.Message) { + xxx_messageInfo_SrvKeyspace.Merge(m, src) } func (m *SrvKeyspace) XXX_Size() int { return xxx_messageInfo_SrvKeyspace.Size(m) @@ -1035,16 +1055,17 @@ func (m *SrvKeyspace_KeyspacePartition) Reset() { *m = SrvKeyspace_Keysp func (m *SrvKeyspace_KeyspacePartition) String() string { return proto.CompactTextString(m) } func (*SrvKeyspace_KeyspacePartition) ProtoMessage() {} func (*SrvKeyspace_KeyspacePartition) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{8, 0} + return fileDescriptor_52c350cb619f972e, []int{8, 0} } + func (m *SrvKeyspace_KeyspacePartition) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SrvKeyspace_KeyspacePartition.Unmarshal(m, b) } func (m *SrvKeyspace_KeyspacePartition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SrvKeyspace_KeyspacePartition.Marshal(b, m, deterministic) } -func (dst *SrvKeyspace_KeyspacePartition) XXX_Merge(src proto.Message) { - xxx_messageInfo_SrvKeyspace_KeyspacePartition.Merge(dst, src) +func (m *SrvKeyspace_KeyspacePartition) XXX_Merge(src proto.Message) { + xxx_messageInfo_SrvKeyspace_KeyspacePartition.Merge(m, src) } func (m *SrvKeyspace_KeyspacePartition) XXX_Size() int { return xxx_messageInfo_SrvKeyspace_KeyspacePartition.Size(m) @@ -1092,16 +1113,17 @@ func (m *SrvKeyspace_ServedFrom) Reset() { *m = SrvKeyspace_ServedFrom{} func (m *SrvKeyspace_ServedFrom) String() string { return proto.CompactTextString(m) } func (*SrvKeyspace_ServedFrom) ProtoMessage() {} func (*SrvKeyspace_ServedFrom) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{8, 1} + return fileDescriptor_52c350cb619f972e, []int{8, 1} } + func (m *SrvKeyspace_ServedFrom) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SrvKeyspace_ServedFrom.Unmarshal(m, b) } func (m *SrvKeyspace_ServedFrom) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SrvKeyspace_ServedFrom.Marshal(b, m, deterministic) } -func (dst *SrvKeyspace_ServedFrom) XXX_Merge(src proto.Message) { - xxx_messageInfo_SrvKeyspace_ServedFrom.Merge(dst, src) +func (m *SrvKeyspace_ServedFrom) XXX_Merge(src proto.Message) { + xxx_messageInfo_SrvKeyspace_ServedFrom.Merge(m, src) } func (m *SrvKeyspace_ServedFrom) XXX_Size() int { return xxx_messageInfo_SrvKeyspace_ServedFrom.Size(m) @@ -1147,16 +1169,17 @@ func (m *CellInfo) Reset() { *m = CellInfo{} } func (m *CellInfo) String() string { return proto.CompactTextString(m) } func (*CellInfo) ProtoMessage() {} func (*CellInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{9} + return fileDescriptor_52c350cb619f972e, []int{9} } + func (m *CellInfo) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CellInfo.Unmarshal(m, b) } func (m *CellInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CellInfo.Marshal(b, m, deterministic) } -func (dst *CellInfo) XXX_Merge(src proto.Message) { - xxx_messageInfo_CellInfo.Merge(dst, src) +func (m *CellInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_CellInfo.Merge(m, src) } func (m *CellInfo) XXX_Size() int { return xxx_messageInfo_CellInfo.Size(m) @@ -1194,16 +1217,17 @@ func (m *CellsAlias) Reset() { *m = CellsAlias{} } func (m *CellsAlias) String() string { return proto.CompactTextString(m) } func (*CellsAlias) ProtoMessage() {} func (*CellsAlias) Descriptor() ([]byte, []int) { - return fileDescriptor_topodata_5ff7209b363fe950, []int{10} + return fileDescriptor_52c350cb619f972e, []int{10} } + func (m *CellsAlias) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CellsAlias.Unmarshal(m, b) } func (m *CellsAlias) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CellsAlias.Marshal(b, m, deterministic) } -func (dst *CellsAlias) XXX_Merge(src proto.Message) { - xxx_messageInfo_CellsAlias.Merge(dst, src) +func (m *CellsAlias) XXX_Merge(src proto.Message) { + xxx_messageInfo_CellsAlias.Merge(m, src) } func (m *CellsAlias) XXX_Size() int { return xxx_messageInfo_CellsAlias.Size(m) @@ -1222,6 +1246,8 @@ func (m *CellsAlias) GetCells() []string { } func init() { + proto.RegisterEnum("topodata.KeyspaceIdType", KeyspaceIdType_name, KeyspaceIdType_value) + proto.RegisterEnum("topodata.TabletType", TabletType_name, TabletType_value) proto.RegisterType((*KeyRange)(nil), "topodata.KeyRange") proto.RegisterType((*TabletAlias)(nil), "topodata.TabletAlias") proto.RegisterType((*Tablet)(nil), "topodata.Tablet") @@ -1242,13 +1268,11 @@ func init() { proto.RegisterType((*SrvKeyspace_ServedFrom)(nil), "topodata.SrvKeyspace.ServedFrom") proto.RegisterType((*CellInfo)(nil), "topodata.CellInfo") proto.RegisterType((*CellsAlias)(nil), "topodata.CellsAlias") - proto.RegisterEnum("topodata.KeyspaceIdType", KeyspaceIdType_name, KeyspaceIdType_value) - proto.RegisterEnum("topodata.TabletType", TabletType_name, TabletType_value) } -func init() { proto.RegisterFile("topodata.proto", fileDescriptor_topodata_5ff7209b363fe950) } +func init() { proto.RegisterFile("topodata.proto", fileDescriptor_52c350cb619f972e) } -var fileDescriptor_topodata_5ff7209b363fe950 = []byte{ +var fileDescriptor_52c350cb619f972e = []byte{ // 1218 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xe1, 0x6e, 0x1b, 0x45, 0x10, 0xe6, 0xec, 0xb3, 0x63, 0x8f, 0x1d, 0xe7, 0xba, 0xa4, 0xd5, 0xe9, 0xa0, 0x22, 0xb2, 0x54, diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go index d052ef272b..90fe411607 100644 --- a/go/vt/proto/vschema/vschema.pb.go +++ b/go/vt/proto/vschema/vschema.pb.go @@ -1,12 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vschema.proto -package vschema // import "vitess.io/vitess/go/vt/proto/vschema" +package vschema -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import query "vitess.io/vitess/go/vt/proto/query" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + query "vitess.io/vitess/go/vt/proto/query" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // RoutingRules specify the high level routing rules for the VSchema. type RoutingRules struct { @@ -34,16 +36,17 @@ func (m *RoutingRules) Reset() { *m = RoutingRules{} } func (m *RoutingRules) String() string { return proto.CompactTextString(m) } func (*RoutingRules) ProtoMessage() {} func (*RoutingRules) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{0} + return fileDescriptor_3f6849254fea3e77, []int{0} } + func (m *RoutingRules) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RoutingRules.Unmarshal(m, b) } func (m *RoutingRules) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RoutingRules.Marshal(b, m, deterministic) } -func (dst *RoutingRules) XXX_Merge(src proto.Message) { - xxx_messageInfo_RoutingRules.Merge(dst, src) +func (m *RoutingRules) XXX_Merge(src proto.Message) { + xxx_messageInfo_RoutingRules.Merge(m, src) } func (m *RoutingRules) XXX_Size() int { return xxx_messageInfo_RoutingRules.Size(m) @@ -74,16 +77,17 @@ func (m *RoutingRule) Reset() { *m = RoutingRule{} } func (m *RoutingRule) String() string { return proto.CompactTextString(m) } func (*RoutingRule) ProtoMessage() {} func (*RoutingRule) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{1} + return fileDescriptor_3f6849254fea3e77, []int{1} } + func (m *RoutingRule) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RoutingRule.Unmarshal(m, b) } func (m *RoutingRule) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RoutingRule.Marshal(b, m, deterministic) } -func (dst *RoutingRule) XXX_Merge(src proto.Message) { - xxx_messageInfo_RoutingRule.Merge(dst, src) +func (m *RoutingRule) XXX_Merge(src proto.Message) { + xxx_messageInfo_RoutingRule.Merge(m, src) } func (m *RoutingRule) XXX_Size() int { return xxx_messageInfo_RoutingRule.Size(m) @@ -123,16 +127,17 @@ func (m *Keyspace) Reset() { *m = Keyspace{} } func (m *Keyspace) String() string { return proto.CompactTextString(m) } func (*Keyspace) ProtoMessage() {} func (*Keyspace) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{2} + return fileDescriptor_3f6849254fea3e77, []int{2} } + func (m *Keyspace) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Keyspace.Unmarshal(m, b) } func (m *Keyspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Keyspace.Marshal(b, m, deterministic) } -func (dst *Keyspace) XXX_Merge(src proto.Message) { - xxx_messageInfo_Keyspace.Merge(dst, src) +func (m *Keyspace) XXX_Merge(src proto.Message) { + xxx_messageInfo_Keyspace.Merge(m, src) } func (m *Keyspace) XXX_Size() int { return xxx_messageInfo_Keyspace.Size(m) @@ -188,16 +193,17 @@ func (m *Vindex) Reset() { *m = Vindex{} } func (m *Vindex) String() string { return proto.CompactTextString(m) } func (*Vindex) ProtoMessage() {} func (*Vindex) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{3} + return fileDescriptor_3f6849254fea3e77, []int{3} } + func (m *Vindex) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Vindex.Unmarshal(m, b) } func (m *Vindex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Vindex.Marshal(b, m, deterministic) } -func (dst *Vindex) XXX_Merge(src proto.Message) { - xxx_messageInfo_Vindex.Merge(dst, src) +func (m *Vindex) XXX_Merge(src proto.Message) { + xxx_messageInfo_Vindex.Merge(m, src) } func (m *Vindex) XXX_Size() int { return xxx_messageInfo_Vindex.Size(m) @@ -259,16 +265,17 @@ func (m *Table) Reset() { *m = Table{} } func (m *Table) String() string { return proto.CompactTextString(m) } func (*Table) ProtoMessage() {} func (*Table) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{4} + return fileDescriptor_3f6849254fea3e77, []int{4} } + func (m *Table) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Table.Unmarshal(m, b) } func (m *Table) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Table.Marshal(b, m, deterministic) } -func (dst *Table) XXX_Merge(src proto.Message) { - xxx_messageInfo_Table.Merge(dst, src) +func (m *Table) XXX_Merge(src proto.Message) { + xxx_messageInfo_Table.Merge(m, src) } func (m *Table) XXX_Size() int { return xxx_messageInfo_Table.Size(m) @@ -338,16 +345,17 @@ func (m *ColumnVindex) Reset() { *m = ColumnVindex{} } func (m *ColumnVindex) String() string { return proto.CompactTextString(m) } func (*ColumnVindex) ProtoMessage() {} func (*ColumnVindex) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{5} + return fileDescriptor_3f6849254fea3e77, []int{5} } + func (m *ColumnVindex) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ColumnVindex.Unmarshal(m, b) } func (m *ColumnVindex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ColumnVindex.Marshal(b, m, deterministic) } -func (dst *ColumnVindex) XXX_Merge(src proto.Message) { - xxx_messageInfo_ColumnVindex.Merge(dst, src) +func (m *ColumnVindex) XXX_Merge(src proto.Message) { + xxx_messageInfo_ColumnVindex.Merge(m, src) } func (m *ColumnVindex) XXX_Size() int { return xxx_messageInfo_ColumnVindex.Size(m) @@ -393,16 +401,17 @@ func (m *AutoIncrement) Reset() { *m = AutoIncrement{} } func (m *AutoIncrement) String() string { return proto.CompactTextString(m) } func (*AutoIncrement) ProtoMessage() {} func (*AutoIncrement) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{6} + return fileDescriptor_3f6849254fea3e77, []int{6} } + func (m *AutoIncrement) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_AutoIncrement.Unmarshal(m, b) } func (m *AutoIncrement) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_AutoIncrement.Marshal(b, m, deterministic) } -func (dst *AutoIncrement) XXX_Merge(src proto.Message) { - xxx_messageInfo_AutoIncrement.Merge(dst, src) +func (m *AutoIncrement) XXX_Merge(src proto.Message) { + xxx_messageInfo_AutoIncrement.Merge(m, src) } func (m *AutoIncrement) XXX_Size() int { return xxx_messageInfo_AutoIncrement.Size(m) @@ -440,16 +449,17 @@ func (m *Column) Reset() { *m = Column{} } func (m *Column) String() string { return proto.CompactTextString(m) } func (*Column) ProtoMessage() {} func (*Column) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{7} + return fileDescriptor_3f6849254fea3e77, []int{7} } + func (m *Column) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Column.Unmarshal(m, b) } func (m *Column) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Column.Marshal(b, m, deterministic) } -func (dst *Column) XXX_Merge(src proto.Message) { - xxx_messageInfo_Column.Merge(dst, src) +func (m *Column) XXX_Merge(src proto.Message) { + xxx_messageInfo_Column.Merge(m, src) } func (m *Column) XXX_Size() int { return xxx_messageInfo_Column.Size(m) @@ -488,16 +498,17 @@ func (m *SrvVSchema) Reset() { *m = SrvVSchema{} } func (m *SrvVSchema) String() string { return proto.CompactTextString(m) } func (*SrvVSchema) ProtoMessage() {} func (*SrvVSchema) Descriptor() ([]byte, []int) { - return fileDescriptor_vschema_13414422c846e850, []int{8} + return fileDescriptor_3f6849254fea3e77, []int{8} } + func (m *SrvVSchema) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SrvVSchema.Unmarshal(m, b) } func (m *SrvVSchema) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SrvVSchema.Marshal(b, m, deterministic) } -func (dst *SrvVSchema) XXX_Merge(src proto.Message) { - xxx_messageInfo_SrvVSchema.Merge(dst, src) +func (m *SrvVSchema) XXX_Merge(src proto.Message) { + xxx_messageInfo_SrvVSchema.Merge(m, src) } func (m *SrvVSchema) XXX_Size() int { return xxx_messageInfo_SrvVSchema.Size(m) @@ -538,9 +549,9 @@ func init() { proto.RegisterMapType((map[string]*Keyspace)(nil), "vschema.SrvVSchema.KeyspacesEntry") } -func init() { proto.RegisterFile("vschema.proto", fileDescriptor_vschema_13414422c846e850) } +func init() { proto.RegisterFile("vschema.proto", fileDescriptor_3f6849254fea3e77) } -var fileDescriptor_vschema_13414422c846e850 = []byte{ +var fileDescriptor_3f6849254fea3e77 = []byte{ // 643 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x6e, 0xd3, 0x30, 0x14, 0x56, 0xda, 0x35, 0x6b, 0x4f, 0xd6, 0x0e, 0xac, 0x6d, 0x84, 0x4e, 0xd3, 0xaa, 0x68, 0x40, diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go index 6f3860b8ef..641589e481 100644 --- a/go/vt/proto/vtctldata/vtctldata.pb.go +++ b/go/vt/proto/vtctldata/vtctldata.pb.go @@ -1,12 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtctldata.proto -package vtctldata // import "vitess.io/vitess/go/vt/proto/vtctldata" +package vtctldata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import logutil "vitess.io/vitess/go/vt/proto/logutil" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + logutil "vitess.io/vitess/go/vt/proto/logutil" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // ExecuteVtctlCommandRequest is the payload for ExecuteVtctlCommand. // timeouts are in nanoseconds. @@ -33,16 +35,17 @@ func (m *ExecuteVtctlCommandRequest) Reset() { *m = ExecuteVtctlCommandR func (m *ExecuteVtctlCommandRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteVtctlCommandRequest) ProtoMessage() {} func (*ExecuteVtctlCommandRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtctldata_116d6c451a061272, []int{0} + return fileDescriptor_f41247b323a1ab2e, []int{0} } + func (m *ExecuteVtctlCommandRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteVtctlCommandRequest.Unmarshal(m, b) } func (m *ExecuteVtctlCommandRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteVtctlCommandRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteVtctlCommandRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteVtctlCommandRequest.Merge(dst, src) +func (m *ExecuteVtctlCommandRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteVtctlCommandRequest.Merge(m, src) } func (m *ExecuteVtctlCommandRequest) XXX_Size() int { return xxx_messageInfo_ExecuteVtctlCommandRequest.Size(m) @@ -79,16 +82,17 @@ func (m *ExecuteVtctlCommandResponse) Reset() { *m = ExecuteVtctlCommand func (m *ExecuteVtctlCommandResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteVtctlCommandResponse) ProtoMessage() {} func (*ExecuteVtctlCommandResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtctldata_116d6c451a061272, []int{1} + return fileDescriptor_f41247b323a1ab2e, []int{1} } + func (m *ExecuteVtctlCommandResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteVtctlCommandResponse.Unmarshal(m, b) } func (m *ExecuteVtctlCommandResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteVtctlCommandResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteVtctlCommandResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteVtctlCommandResponse.Merge(dst, src) +func (m *ExecuteVtctlCommandResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteVtctlCommandResponse.Merge(m, src) } func (m *ExecuteVtctlCommandResponse) XXX_Size() int { return xxx_messageInfo_ExecuteVtctlCommandResponse.Size(m) @@ -111,9 +115,9 @@ func init() { proto.RegisterType((*ExecuteVtctlCommandResponse)(nil), "vtctldata.ExecuteVtctlCommandResponse") } -func init() { proto.RegisterFile("vtctldata.proto", fileDescriptor_vtctldata_116d6c451a061272) } +func init() { proto.RegisterFile("vtctldata.proto", fileDescriptor_f41247b323a1ab2e) } -var fileDescriptor_vtctldata_116d6c451a061272 = []byte{ +var fileDescriptor_f41247b323a1ab2e = []byte{ // 200 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0xcf, 0xd1, 0x4a, 0x87, 0x30, 0x14, 0x06, 0x70, 0xd6, 0xbf, 0x82, 0xff, 0x42, 0x83, 0x5d, 0x89, 0xdd, 0x88, 0x54, 0xec, 0xca, diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go index 9dd938fd48..22e8102d6f 100644 --- a/go/vt/proto/vtctlservice/vtctlservice.pb.go +++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtctlservice.proto -package vtctlservice // import "vitess.io/vitess/go/vt/proto/vtctlservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import vtctldata "vitess.io/vitess/go/vt/proto/vtctldata" +package vtctlservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + vtctldata "vitess.io/vitess/go/vt/proto/vtctldata" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,23 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("vtctlservice.proto", fileDescriptor_27055cdbb1148d2b) } + +var fileDescriptor_27055cdbb1148d2b = []byte{ + // 146 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, 0x4e, 0xda, 0x51, 0x9a, 0x65, 0x99, 0x25, 0xa9, 0xc5, 0xc5, 0x7a, 0x99, 0xf9, + 0xfa, 0x10, 0x96, 0x7e, 0x7a, 0xbe, 0x7e, 0x59, 0x89, 0x3e, 0xd8, 0x49, 0xfa, 0xc8, 0x0e, 0x4e, + 0x62, 0x03, 0x8b, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9d, 0xb5, 0x06, 0x92, 0xdb, 0x00, + 0x00, 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -84,6 +101,14 @@ type VtctlServer interface { ExecuteVtctlCommand(*vtctldata.ExecuteVtctlCommandRequest, Vtctl_ExecuteVtctlCommandServer) error } +// UnimplementedVtctlServer can be embedded to have forward compatible implementations. +type UnimplementedVtctlServer struct { +} + +func (*UnimplementedVtctlServer) ExecuteVtctlCommand(req *vtctldata.ExecuteVtctlCommandRequest, srv Vtctl_ExecuteVtctlCommandServer) error { + return status.Errorf(codes.Unimplemented, "method ExecuteVtctlCommand not implemented") +} + func RegisterVtctlServer(s *grpc.Server, srv VtctlServer) { s.RegisterService(&_Vtctl_serviceDesc, srv) } @@ -122,19 +147,3 @@ var _Vtctl_serviceDesc = grpc.ServiceDesc{ }, Metadata: "vtctlservice.proto", } - -func init() { proto.RegisterFile("vtctlservice.proto", fileDescriptor_vtctlservice_af4114a311e29c50) } - -var fileDescriptor_vtctlservice_af4114a311e29c50 = []byte{ - // 146 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, 0x4e, 0xda, 0x51, 0x9a, 0x65, 0x99, 0x25, 0xa9, 0xc5, 0xc5, 0x7a, 0x99, 0xf9, - 0xfa, 0x10, 0x96, 0x7e, 0x7a, 0xbe, 0x7e, 0x59, 0x89, 0x3e, 0xd8, 0x49, 0xfa, 0xc8, 0x0e, 0x4e, - 0x62, 0x03, 0x8b, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9d, 0xb5, 0x06, 0x92, 0xdb, 0x00, - 0x00, 0x00, -} diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go index fdfcd7e51e..816d676f73 100644 --- a/go/vt/proto/vtgate/vtgate.pb.go +++ b/go/vt/proto/vtgate/vtgate.pb.go @@ -1,15 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtgate.proto -package vtgate // import "vitess.io/vitess/go/vt/proto/vtgate" +package vtgate -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" -import query "vitess.io/vitess/go/vt/proto/query" -import topodata "vitess.io/vitess/go/vt/proto/topodata" -import vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" + query "vitess.io/vitess/go/vt/proto/query" + topodata "vitess.io/vitess/go/vt/proto/topodata" + vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -20,7 +22,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // TransactionMode controls the execution of distributed transaction // across multiple shards. @@ -43,6 +45,7 @@ var TransactionMode_name = map[int32]string{ 2: "MULTI", 3: "TWOPC", } + var TransactionMode_value = map[string]int32{ "UNSPECIFIED": 0, "SINGLE": 1, @@ -53,8 +56,9 @@ var TransactionMode_value = map[string]int32{ func (x TransactionMode) String() string { return proto.EnumName(TransactionMode_name, int32(x)) } + func (TransactionMode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{0} + return fileDescriptor_aab96496ceaf1ebb, []int{0} } // CommitOrder is used to designate which of the ShardSessions @@ -78,6 +82,7 @@ var CommitOrder_name = map[int32]string{ 2: "POST", 3: "AUTOCOMMIT", } + var CommitOrder_value = map[string]int32{ "NORMAL": 0, "PRE": 1, @@ -88,8 +93,9 @@ var CommitOrder_value = map[string]int32{ func (x CommitOrder) String() string { return proto.EnumName(CommitOrder_name, int32(x)) } + func (CommitOrder) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{1} + return fileDescriptor_aab96496ceaf1ebb, []int{1} } // Session objects are exchanged like cookies through various @@ -138,16 +144,17 @@ func (m *Session) Reset() { *m = Session{} } func (m *Session) String() string { return proto.CompactTextString(m) } func (*Session) ProtoMessage() {} func (*Session) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{0} + return fileDescriptor_aab96496ceaf1ebb, []int{0} } + func (m *Session) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Session.Unmarshal(m, b) } func (m *Session) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Session.Marshal(b, m, deterministic) } -func (dst *Session) XXX_Merge(src proto.Message) { - xxx_messageInfo_Session.Merge(dst, src) +func (m *Session) XXX_Merge(src proto.Message) { + xxx_messageInfo_Session.Merge(m, src) } func (m *Session) XXX_Size() int { return xxx_messageInfo_Session.Size(m) @@ -240,16 +247,17 @@ func (m *Session_ShardSession) Reset() { *m = Session_ShardSession{} } func (m *Session_ShardSession) String() string { return proto.CompactTextString(m) } func (*Session_ShardSession) ProtoMessage() {} func (*Session_ShardSession) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{0, 0} + return fileDescriptor_aab96496ceaf1ebb, []int{0, 0} } + func (m *Session_ShardSession) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Session_ShardSession.Unmarshal(m, b) } func (m *Session_ShardSession) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Session_ShardSession.Marshal(b, m, deterministic) } -func (dst *Session_ShardSession) XXX_Merge(src proto.Message) { - xxx_messageInfo_Session_ShardSession.Merge(dst, src) +func (m *Session_ShardSession) XXX_Merge(src proto.Message) { + xxx_messageInfo_Session_ShardSession.Merge(m, src) } func (m *Session_ShardSession) XXX_Size() int { return xxx_messageInfo_Session_ShardSession.Size(m) @@ -298,16 +306,17 @@ func (m *ExecuteRequest) Reset() { *m = ExecuteRequest{} } func (m *ExecuteRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteRequest) ProtoMessage() {} func (*ExecuteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{1} + return fileDescriptor_aab96496ceaf1ebb, []int{1} } + func (m *ExecuteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteRequest.Unmarshal(m, b) } func (m *ExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteRequest.Merge(dst, src) +func (m *ExecuteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteRequest.Merge(m, src) } func (m *ExecuteRequest) XXX_Size() int { return xxx_messageInfo_ExecuteRequest.Size(m) @@ -386,16 +395,17 @@ func (m *ExecuteResponse) Reset() { *m = ExecuteResponse{} } func (m *ExecuteResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteResponse) ProtoMessage() {} func (*ExecuteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{2} + return fileDescriptor_aab96496ceaf1ebb, []int{2} } + func (m *ExecuteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteResponse.Unmarshal(m, b) } func (m *ExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteResponse.Merge(dst, src) +func (m *ExecuteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteResponse.Merge(m, src) } func (m *ExecuteResponse) XXX_Size() int { return xxx_messageInfo_ExecuteResponse.Size(m) @@ -456,16 +466,17 @@ func (m *ExecuteShardsRequest) Reset() { *m = ExecuteShardsRequest{} } func (m *ExecuteShardsRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteShardsRequest) ProtoMessage() {} func (*ExecuteShardsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{3} + return fileDescriptor_aab96496ceaf1ebb, []int{3} } + func (m *ExecuteShardsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteShardsRequest.Unmarshal(m, b) } func (m *ExecuteShardsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteShardsRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteShardsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteShardsRequest.Merge(dst, src) +func (m *ExecuteShardsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteShardsRequest.Merge(m, src) } func (m *ExecuteShardsRequest) XXX_Size() int { return xxx_messageInfo_ExecuteShardsRequest.Size(m) @@ -551,16 +562,17 @@ func (m *ExecuteShardsResponse) Reset() { *m = ExecuteShardsResponse{} } func (m *ExecuteShardsResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteShardsResponse) ProtoMessage() {} func (*ExecuteShardsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{4} + return fileDescriptor_aab96496ceaf1ebb, []int{4} } + func (m *ExecuteShardsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteShardsResponse.Unmarshal(m, b) } func (m *ExecuteShardsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteShardsResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteShardsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteShardsResponse.Merge(dst, src) +func (m *ExecuteShardsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteShardsResponse.Merge(m, src) } func (m *ExecuteShardsResponse) XXX_Size() int { return xxx_messageInfo_ExecuteShardsResponse.Size(m) @@ -622,16 +634,17 @@ func (m *ExecuteKeyspaceIdsRequest) Reset() { *m = ExecuteKeyspaceIdsReq func (m *ExecuteKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteKeyspaceIdsRequest) ProtoMessage() {} func (*ExecuteKeyspaceIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{5} + return fileDescriptor_aab96496ceaf1ebb, []int{5} } + func (m *ExecuteKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteKeyspaceIdsRequest.Unmarshal(m, b) } func (m *ExecuteKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteKeyspaceIdsRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteKeyspaceIdsRequest.Merge(dst, src) +func (m *ExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteKeyspaceIdsRequest.Merge(m, src) } func (m *ExecuteKeyspaceIdsRequest) XXX_Size() int { return xxx_messageInfo_ExecuteKeyspaceIdsRequest.Size(m) @@ -717,16 +730,17 @@ func (m *ExecuteKeyspaceIdsResponse) Reset() { *m = ExecuteKeyspaceIdsRe func (m *ExecuteKeyspaceIdsResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteKeyspaceIdsResponse) ProtoMessage() {} func (*ExecuteKeyspaceIdsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{6} + return fileDescriptor_aab96496ceaf1ebb, []int{6} } + func (m *ExecuteKeyspaceIdsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteKeyspaceIdsResponse.Unmarshal(m, b) } func (m *ExecuteKeyspaceIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteKeyspaceIdsResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteKeyspaceIdsResponse.Merge(dst, src) +func (m *ExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteKeyspaceIdsResponse.Merge(m, src) } func (m *ExecuteKeyspaceIdsResponse) XXX_Size() int { return xxx_messageInfo_ExecuteKeyspaceIdsResponse.Size(m) @@ -788,16 +802,17 @@ func (m *ExecuteKeyRangesRequest) Reset() { *m = ExecuteKeyRangesRequest func (m *ExecuteKeyRangesRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteKeyRangesRequest) ProtoMessage() {} func (*ExecuteKeyRangesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{7} + return fileDescriptor_aab96496ceaf1ebb, []int{7} } + func (m *ExecuteKeyRangesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteKeyRangesRequest.Unmarshal(m, b) } func (m *ExecuteKeyRangesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteKeyRangesRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteKeyRangesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteKeyRangesRequest.Merge(dst, src) +func (m *ExecuteKeyRangesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteKeyRangesRequest.Merge(m, src) } func (m *ExecuteKeyRangesRequest) XXX_Size() int { return xxx_messageInfo_ExecuteKeyRangesRequest.Size(m) @@ -883,16 +898,17 @@ func (m *ExecuteKeyRangesResponse) Reset() { *m = ExecuteKeyRangesRespon func (m *ExecuteKeyRangesResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteKeyRangesResponse) ProtoMessage() {} func (*ExecuteKeyRangesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{8} + return fileDescriptor_aab96496ceaf1ebb, []int{8} } + func (m *ExecuteKeyRangesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteKeyRangesResponse.Unmarshal(m, b) } func (m *ExecuteKeyRangesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteKeyRangesResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteKeyRangesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteKeyRangesResponse.Merge(dst, src) +func (m *ExecuteKeyRangesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteKeyRangesResponse.Merge(m, src) } func (m *ExecuteKeyRangesResponse) XXX_Size() int { return xxx_messageInfo_ExecuteKeyRangesResponse.Size(m) @@ -956,16 +972,17 @@ func (m *ExecuteEntityIdsRequest) Reset() { *m = ExecuteEntityIdsRequest func (m *ExecuteEntityIdsRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteEntityIdsRequest) ProtoMessage() {} func (*ExecuteEntityIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{9} + return fileDescriptor_aab96496ceaf1ebb, []int{9} } + func (m *ExecuteEntityIdsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteEntityIdsRequest.Unmarshal(m, b) } func (m *ExecuteEntityIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteEntityIdsRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteEntityIdsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteEntityIdsRequest.Merge(dst, src) +func (m *ExecuteEntityIdsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteEntityIdsRequest.Merge(m, src) } func (m *ExecuteEntityIdsRequest) XXX_Size() int { return xxx_messageInfo_ExecuteEntityIdsRequest.Size(m) @@ -1055,16 +1072,17 @@ func (m *ExecuteEntityIdsRequest_EntityId) Reset() { *m = ExecuteEntityI func (m *ExecuteEntityIdsRequest_EntityId) String() string { return proto.CompactTextString(m) } func (*ExecuteEntityIdsRequest_EntityId) ProtoMessage() {} func (*ExecuteEntityIdsRequest_EntityId) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{9, 0} + return fileDescriptor_aab96496ceaf1ebb, []int{9, 0} } + func (m *ExecuteEntityIdsRequest_EntityId) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Unmarshal(m, b) } func (m *ExecuteEntityIdsRequest_EntityId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Marshal(b, m, deterministic) } -func (dst *ExecuteEntityIdsRequest_EntityId) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Merge(dst, src) +func (m *ExecuteEntityIdsRequest_EntityId) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Merge(m, src) } func (m *ExecuteEntityIdsRequest_EntityId) XXX_Size() int { return xxx_messageInfo_ExecuteEntityIdsRequest_EntityId.Size(m) @@ -1115,16 +1133,17 @@ func (m *ExecuteEntityIdsResponse) Reset() { *m = ExecuteEntityIdsRespon func (m *ExecuteEntityIdsResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteEntityIdsResponse) ProtoMessage() {} func (*ExecuteEntityIdsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{10} + return fileDescriptor_aab96496ceaf1ebb, []int{10} } + func (m *ExecuteEntityIdsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteEntityIdsResponse.Unmarshal(m, b) } func (m *ExecuteEntityIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteEntityIdsResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteEntityIdsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteEntityIdsResponse.Merge(dst, src) +func (m *ExecuteEntityIdsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteEntityIdsResponse.Merge(m, src) } func (m *ExecuteEntityIdsResponse) XXX_Size() int { return xxx_messageInfo_ExecuteEntityIdsResponse.Size(m) @@ -1180,16 +1199,17 @@ func (m *ExecuteBatchRequest) Reset() { *m = ExecuteBatchRequest{} } func (m *ExecuteBatchRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchRequest) ProtoMessage() {} func (*ExecuteBatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{11} + return fileDescriptor_aab96496ceaf1ebb, []int{11} } + func (m *ExecuteBatchRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchRequest.Unmarshal(m, b) } func (m *ExecuteBatchRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchRequest.Merge(dst, src) +func (m *ExecuteBatchRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchRequest.Merge(m, src) } func (m *ExecuteBatchRequest) XXX_Size() int { return xxx_messageInfo_ExecuteBatchRequest.Size(m) @@ -1268,16 +1288,17 @@ func (m *ExecuteBatchResponse) Reset() { *m = ExecuteBatchResponse{} } func (m *ExecuteBatchResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchResponse) ProtoMessage() {} func (*ExecuteBatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{12} + return fileDescriptor_aab96496ceaf1ebb, []int{12} } + func (m *ExecuteBatchResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchResponse.Unmarshal(m, b) } func (m *ExecuteBatchResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchResponse.Merge(dst, src) +func (m *ExecuteBatchResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchResponse.Merge(m, src) } func (m *ExecuteBatchResponse) XXX_Size() int { return xxx_messageInfo_ExecuteBatchResponse.Size(m) @@ -1328,16 +1349,17 @@ func (m *BoundShardQuery) Reset() { *m = BoundShardQuery{} } func (m *BoundShardQuery) String() string { return proto.CompactTextString(m) } func (*BoundShardQuery) ProtoMessage() {} func (*BoundShardQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{13} + return fileDescriptor_aab96496ceaf1ebb, []int{13} } + func (m *BoundShardQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BoundShardQuery.Unmarshal(m, b) } func (m *BoundShardQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BoundShardQuery.Marshal(b, m, deterministic) } -func (dst *BoundShardQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_BoundShardQuery.Merge(dst, src) +func (m *BoundShardQuery) XXX_Merge(src proto.Message) { + xxx_messageInfo_BoundShardQuery.Merge(m, src) } func (m *BoundShardQuery) XXX_Size() int { return xxx_messageInfo_BoundShardQuery.Size(m) @@ -1396,16 +1418,17 @@ func (m *ExecuteBatchShardsRequest) Reset() { *m = ExecuteBatchShardsReq func (m *ExecuteBatchShardsRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchShardsRequest) ProtoMessage() {} func (*ExecuteBatchShardsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{14} + return fileDescriptor_aab96496ceaf1ebb, []int{14} } + func (m *ExecuteBatchShardsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchShardsRequest.Unmarshal(m, b) } func (m *ExecuteBatchShardsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchShardsRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchShardsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchShardsRequest.Merge(dst, src) +func (m *ExecuteBatchShardsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchShardsRequest.Merge(m, src) } func (m *ExecuteBatchShardsRequest) XXX_Size() int { return xxx_messageInfo_ExecuteBatchShardsRequest.Size(m) @@ -1477,16 +1500,17 @@ func (m *ExecuteBatchShardsResponse) Reset() { *m = ExecuteBatchShardsRe func (m *ExecuteBatchShardsResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchShardsResponse) ProtoMessage() {} func (*ExecuteBatchShardsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{15} + return fileDescriptor_aab96496ceaf1ebb, []int{15} } + func (m *ExecuteBatchShardsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchShardsResponse.Unmarshal(m, b) } func (m *ExecuteBatchShardsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchShardsResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchShardsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchShardsResponse.Merge(dst, src) +func (m *ExecuteBatchShardsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchShardsResponse.Merge(m, src) } func (m *ExecuteBatchShardsResponse) XXX_Size() int { return xxx_messageInfo_ExecuteBatchShardsResponse.Size(m) @@ -1538,16 +1562,17 @@ func (m *BoundKeyspaceIdQuery) Reset() { *m = BoundKeyspaceIdQuery{} } func (m *BoundKeyspaceIdQuery) String() string { return proto.CompactTextString(m) } func (*BoundKeyspaceIdQuery) ProtoMessage() {} func (*BoundKeyspaceIdQuery) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{16} + return fileDescriptor_aab96496ceaf1ebb, []int{16} } + func (m *BoundKeyspaceIdQuery) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BoundKeyspaceIdQuery.Unmarshal(m, b) } func (m *BoundKeyspaceIdQuery) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BoundKeyspaceIdQuery.Marshal(b, m, deterministic) } -func (dst *BoundKeyspaceIdQuery) XXX_Merge(src proto.Message) { - xxx_messageInfo_BoundKeyspaceIdQuery.Merge(dst, src) +func (m *BoundKeyspaceIdQuery) XXX_Merge(src proto.Message) { + xxx_messageInfo_BoundKeyspaceIdQuery.Merge(m, src) } func (m *BoundKeyspaceIdQuery) XXX_Size() int { return xxx_messageInfo_BoundKeyspaceIdQuery.Size(m) @@ -1605,16 +1630,17 @@ func (m *ExecuteBatchKeyspaceIdsRequest) Reset() { *m = ExecuteBatchKeys func (m *ExecuteBatchKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchKeyspaceIdsRequest) ProtoMessage() {} func (*ExecuteBatchKeyspaceIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{17} + return fileDescriptor_aab96496ceaf1ebb, []int{17} } + func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Unmarshal(m, b) } func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchKeyspaceIdsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Merge(dst, src) +func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Merge(m, src) } func (m *ExecuteBatchKeyspaceIdsRequest) XXX_Size() int { return xxx_messageInfo_ExecuteBatchKeyspaceIdsRequest.Size(m) @@ -1686,16 +1712,17 @@ func (m *ExecuteBatchKeyspaceIdsResponse) Reset() { *m = ExecuteBatchKey func (m *ExecuteBatchKeyspaceIdsResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteBatchKeyspaceIdsResponse) ProtoMessage() {} func (*ExecuteBatchKeyspaceIdsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{18} + return fileDescriptor_aab96496ceaf1ebb, []int{18} } + func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Unmarshal(m, b) } func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteBatchKeyspaceIdsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Merge(dst, src) +func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Merge(m, src) } func (m *ExecuteBatchKeyspaceIdsResponse) XXX_Size() int { return xxx_messageInfo_ExecuteBatchKeyspaceIdsResponse.Size(m) @@ -1750,16 +1777,17 @@ func (m *StreamExecuteRequest) Reset() { *m = StreamExecuteRequest{} } func (m *StreamExecuteRequest) String() string { return proto.CompactTextString(m) } func (*StreamExecuteRequest) ProtoMessage() {} func (*StreamExecuteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{19} + return fileDescriptor_aab96496ceaf1ebb, []int{19} } + func (m *StreamExecuteRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteRequest.Unmarshal(m, b) } func (m *StreamExecuteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteRequest.Marshal(b, m, deterministic) } -func (dst *StreamExecuteRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteRequest.Merge(dst, src) +func (m *StreamExecuteRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteRequest.Merge(m, src) } func (m *StreamExecuteRequest) XXX_Size() int { return xxx_messageInfo_StreamExecuteRequest.Size(m) @@ -1829,16 +1857,17 @@ func (m *StreamExecuteResponse) Reset() { *m = StreamExecuteResponse{} } func (m *StreamExecuteResponse) String() string { return proto.CompactTextString(m) } func (*StreamExecuteResponse) ProtoMessage() {} func (*StreamExecuteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{20} + return fileDescriptor_aab96496ceaf1ebb, []int{20} } + func (m *StreamExecuteResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteResponse.Unmarshal(m, b) } func (m *StreamExecuteResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteResponse.Marshal(b, m, deterministic) } -func (dst *StreamExecuteResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteResponse.Merge(dst, src) +func (m *StreamExecuteResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteResponse.Merge(m, src) } func (m *StreamExecuteResponse) XXX_Size() int { return xxx_messageInfo_StreamExecuteResponse.Size(m) @@ -1880,16 +1909,17 @@ func (m *StreamExecuteShardsRequest) Reset() { *m = StreamExecuteShardsR func (m *StreamExecuteShardsRequest) String() string { return proto.CompactTextString(m) } func (*StreamExecuteShardsRequest) ProtoMessage() {} func (*StreamExecuteShardsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{21} + return fileDescriptor_aab96496ceaf1ebb, []int{21} } + func (m *StreamExecuteShardsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteShardsRequest.Unmarshal(m, b) } func (m *StreamExecuteShardsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteShardsRequest.Marshal(b, m, deterministic) } -func (dst *StreamExecuteShardsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteShardsRequest.Merge(dst, src) +func (m *StreamExecuteShardsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteShardsRequest.Merge(m, src) } func (m *StreamExecuteShardsRequest) XXX_Size() int { return xxx_messageInfo_StreamExecuteShardsRequest.Size(m) @@ -1957,16 +1987,17 @@ func (m *StreamExecuteShardsResponse) Reset() { *m = StreamExecuteShards func (m *StreamExecuteShardsResponse) String() string { return proto.CompactTextString(m) } func (*StreamExecuteShardsResponse) ProtoMessage() {} func (*StreamExecuteShardsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{22} + return fileDescriptor_aab96496ceaf1ebb, []int{22} } + func (m *StreamExecuteShardsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteShardsResponse.Unmarshal(m, b) } func (m *StreamExecuteShardsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteShardsResponse.Marshal(b, m, deterministic) } -func (dst *StreamExecuteShardsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteShardsResponse.Merge(dst, src) +func (m *StreamExecuteShardsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteShardsResponse.Merge(m, src) } func (m *StreamExecuteShardsResponse) XXX_Size() int { return xxx_messageInfo_StreamExecuteShardsResponse.Size(m) @@ -2009,16 +2040,17 @@ func (m *StreamExecuteKeyspaceIdsRequest) Reset() { *m = StreamExecuteKe func (m *StreamExecuteKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) } func (*StreamExecuteKeyspaceIdsRequest) ProtoMessage() {} func (*StreamExecuteKeyspaceIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{23} + return fileDescriptor_aab96496ceaf1ebb, []int{23} } + func (m *StreamExecuteKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Unmarshal(m, b) } func (m *StreamExecuteKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Marshal(b, m, deterministic) } -func (dst *StreamExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Merge(dst, src) +func (m *StreamExecuteKeyspaceIdsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Merge(m, src) } func (m *StreamExecuteKeyspaceIdsRequest) XXX_Size() int { return xxx_messageInfo_StreamExecuteKeyspaceIdsRequest.Size(m) @@ -2086,16 +2118,17 @@ func (m *StreamExecuteKeyspaceIdsResponse) Reset() { *m = StreamExecuteK func (m *StreamExecuteKeyspaceIdsResponse) String() string { return proto.CompactTextString(m) } func (*StreamExecuteKeyspaceIdsResponse) ProtoMessage() {} func (*StreamExecuteKeyspaceIdsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{24} + return fileDescriptor_aab96496ceaf1ebb, []int{24} } + func (m *StreamExecuteKeyspaceIdsResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Unmarshal(m, b) } func (m *StreamExecuteKeyspaceIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Marshal(b, m, deterministic) } -func (dst *StreamExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Merge(dst, src) +func (m *StreamExecuteKeyspaceIdsResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Merge(m, src) } func (m *StreamExecuteKeyspaceIdsResponse) XXX_Size() int { return xxx_messageInfo_StreamExecuteKeyspaceIdsResponse.Size(m) @@ -2138,16 +2171,17 @@ func (m *StreamExecuteKeyRangesRequest) Reset() { *m = StreamExecuteKeyR func (m *StreamExecuteKeyRangesRequest) String() string { return proto.CompactTextString(m) } func (*StreamExecuteKeyRangesRequest) ProtoMessage() {} func (*StreamExecuteKeyRangesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{25} + return fileDescriptor_aab96496ceaf1ebb, []int{25} } + func (m *StreamExecuteKeyRangesRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteKeyRangesRequest.Unmarshal(m, b) } func (m *StreamExecuteKeyRangesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteKeyRangesRequest.Marshal(b, m, deterministic) } -func (dst *StreamExecuteKeyRangesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteKeyRangesRequest.Merge(dst, src) +func (m *StreamExecuteKeyRangesRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteKeyRangesRequest.Merge(m, src) } func (m *StreamExecuteKeyRangesRequest) XXX_Size() int { return xxx_messageInfo_StreamExecuteKeyRangesRequest.Size(m) @@ -2215,16 +2249,17 @@ func (m *StreamExecuteKeyRangesResponse) Reset() { *m = StreamExecuteKey func (m *StreamExecuteKeyRangesResponse) String() string { return proto.CompactTextString(m) } func (*StreamExecuteKeyRangesResponse) ProtoMessage() {} func (*StreamExecuteKeyRangesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{26} + return fileDescriptor_aab96496ceaf1ebb, []int{26} } + func (m *StreamExecuteKeyRangesResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_StreamExecuteKeyRangesResponse.Unmarshal(m, b) } func (m *StreamExecuteKeyRangesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_StreamExecuteKeyRangesResponse.Marshal(b, m, deterministic) } -func (dst *StreamExecuteKeyRangesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_StreamExecuteKeyRangesResponse.Merge(dst, src) +func (m *StreamExecuteKeyRangesResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_StreamExecuteKeyRangesResponse.Merge(m, src) } func (m *StreamExecuteKeyRangesResponse) XXX_Size() int { return xxx_messageInfo_StreamExecuteKeyRangesResponse.Size(m) @@ -2261,16 +2296,17 @@ func (m *BeginRequest) Reset() { *m = BeginRequest{} } func (m *BeginRequest) String() string { return proto.CompactTextString(m) } func (*BeginRequest) ProtoMessage() {} func (*BeginRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{27} + return fileDescriptor_aab96496ceaf1ebb, []int{27} } + func (m *BeginRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginRequest.Unmarshal(m, b) } func (m *BeginRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginRequest.Marshal(b, m, deterministic) } -func (dst *BeginRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginRequest.Merge(dst, src) +func (m *BeginRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginRequest.Merge(m, src) } func (m *BeginRequest) XXX_Size() int { return xxx_messageInfo_BeginRequest.Size(m) @@ -2308,16 +2344,17 @@ func (m *BeginResponse) Reset() { *m = BeginResponse{} } func (m *BeginResponse) String() string { return proto.CompactTextString(m) } func (*BeginResponse) ProtoMessage() {} func (*BeginResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{28} + return fileDescriptor_aab96496ceaf1ebb, []int{28} } + func (m *BeginResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_BeginResponse.Unmarshal(m, b) } func (m *BeginResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_BeginResponse.Marshal(b, m, deterministic) } -func (dst *BeginResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BeginResponse.Merge(dst, src) +func (m *BeginResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BeginResponse.Merge(m, src) } func (m *BeginResponse) XXX_Size() int { return xxx_messageInfo_BeginResponse.Size(m) @@ -2356,16 +2393,17 @@ func (m *CommitRequest) Reset() { *m = CommitRequest{} } func (m *CommitRequest) String() string { return proto.CompactTextString(m) } func (*CommitRequest) ProtoMessage() {} func (*CommitRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{29} + return fileDescriptor_aab96496ceaf1ebb, []int{29} } + func (m *CommitRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitRequest.Unmarshal(m, b) } func (m *CommitRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitRequest.Marshal(b, m, deterministic) } -func (dst *CommitRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitRequest.Merge(dst, src) +func (m *CommitRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitRequest.Merge(m, src) } func (m *CommitRequest) XXX_Size() int { return xxx_messageInfo_CommitRequest.Size(m) @@ -2408,16 +2446,17 @@ func (m *CommitResponse) Reset() { *m = CommitResponse{} } func (m *CommitResponse) String() string { return proto.CompactTextString(m) } func (*CommitResponse) ProtoMessage() {} func (*CommitResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{30} + return fileDescriptor_aab96496ceaf1ebb, []int{30} } + func (m *CommitResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CommitResponse.Unmarshal(m, b) } func (m *CommitResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CommitResponse.Marshal(b, m, deterministic) } -func (dst *CommitResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_CommitResponse.Merge(dst, src) +func (m *CommitResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_CommitResponse.Merge(m, src) } func (m *CommitResponse) XXX_Size() int { return xxx_messageInfo_CommitResponse.Size(m) @@ -2444,16 +2483,17 @@ func (m *RollbackRequest) Reset() { *m = RollbackRequest{} } func (m *RollbackRequest) String() string { return proto.CompactTextString(m) } func (*RollbackRequest) ProtoMessage() {} func (*RollbackRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{31} + return fileDescriptor_aab96496ceaf1ebb, []int{31} } + func (m *RollbackRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RollbackRequest.Unmarshal(m, b) } func (m *RollbackRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RollbackRequest.Marshal(b, m, deterministic) } -func (dst *RollbackRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_RollbackRequest.Merge(dst, src) +func (m *RollbackRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackRequest.Merge(m, src) } func (m *RollbackRequest) XXX_Size() int { return xxx_messageInfo_RollbackRequest.Size(m) @@ -2489,16 +2529,17 @@ func (m *RollbackResponse) Reset() { *m = RollbackResponse{} } func (m *RollbackResponse) String() string { return proto.CompactTextString(m) } func (*RollbackResponse) ProtoMessage() {} func (*RollbackResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{32} + return fileDescriptor_aab96496ceaf1ebb, []int{32} } + func (m *RollbackResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RollbackResponse.Unmarshal(m, b) } func (m *RollbackResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RollbackResponse.Marshal(b, m, deterministic) } -func (dst *RollbackResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_RollbackResponse.Merge(dst, src) +func (m *RollbackResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_RollbackResponse.Merge(m, src) } func (m *RollbackResponse) XXX_Size() int { return xxx_messageInfo_RollbackResponse.Size(m) @@ -2525,16 +2566,17 @@ func (m *ResolveTransactionRequest) Reset() { *m = ResolveTransactionReq func (m *ResolveTransactionRequest) String() string { return proto.CompactTextString(m) } func (*ResolveTransactionRequest) ProtoMessage() {} func (*ResolveTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{33} + return fileDescriptor_aab96496ceaf1ebb, []int{33} } + func (m *ResolveTransactionRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResolveTransactionRequest.Unmarshal(m, b) } func (m *ResolveTransactionRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResolveTransactionRequest.Marshal(b, m, deterministic) } -func (dst *ResolveTransactionRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResolveTransactionRequest.Merge(dst, src) +func (m *ResolveTransactionRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResolveTransactionRequest.Merge(m, src) } func (m *ResolveTransactionRequest) XXX_Size() int { return xxx_messageInfo_ResolveTransactionRequest.Size(m) @@ -2581,16 +2623,17 @@ func (m *MessageStreamRequest) Reset() { *m = MessageStreamRequest{} } func (m *MessageStreamRequest) String() string { return proto.CompactTextString(m) } func (*MessageStreamRequest) ProtoMessage() {} func (*MessageStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{34} + return fileDescriptor_aab96496ceaf1ebb, []int{34} } + func (m *MessageStreamRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageStreamRequest.Unmarshal(m, b) } func (m *MessageStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageStreamRequest.Marshal(b, m, deterministic) } -func (dst *MessageStreamRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageStreamRequest.Merge(dst, src) +func (m *MessageStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageStreamRequest.Merge(m, src) } func (m *MessageStreamRequest) XXX_Size() int { return xxx_messageInfo_MessageStreamRequest.Size(m) @@ -2656,16 +2699,17 @@ func (m *MessageAckRequest) Reset() { *m = MessageAckRequest{} } func (m *MessageAckRequest) String() string { return proto.CompactTextString(m) } func (*MessageAckRequest) ProtoMessage() {} func (*MessageAckRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{35} + return fileDescriptor_aab96496ceaf1ebb, []int{35} } + func (m *MessageAckRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageAckRequest.Unmarshal(m, b) } func (m *MessageAckRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageAckRequest.Marshal(b, m, deterministic) } -func (dst *MessageAckRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageAckRequest.Merge(dst, src) +func (m *MessageAckRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageAckRequest.Merge(m, src) } func (m *MessageAckRequest) XXX_Size() int { return xxx_messageInfo_MessageAckRequest.Size(m) @@ -2720,16 +2764,17 @@ func (m *IdKeyspaceId) Reset() { *m = IdKeyspaceId{} } func (m *IdKeyspaceId) String() string { return proto.CompactTextString(m) } func (*IdKeyspaceId) ProtoMessage() {} func (*IdKeyspaceId) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{36} + return fileDescriptor_aab96496ceaf1ebb, []int{36} } + func (m *IdKeyspaceId) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_IdKeyspaceId.Unmarshal(m, b) } func (m *IdKeyspaceId) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_IdKeyspaceId.Marshal(b, m, deterministic) } -func (dst *IdKeyspaceId) XXX_Merge(src proto.Message) { - xxx_messageInfo_IdKeyspaceId.Merge(dst, src) +func (m *IdKeyspaceId) XXX_Merge(src proto.Message) { + xxx_messageInfo_IdKeyspaceId.Merge(m, src) } func (m *IdKeyspaceId) XXX_Size() int { return xxx_messageInfo_IdKeyspaceId.Size(m) @@ -2773,16 +2818,17 @@ func (m *MessageAckKeyspaceIdsRequest) Reset() { *m = MessageAckKeyspace func (m *MessageAckKeyspaceIdsRequest) String() string { return proto.CompactTextString(m) } func (*MessageAckKeyspaceIdsRequest) ProtoMessage() {} func (*MessageAckKeyspaceIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{37} + return fileDescriptor_aab96496ceaf1ebb, []int{37} } + func (m *MessageAckKeyspaceIdsRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_MessageAckKeyspaceIdsRequest.Unmarshal(m, b) } func (m *MessageAckKeyspaceIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_MessageAckKeyspaceIdsRequest.Marshal(b, m, deterministic) } -func (dst *MessageAckKeyspaceIdsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_MessageAckKeyspaceIdsRequest.Merge(dst, src) +func (m *MessageAckKeyspaceIdsRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_MessageAckKeyspaceIdsRequest.Merge(m, src) } func (m *MessageAckKeyspaceIdsRequest) XXX_Size() int { return xxx_messageInfo_MessageAckKeyspaceIdsRequest.Size(m) @@ -2832,16 +2878,17 @@ func (m *ResolveTransactionResponse) Reset() { *m = ResolveTransactionRe func (m *ResolveTransactionResponse) String() string { return proto.CompactTextString(m) } func (*ResolveTransactionResponse) ProtoMessage() {} func (*ResolveTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{38} + return fileDescriptor_aab96496ceaf1ebb, []int{38} } + func (m *ResolveTransactionResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ResolveTransactionResponse.Unmarshal(m, b) } func (m *ResolveTransactionResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ResolveTransactionResponse.Marshal(b, m, deterministic) } -func (dst *ResolveTransactionResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ResolveTransactionResponse.Merge(dst, src) +func (m *ResolveTransactionResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ResolveTransactionResponse.Merge(m, src) } func (m *ResolveTransactionResponse) XXX_Size() int { return xxx_messageInfo_ResolveTransactionResponse.Size(m) @@ -2950,16 +2997,17 @@ func (m *SplitQueryRequest) Reset() { *m = SplitQueryRequest{} } func (m *SplitQueryRequest) String() string { return proto.CompactTextString(m) } func (*SplitQueryRequest) ProtoMessage() {} func (*SplitQueryRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{39} + return fileDescriptor_aab96496ceaf1ebb, []int{39} } + func (m *SplitQueryRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryRequest.Unmarshal(m, b) } func (m *SplitQueryRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryRequest.Marshal(b, m, deterministic) } -func (dst *SplitQueryRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryRequest.Merge(dst, src) +func (m *SplitQueryRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryRequest.Merge(m, src) } func (m *SplitQueryRequest) XXX_Size() int { return xxx_messageInfo_SplitQueryRequest.Size(m) @@ -3039,16 +3087,17 @@ func (m *SplitQueryResponse) Reset() { *m = SplitQueryResponse{} } func (m *SplitQueryResponse) String() string { return proto.CompactTextString(m) } func (*SplitQueryResponse) ProtoMessage() {} func (*SplitQueryResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40} + return fileDescriptor_aab96496ceaf1ebb, []int{40} } + func (m *SplitQueryResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryResponse.Unmarshal(m, b) } func (m *SplitQueryResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryResponse.Marshal(b, m, deterministic) } -func (dst *SplitQueryResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryResponse.Merge(dst, src) +func (m *SplitQueryResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryResponse.Merge(m, src) } func (m *SplitQueryResponse) XXX_Size() int { return xxx_messageInfo_SplitQueryResponse.Size(m) @@ -3080,16 +3129,17 @@ func (m *SplitQueryResponse_KeyRangePart) Reset() { *m = SplitQueryRespo func (m *SplitQueryResponse_KeyRangePart) String() string { return proto.CompactTextString(m) } func (*SplitQueryResponse_KeyRangePart) ProtoMessage() {} func (*SplitQueryResponse_KeyRangePart) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40, 0} + return fileDescriptor_aab96496ceaf1ebb, []int{40, 0} } + func (m *SplitQueryResponse_KeyRangePart) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryResponse_KeyRangePart.Unmarshal(m, b) } func (m *SplitQueryResponse_KeyRangePart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryResponse_KeyRangePart.Marshal(b, m, deterministic) } -func (dst *SplitQueryResponse_KeyRangePart) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryResponse_KeyRangePart.Merge(dst, src) +func (m *SplitQueryResponse_KeyRangePart) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryResponse_KeyRangePart.Merge(m, src) } func (m *SplitQueryResponse_KeyRangePart) XXX_Size() int { return xxx_messageInfo_SplitQueryResponse_KeyRangePart.Size(m) @@ -3128,16 +3178,17 @@ func (m *SplitQueryResponse_ShardPart) Reset() { *m = SplitQueryResponse func (m *SplitQueryResponse_ShardPart) String() string { return proto.CompactTextString(m) } func (*SplitQueryResponse_ShardPart) ProtoMessage() {} func (*SplitQueryResponse_ShardPart) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40, 1} + return fileDescriptor_aab96496ceaf1ebb, []int{40, 1} } + func (m *SplitQueryResponse_ShardPart) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryResponse_ShardPart.Unmarshal(m, b) } func (m *SplitQueryResponse_ShardPart) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryResponse_ShardPart.Marshal(b, m, deterministic) } -func (dst *SplitQueryResponse_ShardPart) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryResponse_ShardPart.Merge(dst, src) +func (m *SplitQueryResponse_ShardPart) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryResponse_ShardPart.Merge(m, src) } func (m *SplitQueryResponse_ShardPart) XXX_Size() int { return xxx_messageInfo_SplitQueryResponse_ShardPart.Size(m) @@ -3181,16 +3232,17 @@ func (m *SplitQueryResponse_Part) Reset() { *m = SplitQueryResponse_Part func (m *SplitQueryResponse_Part) String() string { return proto.CompactTextString(m) } func (*SplitQueryResponse_Part) ProtoMessage() {} func (*SplitQueryResponse_Part) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{40, 2} + return fileDescriptor_aab96496ceaf1ebb, []int{40, 2} } + func (m *SplitQueryResponse_Part) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_SplitQueryResponse_Part.Unmarshal(m, b) } func (m *SplitQueryResponse_Part) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_SplitQueryResponse_Part.Marshal(b, m, deterministic) } -func (dst *SplitQueryResponse_Part) XXX_Merge(src proto.Message) { - xxx_messageInfo_SplitQueryResponse_Part.Merge(dst, src) +func (m *SplitQueryResponse_Part) XXX_Merge(src proto.Message) { + xxx_messageInfo_SplitQueryResponse_Part.Merge(m, src) } func (m *SplitQueryResponse_Part) XXX_Size() int { return xxx_messageInfo_SplitQueryResponse_Part.Size(m) @@ -3242,16 +3294,17 @@ func (m *GetSrvKeyspaceRequest) Reset() { *m = GetSrvKeyspaceRequest{} } func (m *GetSrvKeyspaceRequest) String() string { return proto.CompactTextString(m) } func (*GetSrvKeyspaceRequest) ProtoMessage() {} func (*GetSrvKeyspaceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{41} + return fileDescriptor_aab96496ceaf1ebb, []int{41} } + func (m *GetSrvKeyspaceRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSrvKeyspaceRequest.Unmarshal(m, b) } func (m *GetSrvKeyspaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetSrvKeyspaceRequest.Marshal(b, m, deterministic) } -func (dst *GetSrvKeyspaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSrvKeyspaceRequest.Merge(dst, src) +func (m *GetSrvKeyspaceRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSrvKeyspaceRequest.Merge(m, src) } func (m *GetSrvKeyspaceRequest) XXX_Size() int { return xxx_messageInfo_GetSrvKeyspaceRequest.Size(m) @@ -3282,16 +3335,17 @@ func (m *GetSrvKeyspaceResponse) Reset() { *m = GetSrvKeyspaceResponse{} func (m *GetSrvKeyspaceResponse) String() string { return proto.CompactTextString(m) } func (*GetSrvKeyspaceResponse) ProtoMessage() {} func (*GetSrvKeyspaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{42} + return fileDescriptor_aab96496ceaf1ebb, []int{42} } + func (m *GetSrvKeyspaceResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_GetSrvKeyspaceResponse.Unmarshal(m, b) } func (m *GetSrvKeyspaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_GetSrvKeyspaceResponse.Marshal(b, m, deterministic) } -func (dst *GetSrvKeyspaceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_GetSrvKeyspaceResponse.Merge(dst, src) +func (m *GetSrvKeyspaceResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_GetSrvKeyspaceResponse.Merge(m, src) } func (m *GetSrvKeyspaceResponse) XXX_Size() int { return xxx_messageInfo_GetSrvKeyspaceResponse.Size(m) @@ -3327,16 +3381,17 @@ func (m *VStreamRequest) Reset() { *m = VStreamRequest{} } func (m *VStreamRequest) String() string { return proto.CompactTextString(m) } func (*VStreamRequest) ProtoMessage() {} func (*VStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{43} + return fileDescriptor_aab96496ceaf1ebb, []int{43} } + func (m *VStreamRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VStreamRequest.Unmarshal(m, b) } func (m *VStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VStreamRequest.Marshal(b, m, deterministic) } -func (dst *VStreamRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_VStreamRequest.Merge(dst, src) +func (m *VStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_VStreamRequest.Merge(m, src) } func (m *VStreamRequest) XXX_Size() int { return xxx_messageInfo_VStreamRequest.Size(m) @@ -3387,16 +3442,17 @@ func (m *VStreamResponse) Reset() { *m = VStreamResponse{} } func (m *VStreamResponse) String() string { return proto.CompactTextString(m) } func (*VStreamResponse) ProtoMessage() {} func (*VStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{44} + return fileDescriptor_aab96496ceaf1ebb, []int{44} } + func (m *VStreamResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VStreamResponse.Unmarshal(m, b) } func (m *VStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VStreamResponse.Marshal(b, m, deterministic) } -func (dst *VStreamResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_VStreamResponse.Merge(dst, src) +func (m *VStreamResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_VStreamResponse.Merge(m, src) } func (m *VStreamResponse) XXX_Size() int { return xxx_messageInfo_VStreamResponse.Size(m) @@ -3445,16 +3501,17 @@ func (m *UpdateStreamRequest) Reset() { *m = UpdateStreamRequest{} } func (m *UpdateStreamRequest) String() string { return proto.CompactTextString(m) } func (*UpdateStreamRequest) ProtoMessage() {} func (*UpdateStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{45} + return fileDescriptor_aab96496ceaf1ebb, []int{45} } + func (m *UpdateStreamRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateStreamRequest.Unmarshal(m, b) } func (m *UpdateStreamRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateStreamRequest.Marshal(b, m, deterministic) } -func (dst *UpdateStreamRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateStreamRequest.Merge(dst, src) +func (m *UpdateStreamRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateStreamRequest.Merge(m, src) } func (m *UpdateStreamRequest) XXX_Size() int { return xxx_messageInfo_UpdateStreamRequest.Size(m) @@ -3533,16 +3590,17 @@ func (m *UpdateStreamResponse) Reset() { *m = UpdateStreamResponse{} } func (m *UpdateStreamResponse) String() string { return proto.CompactTextString(m) } func (*UpdateStreamResponse) ProtoMessage() {} func (*UpdateStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtgate_339c92b13a08c8a7, []int{46} + return fileDescriptor_aab96496ceaf1ebb, []int{46} } + func (m *UpdateStreamResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_UpdateStreamResponse.Unmarshal(m, b) } func (m *UpdateStreamResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_UpdateStreamResponse.Marshal(b, m, deterministic) } -func (dst *UpdateStreamResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_UpdateStreamResponse.Merge(dst, src) +func (m *UpdateStreamResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_UpdateStreamResponse.Merge(m, src) } func (m *UpdateStreamResponse) XXX_Size() int { return xxx_messageInfo_UpdateStreamResponse.Size(m) @@ -3568,6 +3626,8 @@ func (m *UpdateStreamResponse) GetResumeTimestamp() int64 { } func init() { + proto.RegisterEnum("vtgate.TransactionMode", TransactionMode_name, TransactionMode_value) + proto.RegisterEnum("vtgate.CommitOrder", CommitOrder_name, CommitOrder_value) proto.RegisterType((*Session)(nil), "vtgate.Session") proto.RegisterType((*Session_ShardSession)(nil), "vtgate.Session.ShardSession") proto.RegisterType((*ExecuteRequest)(nil), "vtgate.ExecuteRequest") @@ -3620,13 +3680,11 @@ func init() { proto.RegisterType((*VStreamResponse)(nil), "vtgate.VStreamResponse") proto.RegisterType((*UpdateStreamRequest)(nil), "vtgate.UpdateStreamRequest") proto.RegisterType((*UpdateStreamResponse)(nil), "vtgate.UpdateStreamResponse") - proto.RegisterEnum("vtgate.TransactionMode", TransactionMode_name, TransactionMode_value) - proto.RegisterEnum("vtgate.CommitOrder", CommitOrder_name, CommitOrder_value) } -func init() { proto.RegisterFile("vtgate.proto", fileDescriptor_vtgate_339c92b13a08c8a7) } +func init() { proto.RegisterFile("vtgate.proto", fileDescriptor_aab96496ceaf1ebb) } -var fileDescriptor_vtgate_339c92b13a08c8a7 = []byte{ +var fileDescriptor_aab96496ceaf1ebb = []byte{ // 2041 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x8f, 0x23, 0x47, 0x15, 0x4f, 0x77, 0xfb, 0xf3, 0xf9, 0x73, 0x6b, 0xbc, 0x1b, 0xc7, 0x19, 0x76, 0x26, 0x1d, 0x46, diff --git a/go/vt/proto/vtgateservice/vtgateservice.pb.go b/go/vt/proto/vtgateservice/vtgateservice.pb.go index 73b93cde93..c020e282f5 100644 --- a/go/vt/proto/vtgateservice/vtgateservice.pb.go +++ b/go/vt/proto/vtgateservice/vtgateservice.pb.go @@ -1,17 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtgateservice.proto -package vtgateservice // import "vitess.io/vitess/go/vt/proto/vtgateservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import query "vitess.io/vitess/go/vt/proto/query" -import vtgate "vitess.io/vitess/go/vt/proto/vtgate" +package vtgateservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + query "vitess.io/vitess/go/vt/proto/query" + vtgate "vitess.io/vitess/go/vt/proto/vtgate" ) // Reference imports to suppress errors if they are not otherwise used. @@ -23,7 +24,51 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("vtgateservice.proto", fileDescriptor_601ae27c95081e0f) } + +var fileDescriptor_601ae27c95081e0f = []byte{ + // 594 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x95, 0x5f, 0x6f, 0xd3, 0x30, + 0x14, 0xc5, 0xe1, 0x81, 0x0e, 0x5d, 0x5a, 0x40, 0xde, 0xd6, 0x6e, 0xe5, 0xef, 0x0a, 0x6c, 0x88, + 0x87, 0x16, 0x81, 0x84, 0x84, 0x84, 0x40, 0x2d, 0x54, 0x08, 0x4d, 0x03, 0xd6, 0x42, 0x91, 0x26, + 0xf1, 0xe0, 0xa6, 0x57, 0x59, 0xd4, 0x36, 0x49, 0x63, 0x37, 0xa2, 0x5f, 0x80, 0xcf, 0x3d, 0x2d, + 0xb1, 0x1d, 0xdb, 0x71, 0xdb, 0xb7, 0xe4, 0x9c, 0xe3, 0x9f, 0xed, 0xeb, 0x2b, 0x1b, 0x76, 0x53, + 0xee, 0x53, 0x8e, 0x0c, 0x93, 0x34, 0xf0, 0xb0, 0x1d, 0x27, 0x11, 0x8f, 0x48, 0xcd, 0x10, 0x9b, + 0xd5, 0xfc, 0x37, 0x37, 0x9b, 0x77, 0x16, 0x4b, 0x4c, 0x56, 0xf9, 0xcf, 0x9b, 0xff, 0xf7, 0xa0, + 0x32, 0x0a, 0x38, 0x32, 0x46, 0x3e, 0xc0, 0x4e, 0xff, 0x1f, 0x7a, 0x4b, 0x8e, 0xa4, 0xde, 0x16, + 0x23, 0x84, 0x30, 0xc0, 0xc5, 0x12, 0x19, 0x6f, 0x36, 0x4a, 0x3a, 0x8b, 0xa3, 0x90, 0x61, 0xeb, + 0x06, 0x39, 0x85, 0xaa, 0x10, 0x7b, 0x94, 0x7b, 0x97, 0xe4, 0x81, 0x15, 0xcd, 0x54, 0xc9, 0x79, + 0xe8, 0x36, 0x15, 0xec, 0x27, 0xd4, 0x86, 0x3c, 0x41, 0x3a, 0x97, 0x0b, 0x52, 0x03, 0x0c, 0x59, + 0xe2, 0x1e, 0xad, 0x71, 0x25, 0xef, 0xf5, 0x4d, 0xf2, 0x1d, 0x6a, 0x42, 0x1e, 0x5e, 0xd2, 0x64, + 0xc2, 0x88, 0xbd, 0x84, 0x5c, 0x2e, 0x11, 0x2d, 0x57, 0xad, 0xf0, 0x2f, 0x10, 0x61, 0x9d, 0xe2, + 0x8a, 0xc5, 0xd4, 0xc3, 0x6f, 0x13, 0x46, 0x8e, 0xac, 0x61, 0x9a, 0x27, 0xc9, 0xad, 0x4d, 0x11, + 0x85, 0xff, 0x03, 0xf7, 0x0b, 0x7f, 0x40, 0x43, 0x1f, 0x19, 0x79, 0x52, 0x1e, 0x99, 0x3b, 0x12, + 0xfd, 0x74, 0x7d, 0xc0, 0x01, 0xee, 0x87, 0x3c, 0xe0, 0xab, 0xeb, 0x55, 0xdb, 0x60, 0xe5, 0xac, + 0x03, 0x6b, 0x01, 0x47, 0x41, 0xb2, 0xc3, 0x14, 0x55, 0x3e, 0x72, 0x1d, 0xb4, 0x59, 0xea, 0xd6, + 0xa6, 0x88, 0xc2, 0xcf, 0xa0, 0xa1, 0xfb, 0x7a, 0xd1, 0x8f, 0x5d, 0x00, 0x47, 0xe5, 0x4f, 0xb6, + 0xe6, 0xd4, 0x6c, 0x63, 0xd8, 0x35, 0x5a, 0x49, 0xec, 0xa6, 0xe5, 0xec, 0x33, 0x73, 0x3b, 0xcf, + 0x36, 0x66, 0xb4, 0x8e, 0x5c, 0xc0, 0x81, 0x11, 0xd1, 0xb7, 0x74, 0xe2, 0x84, 0x38, 0xf6, 0xf4, + 0x72, 0x7b, 0x50, 0x9b, 0x72, 0x0a, 0x75, 0x3b, 0x27, 0x7a, 0xeb, 0xc5, 0x3a, 0x8e, 0xd9, 0x61, + 0xc7, 0xdb, 0x62, 0xda, 0x64, 0xef, 0xe0, 0x56, 0x0f, 0xfd, 0x20, 0x24, 0x7b, 0x72, 0x50, 0xf6, + 0x2b, 0x51, 0xfb, 0x96, 0xaa, 0x6a, 0xff, 0x1e, 0x2a, 0x9f, 0xa3, 0xf9, 0x3c, 0xe0, 0x44, 0x45, + 0xf2, 0x7f, 0x39, 0xb2, 0x6e, 0xcb, 0x6a, 0xe8, 0x27, 0xb8, 0x3d, 0x88, 0x66, 0xb3, 0x31, 0xf5, + 0xa6, 0x44, 0x5d, 0x55, 0x52, 0x91, 0xc3, 0x0f, 0xca, 0x86, 0xde, 0xc4, 0x03, 0x64, 0xd1, 0x2c, + 0xc5, 0x5f, 0x09, 0x0d, 0x19, 0xf5, 0x78, 0x10, 0x85, 0x45, 0x13, 0x97, 0xbd, 0x52, 0x13, 0xbb, + 0x22, 0x0a, 0xff, 0x03, 0x6a, 0x67, 0xc8, 0x18, 0xf5, 0x31, 0xaf, 0x5f, 0x71, 0x09, 0x19, 0x72, + 0x71, 0x4b, 0xe6, 0x37, 0xb5, 0x65, 0x6a, 0x35, 0xfe, 0x02, 0x20, 0xcc, 0xae, 0x37, 0x25, 0x87, + 0x16, 0xad, 0x5b, 0x6c, 0xfa, 0xd0, 0x44, 0x75, 0x8d, 0x5d, 0x5f, 0xc0, 0x7e, 0xa1, 0xeb, 0x6d, + 0xf8, 0xbc, 0x0c, 0x74, 0xf4, 0xe0, 0x46, 0x76, 0x1f, 0x60, 0x18, 0xcf, 0x02, 0x7e, 0x7e, 0x1d, + 0x29, 0x56, 0x58, 0x68, 0x92, 0xd2, 0x74, 0x59, 0x0a, 0x73, 0x0e, 0x77, 0xbf, 0x22, 0x1f, 0x26, + 0xa9, 0x9c, 0x9f, 0xa8, 0x1b, 0xda, 0xd4, 0x25, 0xee, 0xf1, 0x3a, 0x5b, 0x21, 0x3f, 0xc2, 0xce, + 0x48, 0x1c, 0x83, 0xea, 0xa8, 0x91, 0x79, 0x00, 0x8d, 0x92, 0xae, 0xd5, 0xfe, 0x0c, 0xaa, 0xbf, + 0xe3, 0x09, 0xe5, 0xf2, 0x2c, 0xd5, 0x83, 0xa7, 0xab, 0xa5, 0x07, 0xcf, 0x34, 0x0b, 0x5c, 0xaf, + 0x07, 0x7b, 0x41, 0xd4, 0x4e, 0xb3, 0xa7, 0x38, 0x7f, 0x9b, 0xdb, 0x7e, 0x12, 0x7b, 0x17, 0xaf, + 0x84, 0x14, 0x44, 0x9d, 0xfc, 0xab, 0xe3, 0x47, 0x9d, 0x94, 0x77, 0xb2, 0x48, 0xc7, 0x78, 0xe7, + 0xc7, 0x95, 0x4c, 0x7c, 0x7b, 0x15, 0x00, 0x00, 0xff, 0xff, 0x98, 0xf7, 0xf0, 0x85, 0x14, 0x08, + 0x00, 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -583,6 +628,80 @@ type VitessServer interface { UpdateStream(*vtgate.UpdateStreamRequest, Vitess_UpdateStreamServer) error } +// UnimplementedVitessServer can be embedded to have forward compatible implementations. +type UnimplementedVitessServer struct { +} + +func (*UnimplementedVitessServer) Execute(ctx context.Context, req *vtgate.ExecuteRequest) (*vtgate.ExecuteResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Execute not implemented") +} +func (*UnimplementedVitessServer) ExecuteBatch(ctx context.Context, req *vtgate.ExecuteBatchRequest) (*vtgate.ExecuteBatchResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteBatch not implemented") +} +func (*UnimplementedVitessServer) StreamExecute(req *vtgate.StreamExecuteRequest, srv Vitess_StreamExecuteServer) error { + return status.Errorf(codes.Unimplemented, "method StreamExecute not implemented") +} +func (*UnimplementedVitessServer) ExecuteShards(ctx context.Context, req *vtgate.ExecuteShardsRequest) (*vtgate.ExecuteShardsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteShards not implemented") +} +func (*UnimplementedVitessServer) ExecuteKeyspaceIds(ctx context.Context, req *vtgate.ExecuteKeyspaceIdsRequest) (*vtgate.ExecuteKeyspaceIdsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteKeyspaceIds not implemented") +} +func (*UnimplementedVitessServer) ExecuteKeyRanges(ctx context.Context, req *vtgate.ExecuteKeyRangesRequest) (*vtgate.ExecuteKeyRangesResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteKeyRanges not implemented") +} +func (*UnimplementedVitessServer) ExecuteEntityIds(ctx context.Context, req *vtgate.ExecuteEntityIdsRequest) (*vtgate.ExecuteEntityIdsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteEntityIds not implemented") +} +func (*UnimplementedVitessServer) ExecuteBatchShards(ctx context.Context, req *vtgate.ExecuteBatchShardsRequest) (*vtgate.ExecuteBatchShardsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteBatchShards not implemented") +} +func (*UnimplementedVitessServer) ExecuteBatchKeyspaceIds(ctx context.Context, req *vtgate.ExecuteBatchKeyspaceIdsRequest) (*vtgate.ExecuteBatchKeyspaceIdsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ExecuteBatchKeyspaceIds not implemented") +} +func (*UnimplementedVitessServer) StreamExecuteShards(req *vtgate.StreamExecuteShardsRequest, srv Vitess_StreamExecuteShardsServer) error { + return status.Errorf(codes.Unimplemented, "method StreamExecuteShards not implemented") +} +func (*UnimplementedVitessServer) StreamExecuteKeyspaceIds(req *vtgate.StreamExecuteKeyspaceIdsRequest, srv Vitess_StreamExecuteKeyspaceIdsServer) error { + return status.Errorf(codes.Unimplemented, "method StreamExecuteKeyspaceIds not implemented") +} +func (*UnimplementedVitessServer) StreamExecuteKeyRanges(req *vtgate.StreamExecuteKeyRangesRequest, srv Vitess_StreamExecuteKeyRangesServer) error { + return status.Errorf(codes.Unimplemented, "method StreamExecuteKeyRanges not implemented") +} +func (*UnimplementedVitessServer) Begin(ctx context.Context, req *vtgate.BeginRequest) (*vtgate.BeginResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Begin not implemented") +} +func (*UnimplementedVitessServer) Commit(ctx context.Context, req *vtgate.CommitRequest) (*vtgate.CommitResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Commit not implemented") +} +func (*UnimplementedVitessServer) Rollback(ctx context.Context, req *vtgate.RollbackRequest) (*vtgate.RollbackResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Rollback not implemented") +} +func (*UnimplementedVitessServer) ResolveTransaction(ctx context.Context, req *vtgate.ResolveTransactionRequest) (*vtgate.ResolveTransactionResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method ResolveTransaction not implemented") +} +func (*UnimplementedVitessServer) MessageStream(req *vtgate.MessageStreamRequest, srv Vitess_MessageStreamServer) error { + return status.Errorf(codes.Unimplemented, "method MessageStream not implemented") +} +func (*UnimplementedVitessServer) MessageAck(ctx context.Context, req *vtgate.MessageAckRequest) (*query.MessageAckResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method MessageAck not implemented") +} +func (*UnimplementedVitessServer) MessageAckKeyspaceIds(ctx context.Context, req *vtgate.MessageAckKeyspaceIdsRequest) (*query.MessageAckResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method MessageAckKeyspaceIds not implemented") +} +func (*UnimplementedVitessServer) SplitQuery(ctx context.Context, req *vtgate.SplitQueryRequest) (*vtgate.SplitQueryResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SplitQuery not implemented") +} +func (*UnimplementedVitessServer) GetSrvKeyspace(ctx context.Context, req *vtgate.GetSrvKeyspaceRequest) (*vtgate.GetSrvKeyspaceResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetSrvKeyspace not implemented") +} +func (*UnimplementedVitessServer) VStream(req *vtgate.VStreamRequest, srv Vitess_VStreamServer) error { + return status.Errorf(codes.Unimplemented, "method VStream not implemented") +} +func (*UnimplementedVitessServer) UpdateStream(req *vtgate.UpdateStreamRequest, srv Vitess_UpdateStreamServer) error { + return status.Errorf(codes.Unimplemented, "method UpdateStream not implemented") +} + func RegisterVitessServer(s *grpc.Server, srv VitessServer) { s.RegisterService(&_Vitess_serviceDesc, srv) } @@ -1130,47 +1249,3 @@ var _Vitess_serviceDesc = grpc.ServiceDesc{ }, Metadata: "vtgateservice.proto", } - -func init() { proto.RegisterFile("vtgateservice.proto", fileDescriptor_vtgateservice_b8d4a07f11e6fc8a) } - -var fileDescriptor_vtgateservice_b8d4a07f11e6fc8a = []byte{ - // 594 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x95, 0x5f, 0x6f, 0xd3, 0x30, - 0x14, 0xc5, 0xe1, 0x81, 0x0e, 0x5d, 0x5a, 0x40, 0xde, 0xd6, 0x6e, 0xe5, 0xef, 0x0a, 0x6c, 0x88, - 0x87, 0x16, 0x81, 0x84, 0x84, 0x84, 0x40, 0x2d, 0x54, 0x08, 0x4d, 0x03, 0xd6, 0x42, 0x91, 0x26, - 0xf1, 0xe0, 0xa6, 0x57, 0x59, 0xd4, 0x36, 0x49, 0x63, 0x37, 0xa2, 0x5f, 0x80, 0xcf, 0x3d, 0x2d, - 0xb1, 0x1d, 0xdb, 0x71, 0xdb, 0xb7, 0xe4, 0x9c, 0xe3, 0x9f, 0xed, 0xeb, 0x2b, 0x1b, 0x76, 0x53, - 0xee, 0x53, 0x8e, 0x0c, 0x93, 0x34, 0xf0, 0xb0, 0x1d, 0x27, 0x11, 0x8f, 0x48, 0xcd, 0x10, 0x9b, - 0xd5, 0xfc, 0x37, 0x37, 0x9b, 0x77, 0x16, 0x4b, 0x4c, 0x56, 0xf9, 0xcf, 0x9b, 0xff, 0xf7, 0xa0, - 0x32, 0x0a, 0x38, 0x32, 0x46, 0x3e, 0xc0, 0x4e, 0xff, 0x1f, 0x7a, 0x4b, 0x8e, 0xa4, 0xde, 0x16, - 0x23, 0x84, 0x30, 0xc0, 0xc5, 0x12, 0x19, 0x6f, 0x36, 0x4a, 0x3a, 0x8b, 0xa3, 0x90, 0x61, 0xeb, - 0x06, 0x39, 0x85, 0xaa, 0x10, 0x7b, 0x94, 0x7b, 0x97, 0xe4, 0x81, 0x15, 0xcd, 0x54, 0xc9, 0x79, - 0xe8, 0x36, 0x15, 0xec, 0x27, 0xd4, 0x86, 0x3c, 0x41, 0x3a, 0x97, 0x0b, 0x52, 0x03, 0x0c, 0x59, - 0xe2, 0x1e, 0xad, 0x71, 0x25, 0xef, 0xf5, 0x4d, 0xf2, 0x1d, 0x6a, 0x42, 0x1e, 0x5e, 0xd2, 0x64, - 0xc2, 0x88, 0xbd, 0x84, 0x5c, 0x2e, 0x11, 0x2d, 0x57, 0xad, 0xf0, 0x2f, 0x10, 0x61, 0x9d, 0xe2, - 0x8a, 0xc5, 0xd4, 0xc3, 0x6f, 0x13, 0x46, 0x8e, 0xac, 0x61, 0x9a, 0x27, 0xc9, 0xad, 0x4d, 0x11, - 0x85, 0xff, 0x03, 0xf7, 0x0b, 0x7f, 0x40, 0x43, 0x1f, 0x19, 0x79, 0x52, 0x1e, 0x99, 0x3b, 0x12, - 0xfd, 0x74, 0x7d, 0xc0, 0x01, 0xee, 0x87, 0x3c, 0xe0, 0xab, 0xeb, 0x55, 0xdb, 0x60, 0xe5, 0xac, - 0x03, 0x6b, 0x01, 0x47, 0x41, 0xb2, 0xc3, 0x14, 0x55, 0x3e, 0x72, 0x1d, 0xb4, 0x59, 0xea, 0xd6, - 0xa6, 0x88, 0xc2, 0xcf, 0xa0, 0xa1, 0xfb, 0x7a, 0xd1, 0x8f, 0x5d, 0x00, 0x47, 0xe5, 0x4f, 0xb6, - 0xe6, 0xd4, 0x6c, 0x63, 0xd8, 0x35, 0x5a, 0x49, 0xec, 0xa6, 0xe5, 0xec, 0x33, 0x73, 0x3b, 0xcf, - 0x36, 0x66, 0xb4, 0x8e, 0x5c, 0xc0, 0x81, 0x11, 0xd1, 0xb7, 0x74, 0xe2, 0x84, 0x38, 0xf6, 0xf4, - 0x72, 0x7b, 0x50, 0x9b, 0x72, 0x0a, 0x75, 0x3b, 0x27, 0x7a, 0xeb, 0xc5, 0x3a, 0x8e, 0xd9, 0x61, - 0xc7, 0xdb, 0x62, 0xda, 0x64, 0xef, 0xe0, 0x56, 0x0f, 0xfd, 0x20, 0x24, 0x7b, 0x72, 0x50, 0xf6, - 0x2b, 0x51, 0xfb, 0x96, 0xaa, 0x6a, 0xff, 0x1e, 0x2a, 0x9f, 0xa3, 0xf9, 0x3c, 0xe0, 0x44, 0x45, - 0xf2, 0x7f, 0x39, 0xb2, 0x6e, 0xcb, 0x6a, 0xe8, 0x27, 0xb8, 0x3d, 0x88, 0x66, 0xb3, 0x31, 0xf5, - 0xa6, 0x44, 0x5d, 0x55, 0x52, 0x91, 0xc3, 0x0f, 0xca, 0x86, 0xde, 0xc4, 0x03, 0x64, 0xd1, 0x2c, - 0xc5, 0x5f, 0x09, 0x0d, 0x19, 0xf5, 0x78, 0x10, 0x85, 0x45, 0x13, 0x97, 0xbd, 0x52, 0x13, 0xbb, - 0x22, 0x0a, 0xff, 0x03, 0x6a, 0x67, 0xc8, 0x18, 0xf5, 0x31, 0xaf, 0x5f, 0x71, 0x09, 0x19, 0x72, - 0x71, 0x4b, 0xe6, 0x37, 0xb5, 0x65, 0x6a, 0x35, 0xfe, 0x02, 0x20, 0xcc, 0xae, 0x37, 0x25, 0x87, - 0x16, 0xad, 0x5b, 0x6c, 0xfa, 0xd0, 0x44, 0x75, 0x8d, 0x5d, 0x5f, 0xc0, 0x7e, 0xa1, 0xeb, 0x6d, - 0xf8, 0xbc, 0x0c, 0x74, 0xf4, 0xe0, 0x46, 0x76, 0x1f, 0x60, 0x18, 0xcf, 0x02, 0x7e, 0x7e, 0x1d, - 0x29, 0x56, 0x58, 0x68, 0x92, 0xd2, 0x74, 0x59, 0x0a, 0x73, 0x0e, 0x77, 0xbf, 0x22, 0x1f, 0x26, - 0xa9, 0x9c, 0x9f, 0xa8, 0x1b, 0xda, 0xd4, 0x25, 0xee, 0xf1, 0x3a, 0x5b, 0x21, 0x3f, 0xc2, 0xce, - 0x48, 0x1c, 0x83, 0xea, 0xa8, 0x91, 0x79, 0x00, 0x8d, 0x92, 0xae, 0xd5, 0xfe, 0x0c, 0xaa, 0xbf, - 0xe3, 0x09, 0xe5, 0xf2, 0x2c, 0xd5, 0x83, 0xa7, 0xab, 0xa5, 0x07, 0xcf, 0x34, 0x0b, 0x5c, 0xaf, - 0x07, 0x7b, 0x41, 0xd4, 0x4e, 0xb3, 0xa7, 0x38, 0x7f, 0x9b, 0xdb, 0x7e, 0x12, 0x7b, 0x17, 0xaf, - 0x84, 0x14, 0x44, 0x9d, 0xfc, 0xab, 0xe3, 0x47, 0x9d, 0x94, 0x77, 0xb2, 0x48, 0xc7, 0x78, 0xe7, - 0xc7, 0x95, 0x4c, 0x7c, 0x7b, 0x15, 0x00, 0x00, 0xff, 0xff, 0x98, 0xf7, 0xf0, 0x85, 0x14, 0x08, - 0x00, 0x00, -} diff --git a/go/vt/proto/vtrpc/vtrpc.pb.go b/go/vt/proto/vtrpc/vtrpc.pb.go index 6881f6ed3a..560e65230d 100644 --- a/go/vt/proto/vtrpc/vtrpc.pb.go +++ b/go/vt/proto/vtrpc/vtrpc.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtrpc.proto -package vtrpc // import "vitess.io/vitess/go/vt/proto/vtrpc" +package vtrpc -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Code represents canonical error codes. The names, numbers and comments // must match the ones defined by grpc: @@ -144,6 +146,7 @@ var Code_name = map[int32]string{ 14: "UNAVAILABLE", 15: "DATA_LOSS", } + var Code_value = map[string]int32{ "OK": 0, "CANCELED": 1, @@ -167,8 +170,9 @@ var Code_value = map[string]int32{ func (x Code) String() string { return proto.EnumName(Code_name, int32(x)) } + func (Code) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{0} + return fileDescriptor_750b4cf641561858, []int{0} } // LegacyErrorCode is the enum values for Errors. This type is deprecated. @@ -256,6 +260,7 @@ var LegacyErrorCode_name = map[int32]string{ 11: "TRANSIENT_ERROR_LEGACY", 12: "UNAUTHENTICATED_LEGACY", } + var LegacyErrorCode_value = map[string]int32{ "SUCCESS_LEGACY": 0, "CANCELLED_LEGACY": 1, @@ -275,8 +280,9 @@ var LegacyErrorCode_value = map[string]int32{ func (x LegacyErrorCode) String() string { return proto.EnumName(LegacyErrorCode_name, int32(x)) } + func (LegacyErrorCode) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{1} + return fileDescriptor_750b4cf641561858, []int{1} } // CallerID is passed along RPCs to identify the originating client @@ -311,16 +317,17 @@ func (m *CallerID) Reset() { *m = CallerID{} } func (m *CallerID) String() string { return proto.CompactTextString(m) } func (*CallerID) ProtoMessage() {} func (*CallerID) Descriptor() ([]byte, []int) { - return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{0} + return fileDescriptor_750b4cf641561858, []int{0} } + func (m *CallerID) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_CallerID.Unmarshal(m, b) } func (m *CallerID) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_CallerID.Marshal(b, m, deterministic) } -func (dst *CallerID) XXX_Merge(src proto.Message) { - xxx_messageInfo_CallerID.Merge(dst, src) +func (m *CallerID) XXX_Merge(src proto.Message) { + xxx_messageInfo_CallerID.Merge(m, src) } func (m *CallerID) XXX_Size() int { return xxx_messageInfo_CallerID.Size(m) @@ -369,16 +376,17 @@ func (m *RPCError) Reset() { *m = RPCError{} } func (m *RPCError) String() string { return proto.CompactTextString(m) } func (*RPCError) ProtoMessage() {} func (*RPCError) Descriptor() ([]byte, []int) { - return fileDescriptor_vtrpc_88a14d8f1bc03cf5, []int{1} + return fileDescriptor_750b4cf641561858, []int{1} } + func (m *RPCError) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_RPCError.Unmarshal(m, b) } func (m *RPCError) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_RPCError.Marshal(b, m, deterministic) } -func (dst *RPCError) XXX_Merge(src proto.Message) { - xxx_messageInfo_RPCError.Merge(dst, src) +func (m *RPCError) XXX_Merge(src proto.Message) { + xxx_messageInfo_RPCError.Merge(m, src) } func (m *RPCError) XXX_Size() int { return xxx_messageInfo_RPCError.Size(m) @@ -411,15 +419,15 @@ func (m *RPCError) GetCode() Code { } func init() { - proto.RegisterType((*CallerID)(nil), "vtrpc.CallerID") - proto.RegisterType((*RPCError)(nil), "vtrpc.RPCError") proto.RegisterEnum("vtrpc.Code", Code_name, Code_value) proto.RegisterEnum("vtrpc.LegacyErrorCode", LegacyErrorCode_name, LegacyErrorCode_value) + proto.RegisterType((*CallerID)(nil), "vtrpc.CallerID") + proto.RegisterType((*RPCError)(nil), "vtrpc.RPCError") } -func init() { proto.RegisterFile("vtrpc.proto", fileDescriptor_vtrpc_88a14d8f1bc03cf5) } +func init() { proto.RegisterFile("vtrpc.proto", fileDescriptor_750b4cf641561858) } -var fileDescriptor_vtrpc_88a14d8f1bc03cf5 = []byte{ +var fileDescriptor_750b4cf641561858 = []byte{ // 605 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x93, 0x4d, 0x4f, 0x1b, 0x3b, 0x14, 0x86, 0xc9, 0x07, 0xf9, 0x38, 0x13, 0x88, 0x31, 0x5f, 0xe1, 0x5e, 0xae, 0xee, 0x55, 0x56, diff --git a/go/vt/proto/vttest/vttest.pb.go b/go/vt/proto/vttest/vttest.pb.go index b53058b7dc..9d72df30f4 100644 --- a/go/vt/proto/vttest/vttest.pb.go +++ b/go/vt/proto/vttest/vttest.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vttest.proto -package vttest // import "vitess.io/vitess/go/vt/proto/vttest" +package vttest -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // Shard describes a single shard in a keyspace. type Shard struct { @@ -37,16 +39,17 @@ func (m *Shard) Reset() { *m = Shard{} } func (m *Shard) String() string { return proto.CompactTextString(m) } func (*Shard) ProtoMessage() {} func (*Shard) Descriptor() ([]byte, []int) { - return fileDescriptor_vttest_6aca346ef34e15cf, []int{0} + return fileDescriptor_b9b3dc07179a1ec9, []int{0} } + func (m *Shard) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Shard.Unmarshal(m, b) } func (m *Shard) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Shard.Marshal(b, m, deterministic) } -func (dst *Shard) XXX_Merge(src proto.Message) { - xxx_messageInfo_Shard.Merge(dst, src) +func (m *Shard) XXX_Merge(src proto.Message) { + xxx_messageInfo_Shard.Merge(m, src) } func (m *Shard) XXX_Size() int { return xxx_messageInfo_Shard.Size(m) @@ -96,16 +99,17 @@ func (m *Keyspace) Reset() { *m = Keyspace{} } func (m *Keyspace) String() string { return proto.CompactTextString(m) } func (*Keyspace) ProtoMessage() {} func (*Keyspace) Descriptor() ([]byte, []int) { - return fileDescriptor_vttest_6aca346ef34e15cf, []int{1} + return fileDescriptor_b9b3dc07179a1ec9, []int{1} } + func (m *Keyspace) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Keyspace.Unmarshal(m, b) } func (m *Keyspace) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Keyspace.Marshal(b, m, deterministic) } -func (dst *Keyspace) XXX_Merge(src proto.Message) { - xxx_messageInfo_Keyspace.Merge(dst, src) +func (m *Keyspace) XXX_Merge(src proto.Message) { + xxx_messageInfo_Keyspace.Merge(m, src) } func (m *Keyspace) XXX_Size() int { return xxx_messageInfo_Keyspace.Size(m) @@ -180,16 +184,17 @@ func (m *VTTestTopology) Reset() { *m = VTTestTopology{} } func (m *VTTestTopology) String() string { return proto.CompactTextString(m) } func (*VTTestTopology) ProtoMessage() {} func (*VTTestTopology) Descriptor() ([]byte, []int) { - return fileDescriptor_vttest_6aca346ef34e15cf, []int{2} + return fileDescriptor_b9b3dc07179a1ec9, []int{2} } + func (m *VTTestTopology) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_VTTestTopology.Unmarshal(m, b) } func (m *VTTestTopology) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_VTTestTopology.Marshal(b, m, deterministic) } -func (dst *VTTestTopology) XXX_Merge(src proto.Message) { - xxx_messageInfo_VTTestTopology.Merge(dst, src) +func (m *VTTestTopology) XXX_Merge(src proto.Message) { + xxx_messageInfo_VTTestTopology.Merge(m, src) } func (m *VTTestTopology) XXX_Size() int { return xxx_messageInfo_VTTestTopology.Size(m) @@ -220,9 +225,9 @@ func init() { proto.RegisterType((*VTTestTopology)(nil), "vttest.VTTestTopology") } -func init() { proto.RegisterFile("vttest.proto", fileDescriptor_vttest_6aca346ef34e15cf) } +func init() { proto.RegisterFile("vttest.proto", fileDescriptor_b9b3dc07179a1ec9) } -var fileDescriptor_vttest_6aca346ef34e15cf = []byte{ +var fileDescriptor_b9b3dc07179a1ec9 = []byte{ // 322 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcb, 0x6a, 0xe3, 0x40, 0x10, 0x44, 0xb6, 0xa5, 0x5d, 0xb7, 0x1f, 0x98, 0xc1, 0x87, 0xb9, 0xad, 0xd7, 0xc6, 0xa0, 0x93, diff --git a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go index 4213557157..799436b8e1 100644 --- a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go +++ b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go @@ -1,12 +1,14 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtworkerdata.proto -package vtworkerdata // import "vitess.io/vitess/go/vt/proto/vtworkerdata" +package vtworkerdata -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import logutil "vitess.io/vitess/go/vt/proto/logutil" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" + logutil "vitess.io/vitess/go/vt/proto/logutil" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -17,7 +19,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // ExecuteVtworkerCommandRequest is the payload for ExecuteVtworkerCommand. type ExecuteVtworkerCommandRequest struct { @@ -31,16 +33,17 @@ func (m *ExecuteVtworkerCommandRequest) Reset() { *m = ExecuteVtworkerCo func (m *ExecuteVtworkerCommandRequest) String() string { return proto.CompactTextString(m) } func (*ExecuteVtworkerCommandRequest) ProtoMessage() {} func (*ExecuteVtworkerCommandRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_vtworkerdata_cae0940479e6aeb1, []int{0} + return fileDescriptor_32a791ab99179e8e, []int{0} } + func (m *ExecuteVtworkerCommandRequest) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteVtworkerCommandRequest.Unmarshal(m, b) } func (m *ExecuteVtworkerCommandRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteVtworkerCommandRequest.Marshal(b, m, deterministic) } -func (dst *ExecuteVtworkerCommandRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteVtworkerCommandRequest.Merge(dst, src) +func (m *ExecuteVtworkerCommandRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteVtworkerCommandRequest.Merge(m, src) } func (m *ExecuteVtworkerCommandRequest) XXX_Size() int { return xxx_messageInfo_ExecuteVtworkerCommandRequest.Size(m) @@ -70,16 +73,17 @@ func (m *ExecuteVtworkerCommandResponse) Reset() { *m = ExecuteVtworkerC func (m *ExecuteVtworkerCommandResponse) String() string { return proto.CompactTextString(m) } func (*ExecuteVtworkerCommandResponse) ProtoMessage() {} func (*ExecuteVtworkerCommandResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_vtworkerdata_cae0940479e6aeb1, []int{1} + return fileDescriptor_32a791ab99179e8e, []int{1} } + func (m *ExecuteVtworkerCommandResponse) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_ExecuteVtworkerCommandResponse.Unmarshal(m, b) } func (m *ExecuteVtworkerCommandResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_ExecuteVtworkerCommandResponse.Marshal(b, m, deterministic) } -func (dst *ExecuteVtworkerCommandResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ExecuteVtworkerCommandResponse.Merge(dst, src) +func (m *ExecuteVtworkerCommandResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ExecuteVtworkerCommandResponse.Merge(m, src) } func (m *ExecuteVtworkerCommandResponse) XXX_Size() int { return xxx_messageInfo_ExecuteVtworkerCommandResponse.Size(m) @@ -102,9 +106,9 @@ func init() { proto.RegisterType((*ExecuteVtworkerCommandResponse)(nil), "vtworkerdata.ExecuteVtworkerCommandResponse") } -func init() { proto.RegisterFile("vtworkerdata.proto", fileDescriptor_vtworkerdata_cae0940479e6aeb1) } +func init() { proto.RegisterFile("vtworkerdata.proto", fileDescriptor_32a791ab99179e8e) } -var fileDescriptor_vtworkerdata_cae0940479e6aeb1 = []byte{ +var fileDescriptor_32a791ab99179e8e = []byte{ // 175 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x2b, 0x29, 0xcf, 0x2f, 0xca, 0x4e, 0x2d, 0x4a, 0x49, 0x2c, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, diff --git a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go index bc38e2eca4..70e54ab317 100644 --- a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go +++ b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: vtworkerservice.proto -package vtworkerservice // import "vitess.io/vitess/go/vt/proto/vtworkerservice" - -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" -import vtworkerdata "vitess.io/vitess/go/vt/proto/vtworkerdata" +package vtworkerservice import ( - context "golang.org/x/net/context" + context "context" + fmt "fmt" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" + math "math" + vtworkerdata "vitess.io/vitess/go/vt/proto/vtworkerdata" ) // Reference imports to suppress errors if they are not otherwise used. @@ -22,7 +23,23 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +func init() { proto.RegisterFile("vtworkerservice.proto", fileDescriptor_884fe2c3e67151b3) } + +var fileDescriptor_884fe2c3e67151b3 = []byte{ + // 151 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x2b, 0x29, 0xcf, + 0x2f, 0xca, 0x4e, 0x2d, 0x2a, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0xe2, 0x47, 0x13, 0x96, 0x12, 0x82, 0x09, 0xa4, 0x24, 0x96, 0x24, 0x42, 0x14, 0x19, + 0x35, 0x33, 0x72, 0x71, 0x84, 0x41, 0x85, 0x85, 0xca, 0xb9, 0xc4, 0x5c, 0x2b, 0x52, 0x93, 0x4b, + 0x4b, 0x52, 0x61, 0x42, 0xce, 0xf9, 0xb9, 0xb9, 0x89, 0x79, 0x29, 0x42, 0xda, 0x7a, 0x28, 0x7a, + 0xb1, 0xab, 0x0a, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x91, 0xd2, 0x21, 0x4e, 0x71, 0x71, 0x41, + 0x7e, 0x5e, 0x71, 0xaa, 0x12, 0x83, 0x01, 0xa3, 0x93, 0x5e, 0x94, 0x4e, 0x59, 0x66, 0x49, 0x6a, + 0x71, 0xb1, 0x5e, 0x66, 0xbe, 0x3e, 0x84, 0xa5, 0x9f, 0x9e, 0xaf, 0x5f, 0x56, 0xa2, 0x0f, 0x76, + 0xa5, 0x3e, 0x9a, 0x4f, 0x92, 0xd8, 0xc0, 0xc2, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, + 0x01, 0x4d, 0x17, 0xfa, 0x00, 0x00, 0x00, +} // Reference imports to suppress errors if they are not otherwise used. var _ context.Context @@ -88,6 +105,14 @@ type VtworkerServer interface { ExecuteVtworkerCommand(*vtworkerdata.ExecuteVtworkerCommandRequest, Vtworker_ExecuteVtworkerCommandServer) error } +// UnimplementedVtworkerServer can be embedded to have forward compatible implementations. +type UnimplementedVtworkerServer struct { +} + +func (*UnimplementedVtworkerServer) ExecuteVtworkerCommand(req *vtworkerdata.ExecuteVtworkerCommandRequest, srv Vtworker_ExecuteVtworkerCommandServer) error { + return status.Errorf(codes.Unimplemented, "method ExecuteVtworkerCommand not implemented") +} + func RegisterVtworkerServer(s *grpc.Server, srv VtworkerServer) { s.RegisterService(&_Vtworker_serviceDesc, srv) } @@ -126,21 +151,3 @@ var _Vtworker_serviceDesc = grpc.ServiceDesc{ }, Metadata: "vtworkerservice.proto", } - -func init() { - proto.RegisterFile("vtworkerservice.proto", fileDescriptor_vtworkerservice_4efa3310356e3c00) -} - -var fileDescriptor_vtworkerservice_4efa3310356e3c00 = []byte{ - // 151 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x2b, 0x29, 0xcf, - 0x2f, 0xca, 0x4e, 0x2d, 0x2a, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, - 0xc9, 0x17, 0xe2, 0x47, 0x13, 0x96, 0x12, 0x82, 0x09, 0xa4, 0x24, 0x96, 0x24, 0x42, 0x14, 0x19, - 0x35, 0x33, 0x72, 0x71, 0x84, 0x41, 0x85, 0x85, 0xca, 0xb9, 0xc4, 0x5c, 0x2b, 0x52, 0x93, 0x4b, - 0x4b, 0x52, 0x61, 0x42, 0xce, 0xf9, 0xb9, 0xb9, 0x89, 0x79, 0x29, 0x42, 0xda, 0x7a, 0x28, 0x7a, - 0xb1, 0xab, 0x0a, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x91, 0xd2, 0x21, 0x4e, 0x71, 0x71, 0x41, - 0x7e, 0x5e, 0x71, 0xaa, 0x12, 0x83, 0x01, 0xa3, 0x93, 0x5e, 0x94, 0x4e, 0x59, 0x66, 0x49, 0x6a, - 0x71, 0xb1, 0x5e, 0x66, 0xbe, 0x3e, 0x84, 0xa5, 0x9f, 0x9e, 0xaf, 0x5f, 0x56, 0xa2, 0x0f, 0x76, - 0xa5, 0x3e, 0x9a, 0x4f, 0x92, 0xd8, 0xc0, 0xc2, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1c, - 0x01, 0x4d, 0x17, 0xfa, 0x00, 0x00, 0x00, -} diff --git a/go/vt/proto/workflow/workflow.pb.go b/go/vt/proto/workflow/workflow.pb.go index 8c173f294b..ffd9d3b695 100644 --- a/go/vt/proto/workflow/workflow.pb.go +++ b/go/vt/proto/workflow/workflow.pb.go @@ -1,11 +1,13 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: workflow.proto -package workflow // import "vitess.io/vitess/go/vt/proto/workflow" +package workflow -import proto "github.com/golang/protobuf/proto" -import fmt "fmt" -import math "math" +import ( + fmt "fmt" + proto "github.com/golang/protobuf/proto" + math "math" +) // Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal @@ -16,7 +18,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // WorkflowState describes the state of a workflow. // This constant should match the Node object described in @@ -35,6 +37,7 @@ var WorkflowState_name = map[int32]string{ 1: "Running", 2: "Done", } + var WorkflowState_value = map[string]int32{ "NotStarted": 0, "Running": 1, @@ -44,8 +47,9 @@ var WorkflowState_value = map[string]int32{ func (x WorkflowState) String() string { return proto.EnumName(WorkflowState_name, int32(x)) } + func (WorkflowState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_workflow_daba593a7423a6c7, []int{0} + return fileDescriptor_892c7f566756b0be, []int{0} } type TaskState int32 @@ -61,6 +65,7 @@ var TaskState_name = map[int32]string{ 1: "TaskRunning", 2: "TaskDone", } + var TaskState_value = map[string]int32{ "TaskNotStarted": 0, "TaskRunning": 1, @@ -70,8 +75,9 @@ var TaskState_value = map[string]int32{ func (x TaskState) String() string { return proto.EnumName(TaskState_name, int32(x)) } + func (TaskState) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_workflow_daba593a7423a6c7, []int{1} + return fileDescriptor_892c7f566756b0be, []int{1} } // Workflow is the persisted state of a long-running workflow. @@ -119,16 +125,17 @@ func (m *Workflow) Reset() { *m = Workflow{} } func (m *Workflow) String() string { return proto.CompactTextString(m) } func (*Workflow) ProtoMessage() {} func (*Workflow) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_daba593a7423a6c7, []int{0} + return fileDescriptor_892c7f566756b0be, []int{0} } + func (m *Workflow) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Workflow.Unmarshal(m, b) } func (m *Workflow) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Workflow.Marshal(b, m, deterministic) } -func (dst *Workflow) XXX_Merge(src proto.Message) { - xxx_messageInfo_Workflow.Merge(dst, src) +func (m *Workflow) XXX_Merge(src proto.Message) { + xxx_messageInfo_Workflow.Merge(m, src) } func (m *Workflow) XXX_Size() int { return xxx_messageInfo_Workflow.Size(m) @@ -223,16 +230,17 @@ func (m *WorkflowCheckpoint) Reset() { *m = WorkflowCheckpoint{} } func (m *WorkflowCheckpoint) String() string { return proto.CompactTextString(m) } func (*WorkflowCheckpoint) ProtoMessage() {} func (*WorkflowCheckpoint) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_daba593a7423a6c7, []int{1} + return fileDescriptor_892c7f566756b0be, []int{1} } + func (m *WorkflowCheckpoint) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_WorkflowCheckpoint.Unmarshal(m, b) } func (m *WorkflowCheckpoint) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_WorkflowCheckpoint.Marshal(b, m, deterministic) } -func (dst *WorkflowCheckpoint) XXX_Merge(src proto.Message) { - xxx_messageInfo_WorkflowCheckpoint.Merge(dst, src) +func (m *WorkflowCheckpoint) XXX_Merge(src proto.Message) { + xxx_messageInfo_WorkflowCheckpoint.Merge(m, src) } func (m *WorkflowCheckpoint) XXX_Size() int { return xxx_messageInfo_WorkflowCheckpoint.Size(m) @@ -279,16 +287,17 @@ func (m *Task) Reset() { *m = Task{} } func (m *Task) String() string { return proto.CompactTextString(m) } func (*Task) ProtoMessage() {} func (*Task) Descriptor() ([]byte, []int) { - return fileDescriptor_workflow_daba593a7423a6c7, []int{2} + return fileDescriptor_892c7f566756b0be, []int{2} } + func (m *Task) XXX_Unmarshal(b []byte) error { return xxx_messageInfo_Task.Unmarshal(m, b) } func (m *Task) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { return xxx_messageInfo_Task.Marshal(b, m, deterministic) } -func (dst *Task) XXX_Merge(src proto.Message) { - xxx_messageInfo_Task.Merge(dst, src) +func (m *Task) XXX_Merge(src proto.Message) { + xxx_messageInfo_Task.Merge(m, src) } func (m *Task) XXX_Size() int { return xxx_messageInfo_Task.Size(m) @@ -328,19 +337,19 @@ func (m *Task) GetError() string { } func init() { + proto.RegisterEnum("workflow.WorkflowState", WorkflowState_name, WorkflowState_value) + proto.RegisterEnum("workflow.TaskState", TaskState_name, TaskState_value) proto.RegisterType((*Workflow)(nil), "workflow.Workflow") proto.RegisterType((*WorkflowCheckpoint)(nil), "workflow.WorkflowCheckpoint") proto.RegisterMapType((map[string]string)(nil), "workflow.WorkflowCheckpoint.SettingsEntry") proto.RegisterMapType((map[string]*Task)(nil), "workflow.WorkflowCheckpoint.TasksEntry") proto.RegisterType((*Task)(nil), "workflow.Task") proto.RegisterMapType((map[string]string)(nil), "workflow.Task.AttributesEntry") - proto.RegisterEnum("workflow.WorkflowState", WorkflowState_name, WorkflowState_value) - proto.RegisterEnum("workflow.TaskState", TaskState_name, TaskState_value) } -func init() { proto.RegisterFile("workflow.proto", fileDescriptor_workflow_daba593a7423a6c7) } +func init() { proto.RegisterFile("workflow.proto", fileDescriptor_892c7f566756b0be) } -var fileDescriptor_workflow_daba593a7423a6c7 = []byte{ +var fileDescriptor_892c7f566756b0be = []byte{ // 517 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x6f, 0x8b, 0xd3, 0x4e, 0x10, 0xfe, 0x25, 0x6d, 0xae, 0xe9, 0xa4, 0x97, 0x2b, 0xf3, 0x3b, 0x30, 0x16, 0xd4, 0x5a, 0x94, diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 91e09e8f33..6fb2f81b17 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -342,17 +342,42 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e vs.plans[id] = nil return nil, nil } + + tableName := tm.Name + var cols []schema.TableColumn + hasFilter := false + for _, rule := range vs.filter.Rules { + if rule.Filter != "" { + // throw error. Column name might be need in filter. + hasFilter = true + break + } + } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) + vs.filter.BestEffortNameInFieldEvent = true if st == nil { - return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } - if len(st.Columns) < len(tm.Types) { - return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + if hasFilter || vs.filter.BestEffortNameInFieldEvent == false { + // throw error. Column name might be need in filter. + return nil, fmt.Errorf("unknown table %v in schema", tm.Name) + } + for _, typ := range tm.Types { + cols = append(cols, schema.TableColumn{ + Name: sqlparser.NewColIdent(""), + Type: mysql.MySqlTypeToVitessType[int32(typ)], + }) + } + } else { + tableName = st.Name.String() + if len(st.Columns) < len(tm.Types) && vs.filter.BestEffortNameInFieldEvent == false { + return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + } + cols = st.Columns[:len(tm.Types)] } + table := &Table{ - Name: st.Name.String(), + Name: tableName, // Columns should be truncated to match those in tm. - Columns: st.Columns[:len(tm.Types)], + Columns: cols, } plan, err := buildPlan(table, vs.kschema, vs.filter) if err != nil { diff --git a/proto/binlogdata.proto b/proto/binlogdata.proto index b28dbc5356..5bf2ef7f7d 100644 --- a/proto/binlogdata.proto +++ b/proto/binlogdata.proto @@ -130,6 +130,7 @@ message Rule { // wins. message Filter { repeated Rule rules = 1; + bool bestEffortNameInFieldEvent = 2; } // OnDDLAction lists the possible actions for DDLs. diff --git a/py/vtproto/binlogdata_pb2.py b/py/vtproto/binlogdata_pb2.py index 53eda7da5b..0a066c13a7 100644 --- a/py/vtproto/binlogdata_pb2.py +++ b/py/vtproto/binlogdata_pb2.py @@ -23,7 +23,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='binlogdata', syntax='proto3', serialized_options=_b('Z\'vitess.io/vitess/go/vt/proto/binlogdata'), - serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\")\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x90\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') + serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\"M\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\x12\"\n\x1a\x62\x65stEffortNameInFieldEvent\x18\x02 \x01(\x08\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x90\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') , dependencies=[vtrpc__pb2.DESCRIPTOR,query__pb2.DESCRIPTOR,topodata__pb2.DESCRIPTOR,]) @@ -52,8 +52,8 @@ _ONDDLACTION = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2751, - serialized_end=2813, + serialized_start=2787, + serialized_end=2849, ) _sym_db.RegisterEnumDescriptor(_ONDDLACTION) @@ -135,8 +135,8 @@ _VEVENTTYPE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2816, - serialized_end=3025, + serialized_start=2852, + serialized_end=3061, ) _sym_db.RegisterEnumDescriptor(_VEVENTTYPE) @@ -158,8 +158,8 @@ _MIGRATIONTYPE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=3027, - serialized_end=3066, + serialized_start=3063, + serialized_end=3102, ) _sym_db.RegisterEnumDescriptor(_MIGRATIONTYPE) @@ -576,6 +576,13 @@ _FILTER = _descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='bestEffortNameInFieldEvent', full_name='binlogdata.Filter.bestEffortNameInFieldEvent', index=1, + number=2, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -589,7 +596,7 @@ _FILTER = _descriptor.Descriptor( oneofs=[ ], serialized_start=993, - serialized_end=1034, + serialized_end=1070, ) @@ -661,8 +668,8 @@ _BINLOGSOURCE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1037, - serialized_end=1259, + serialized_start=1073, + serialized_end=1295, ) @@ -699,8 +706,8 @@ _ROWCHANGE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1261, - serialized_end=1327, + serialized_start=1297, + serialized_end=1363, ) @@ -737,8 +744,8 @@ _ROWEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1329, - serialized_end=1403, + serialized_start=1365, + serialized_end=1439, ) @@ -775,8 +782,8 @@ _FIELDEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1405, - serialized_end=1467, + serialized_start=1441, + serialized_end=1503, ) @@ -820,8 +827,8 @@ _SHARDGTID = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1469, - serialized_end=1527, + serialized_start=1505, + serialized_end=1563, ) @@ -851,8 +858,8 @@ _VGTID = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1529, - serialized_end=1580, + serialized_start=1565, + serialized_end=1616, ) @@ -889,8 +896,8 @@ _KEYSPACESHARD = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1582, - serialized_end=1630, + serialized_start=1618, + serialized_end=1666, ) @@ -962,8 +969,8 @@ _JOURNAL = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1633, - serialized_end=1860, + serialized_start=1669, + serialized_end=1896, ) @@ -1049,8 +1056,8 @@ _VEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1863, - serialized_end=2135, + serialized_start=1899, + serialized_end=2171, ) @@ -1108,8 +1115,8 @@ _VSTREAMREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2138, - serialized_end=2337, + serialized_start=2174, + serialized_end=2373, ) @@ -1139,8 +1146,8 @@ _VSTREAMRESPONSE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2339, - serialized_end=2392, + serialized_start=2375, + serialized_end=2428, ) @@ -1198,8 +1205,8 @@ _VSTREAMROWSREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2395, - serialized_end=2595, + serialized_start=2431, + serialized_end=2631, ) @@ -1257,8 +1264,8 @@ _VSTREAMROWSRESPONSE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2598, - serialized_end=2749, + serialized_start=2634, + serialized_end=2785, ) _BINLOGTRANSACTION_STATEMENT.fields_by_name['category'].enum_type = _BINLOGTRANSACTION_STATEMENT_CATEGORY From 4c8fd6d6c19f1df0c87ed4040e9c14f3e77341ae Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Mon, 23 Sep 2019 18:53:21 -0700 Subject: [PATCH 02/25] minor-cleanup Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 6fb2f81b17..55fd15798a 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -345,18 +345,9 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e tableName := tm.Name var cols []schema.TableColumn - hasFilter := false - for _, rule := range vs.filter.Rules { - if rule.Filter != "" { - // throw error. Column name might be need in filter. - hasFilter = true - break - } - } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) - vs.filter.BestEffortNameInFieldEvent = true if st == nil { - if hasFilter || vs.filter.BestEffortNameInFieldEvent == false { + if vs.filter.BestEffortNameInFieldEvent == false { // throw error. Column name might be need in filter. return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } From ea43aad819973682a7b0c2f2028eeb14a248149d Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 13:23:51 -0700 Subject: [PATCH 03/25] review-feedback Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/vstreamer.go | 44 +++++++++++++------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 55fd15798a..19b9cdcb39 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -345,24 +345,40 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e tableName := tm.Name var cols []schema.TableColumn + for i, typ := range tm.Types { + t, err := sqltypes.MySQLToType(int64(typ), int64(tm.Flags)) + if err != nil { + return nil, fmt.Errorf("unsupported type: %d", typ) + } + cols = append(cols, schema.TableColumn{ + Name: sqlparser.NewColIdent(fmt.Sprintf("@%d", i+1)), + Type: t, + }) + } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) - if st == nil { - if vs.filter.BestEffortNameInFieldEvent == false { - // throw error. Column name might be need in filter. - return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } - for _, typ := range tm.Types { - cols = append(cols, schema.TableColumn{ - Name: sqlparser.NewColIdent(""), - Type: mysql.MySqlTypeToVitessType[int32(typ)], - }) - } + if st == nil && !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } else { - tableName = st.Name.String() - if len(st.Columns) < len(tm.Types) && vs.filter.BestEffortNameInFieldEvent == false { + if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } - cols = st.Columns[:len(tm.Types)] + tableName = st.Name.String() + // check if the schema returned by schema.Engine matches with row. + schemaMatch := true + if len(tm.Types) == len(st.Columns) { + for i := range tm.Types { + t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) + if t != st.Columns[i].Type { + schemaMatch = false + break + } + } + } else { + schemaMatch = false + } + if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { + cols = st.Columns[:len(tm.Types)] + } } table := &Table{ From dc3d6df9e1a82b694aa8470e4c8b1e81ca901cf4 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 15:00:49 -0700 Subject: [PATCH 04/25] add-missing-type-mapping Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/vstreamer.go | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 19b9cdcb39..5cc0b0d667 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -348,7 +348,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e for i, typ := range tm.Types { t, err := sqltypes.MySQLToType(int64(typ), int64(tm.Flags)) if err != nil { - return nil, fmt.Errorf("unsupported type: %d", typ) + return nil, fmt.Errorf("unsupported type: %d, position: %d", typ, i) } cols = append(cols, schema.TableColumn{ Name: sqlparser.NewColIdent(fmt.Sprintf("@%d", i+1)), @@ -358,27 +358,26 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) if st == nil && !vs.filter.BestEffortNameInFieldEvent { return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } else { - if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { - return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) - } - tableName = st.Name.String() - // check if the schema returned by schema.Engine matches with row. - schemaMatch := true - if len(tm.Types) == len(st.Columns) { - for i := range tm.Types { - t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) - if t != st.Columns[i].Type { - schemaMatch = false - break - } + } + if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + } + tableName = st.Name.String() + // check if the schema returned by schema.Engine matches with row. + schemaMatch := true + if len(tm.Types) == len(st.Columns) { + for i := range tm.Types { + t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) + if t != st.Columns[i].Type { + schemaMatch = false + break } - } else { - schemaMatch = false - } - if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { - cols = st.Columns[:len(tm.Types)] } + } else { + schemaMatch = false + } + if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { + cols = st.Columns[:len(tm.Types)] } table := &Table{ From c86ee45dfabc5d8aa4404bf35c8119b443beaf39 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 17:13:25 -0700 Subject: [PATCH 05/25] minor Signed-off-by: Nitin Shatma --- go/mysql/replication_constants.go | 38 ------------------------------- go/sqltypes/type.go | 6 +++++ 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/go/mysql/replication_constants.go b/go/mysql/replication_constants.go index a3607fa212..cf5f2f8ce3 100644 --- a/go/mysql/replication_constants.go +++ b/go/mysql/replication_constants.go @@ -16,10 +16,6 @@ limitations under the License. package mysql -import ( - querypb "vitess.io/vitess/go/vt/proto/query" -) - // This file contains the constant definitions for this package. // This is the data type for a field. @@ -119,40 +115,6 @@ const ( TypeGeometry = 255 ) -var MySqlTypeToVitessType = map[int32]querypb.Type{ - TypeDecimal: querypb.Type_DECIMAL, - TypeTiny: querypb.Type_INT8, - TypeShort: querypb.Type_INT16, - TypeLong: querypb.Type_INT32, - TypeFloat: querypb.Type_FLOAT32, - TypeDouble: querypb.Type_FLOAT64, - TypeNull: querypb.Type_NULL_TYPE, - TypeTimestamp: querypb.Type_TIMESTAMP, - TypeLongLong: querypb.Type_INT64, - TypeInt24: querypb.Type_INT24, - TypeDate: querypb.Type_DATE, - TypeTime: querypb.Type_TIME, - TypeDateTime: querypb.Type_DATETIME, - TypeYear: querypb.Type_YEAR, - TypeNewDate: querypb.Type_DATETIME, - TypeVarchar: querypb.Type_VARCHAR, - TypeBit: querypb.Type_BIT, - TypeTimestamp2: querypb.Type_TIMESTAMP, - TypeDateTime2: querypb.Type_DATETIME, - TypeTime2: querypb.Type_TIME, - TypeJSON: querypb.Type_JSON, - TypeNewDecimal: querypb.Type_DECIMAL, - TypeEnum: querypb.Type_ENUM, - TypeSet: querypb.Type_SET, - TypeTinyBlob: querypb.Type_BLOB, - TypeMediumBlob: querypb.Type_BLOB, - TypeLongBlob: querypb.Type_BLOB, - TypeBlob: querypb.Type_BLOB, - TypeVarString: querypb.Type_BINARY, - TypeString: querypb.Type_BINARY, - TypeGeometry: querypb.Type_GEOMETRY, -} - // Constants for the type of an INTVAR_EVENT. const ( // IntVarInvalidInt is INVALID_INT_EVENT diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go index b123e882d7..c25e38580b 100644 --- a/go/sqltypes/type.go +++ b/go/sqltypes/type.go @@ -154,6 +154,7 @@ const ( // If you add to this map, make sure you add a test case // in tabletserver/endtoend. var mysqlToType = map[int64]querypb.Type{ + 0: Decimal, 1: Int8, 2: Int16, 3: Int32, @@ -169,8 +170,13 @@ var mysqlToType = map[int64]querypb.Type{ 13: Year, 15: VarChar, 16: Bit, + 17: Timestamp, + 18: Datetime, + 19: Time, 245: TypeJSON, 246: Decimal, + 247: Enum, + 248: Set, 249: Text, 250: Text, 251: Text, From 66dc8d0b3eeb4441a9ba28cfc0161aef76061192 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 20:59:16 -0700 Subject: [PATCH 06/25] test Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/engine_test.go | 2 +- .../tabletserver/vstreamer/vstreamer.go | 32 +++----- .../tabletserver/vstreamer/vstreamer_test.go | 80 +++++++++++++++---- 3 files changed, 76 insertions(+), 38 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/engine_test.go b/go/vt/vttablet/tabletserver/vstreamer/engine_test.go index c88a9aeef4..575b146b6e 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/engine_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/engine_test.go @@ -62,7 +62,7 @@ func TestUpdateVSchema(t *testing.T) { }}, } - _ = startStream(ctx, t, filter) + _ = startStream(ctx, t, filter, "") cancel() startCount := expectUpdateCount(t, 1) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 5cc0b0d667..b7848a1212 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -356,30 +356,20 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e }) } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) - if st == nil && !vs.filter.BestEffortNameInFieldEvent { - return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } - if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { - return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) - } - tableName = st.Name.String() - // check if the schema returned by schema.Engine matches with row. - schemaMatch := true - if len(tm.Types) == len(st.Columns) { - for i := range tm.Types { - t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) - if t != st.Columns[i].Type { - schemaMatch = false - break - } + if st == nil { + if !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } } else { - schemaMatch = false + // preserving old behavior. + if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + } + tableName = st.Name.String() + if len(tm.Types) == len(st.Columns) || !vs.filter.BestEffortNameInFieldEvent { + cols = st.Columns + } } - if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { - cols = st.Columns[:len(tm.Types)] - } - table := &Table{ Name: tableName, // Columns should be truncated to match those in tm. diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go index baa49af74e..5a7167768d 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go @@ -130,7 +130,7 @@ func TestStatements(t *testing.T) { }, { input: "describe stream1", }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestRegexp(t *testing.T) { @@ -172,7 +172,7 @@ func TestRegexp(t *testing.T) { `commit`, }}, }} - runCases(t, filter, testcases) + runCases(t, filter, testcases, "") } func TestREKeyRange(t *testing.T) { @@ -202,7 +202,7 @@ func TestREKeyRange(t *testing.T) { Filter: "-80", }}, } - ch := startStream(ctx, t, filter) + ch := startStream(ctx, t, filter, "") // 1, 2, 3 and 5 are in shard -80. // 4 and 6 are in shard 80-. @@ -306,7 +306,7 @@ func TestSelectFilter(t *testing.T) { `commit`, }}, }} - runCases(t, filter, testcases) + runCases(t, filter, testcases, "") } func TestDDLAddColumn(t *testing.T) { @@ -446,7 +446,7 @@ func TestUnsentDDL(t *testing.T) { Match: "/none/", }}, } - runCases(t, filter, testcases) + runCases(t, filter, testcases, "") } func TestBuffering(t *testing.T) { @@ -546,7 +546,55 @@ func TestBuffering(t *testing.T) { `type:DDL ddl:"alter table packet_test change val val varchar(128)" `, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") +} + +func TestBestEffortNameInFieldEvent(t *testing.T) { + if testing.Short() { + t.Skip() + } + filter := &binlogdatapb.Filter{ + BestEffortNameInFieldEvent: true, + Rules: []*binlogdatapb.Rule{{ + Match: "/.*/", + }}, + } + // Modeled after vttablet endtoend compatibility tests. + execStatements(t, []string{ + "create table vitess_null(id int, val varbinary(128), primary key(id))", + }) + position := masterPosition(t) + execStatements(t, []string{ + "insert into vitess_null values(1, 'abc')", + "rename table vitess_null to vitess_null_new", + }) + + defer execStatements(t, []string{ + "drop table vitess_null_new", + }) + engine.se.Reload(context.Background()) + testcases := []testcase{{ + input: []string{ + "insert into vitess_null_new values(2, 'abc')", + }, + output: [][]string{{ + `gtid|begin`, + `gtid|begin`, + `type:FIELD field_event: fields: > `, + `type:ROW row_event: > > `, + `commit`, + }, { + `gtid|begin`, + `type:DDL ddl:"rename table vitess_null to vitess_null_new" `, + }, { + `gtid|begin`, + `gtid|begin`, + `type:FIELD field_event: fields: > `, + `type:ROW row_event: > > `, + `commit`, + }}, + }} + runCases(t, filter, testcases, position) } func TestTypes(t *testing.T) { @@ -687,7 +735,7 @@ func TestTypes(t *testing.T) { `commit`, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestJSON(t *testing.T) { @@ -716,7 +764,7 @@ func TestJSON(t *testing.T) { `commit`, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestExternalTable(t *testing.T) { @@ -746,7 +794,7 @@ func TestExternalTable(t *testing.T) { `commit`, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestMinimalMode(t *testing.T) { @@ -827,12 +875,11 @@ func TestStatementMode(t *testing.T) { } } -func runCases(t *testing.T, filter *binlogdatapb.Filter, testcases []testcase) { +func runCases(t *testing.T, filter *binlogdatapb.Filter, testcases []testcase, postion string) { t.Helper() ctx, cancel := context.WithCancel(context.Background()) defer cancel() - - ch := startStream(ctx, t, filter) + ch := startStream(ctx, t, filter, postion) for _, tcase := range testcases { switch input := tcase.input.(type) { @@ -853,7 +900,6 @@ func runCases(t *testing.T, filter *binlogdatapb.Filter, testcases []testcase) { func expectLog(ctx context.Context, t *testing.T, input interface{}, ch <-chan []*binlogdatapb.VEvent, output [][]string) { t.Helper() - for _, wantset := range output { var evs []*binlogdatapb.VEvent var ok bool @@ -897,13 +943,15 @@ func expectLog(ctx context.Context, t *testing.T, input interface{}, ch <-chan [ } } -func startStream(ctx context.Context, t *testing.T, filter *binlogdatapb.Filter) <-chan []*binlogdatapb.VEvent { - pos := masterPosition(t) +func startStream(ctx context.Context, t *testing.T, filter *binlogdatapb.Filter, position string) <-chan []*binlogdatapb.VEvent { + if position == "" { + position = masterPosition(t) + } ch := make(chan []*binlogdatapb.VEvent) go func() { defer close(ch) - if err := vstream(ctx, t, pos, filter, ch); err != nil { + if err := vstream(ctx, t, position, filter, ch); err != nil { t.Error(err) } }() From 4d0a6e898506a0dc0cd57442a8de034ae20b9308 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 21:30:46 -0700 Subject: [PATCH 07/25] test Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/planbuilder.go | 3 +++ go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go index dc241c73b7..ac889024b1 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go +++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go @@ -72,6 +72,9 @@ func (plan *Plan) fields() []*querypb.Field { func (plan *Plan) filter(values []sqltypes.Value) (bool, []sqltypes.Value, error) { result := make([]sqltypes.Value, len(plan.ColExprs)) for i, colExpr := range plan.ColExprs { + if colExpr.ColNum >= len(values) { + return false, nil, fmt.Errorf("index out of range. colExpr.ColNum: %d len(values):%d!!", colExpr.ColNum, len(values)) + } result[i] = values[colExpr.ColNum] } if plan.Vindex == nil { diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index b7848a1212..ac7904e74d 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -361,15 +361,15 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } } else { - // preserving old behavior. if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } tableName = st.Name.String() - if len(tm.Types) == len(st.Columns) || !vs.filter.BestEffortNameInFieldEvent { - cols = st.Columns + if len(st.Columns) >= len(tm.Types) { + cols = st.Columns[:len(tm.Types)] } } + table := &Table{ Name: tableName, // Columns should be truncated to match those in tm. From 6ca8f08d6d1f9cb3468dad299c9fa5633cefeff4 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 23:08:56 -0700 Subject: [PATCH 08/25] fix-test Signed-off-by: Nitin Shatma --- go/sqltypes/type_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/sqltypes/type_test.go b/go/sqltypes/type_test.go index a4d5ed6f9b..c7b96fbe29 100644 --- a/go/sqltypes/type_test.go +++ b/go/sqltypes/type_test.go @@ -406,8 +406,8 @@ func TestMySQLToType(t *testing.T) { } func TestTypeError(t *testing.T) { - _, err := MySQLToType(17, 0) - want := "unsupported type: 17" + _, err := MySQLToType(50, 0) + want := "unsupported type: 50" if err == nil || err.Error() != want { t.Errorf("MySQLToType: %v, want %s", err, want) } From ce94093d750508be2134706d681db0dcf836a00f Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Sun, 29 Sep 2019 17:20:38 -0700 Subject: [PATCH 09/25] add-type-equivalence Signed-off-by: Nitin Shatma --- go/sqltypes/type.go | 16 ++++++++++++++ go/sqltypes/type_test.go | 21 +++++++++++++++++++ .../tabletserver/vstreamer/vstreamer.go | 19 ++++++++++++++--- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go index c25e38580b..a9c843c326 100644 --- a/go/sqltypes/type.go +++ b/go/sqltypes/type.go @@ -251,6 +251,22 @@ func MySQLToType(mysqlType, flags int64) (typ querypb.Type, err error) { return modifyType(result, flags), nil } +//TypeEquivalenceCheck returns whether two types are equivalent. +func TypeEquivalenceCheck(mysqlTypeFromBinlog, mysqlTypeFromSchema querypb.Type) (isEquivalent bool) { + return (mysqlTypeFromBinlog == mysqlTypeFromSchema) || + (mysqlTypeFromBinlog == VarChar && mysqlTypeFromSchema == VarBinary) || + (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Binary) || + (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Enum) || + (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Set) || + (mysqlTypeFromBinlog == Text && mysqlTypeFromSchema == Blob) || + (mysqlTypeFromBinlog == Int8 && mysqlTypeFromSchema == Uint8) || + (mysqlTypeFromBinlog == Int16 && mysqlTypeFromSchema == Uint16) || + (mysqlTypeFromBinlog == Int24 && mysqlTypeFromSchema == Uint24) || + (mysqlTypeFromBinlog == Int32 && mysqlTypeFromSchema == Uint32) || + (mysqlTypeFromBinlog == Int64 && mysqlTypeFromSchema == Uint64) + +} + // typeToMySQL is the reverse of mysqlToType. var typeToMySQL = map[querypb.Type]struct { typ int64 diff --git a/go/sqltypes/type_test.go b/go/sqltypes/type_test.go index c7b96fbe29..7b44d72af3 100644 --- a/go/sqltypes/type_test.go +++ b/go/sqltypes/type_test.go @@ -412,3 +412,24 @@ func TestTypeError(t *testing.T) { t.Errorf("MySQLToType: %v, want %s", err, want) } } + +func TestTypeEquivalenceCheck(t *testing.T) { + if !TypeEquivalenceCheck(Int16, Int16) { + t.Errorf("Int16 and Int16 are same type.") + } + if TypeEquivalenceCheck(Int16, Int24) { + t.Errorf("Int16 and Int24 are not same type.") + } + if !TypeEquivalenceCheck(VarChar, VarBinary) { + t.Errorf("VarChar in binlog and VarBinary in schema are equivalent type.") + } + if TypeEquivalenceCheck(VarBinary, VarChar) { + t.Errorf("VarBinary in binlog and VarChar in schema are not equivalent type.") + } + if !TypeEquivalenceCheck(Uint16, Uint16) { + t.Errorf("Int16 in binlog and Uint16 in schema are equivalent type.") + } + if TypeEquivalenceCheck(Uint16, Int16) { + t.Errorf("UInt16 in binlog and int16 in schema are not equivalent type.") + } +} diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index ac7904e74d..b733c1e6c4 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -342,11 +342,11 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e vs.plans[id] = nil return nil, nil } - tableName := tm.Name var cols []schema.TableColumn for i, typ := range tm.Types { - t, err := sqltypes.MySQLToType(int64(typ), int64(tm.Flags)) + t, err := sqltypes.MySQLToType(int64(typ), 0) + fmt.Printf("type conversion table tableName:%s typ:%d tm.Metadata[i]:%d t:%d\n", tableName, int64(typ), int64(tm.Metadata[i]), t) if err != nil { return nil, fmt.Errorf("unsupported type: %d, position: %d", typ, i) } @@ -365,7 +365,20 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } tableName = st.Name.String() - if len(st.Columns) >= len(tm.Types) { + // check if the schema returned by schema.Engine matches with row. + schemaMatch := true + if len(tm.Types) <= len(st.Columns) { + for i, typ := range tm.Types { + t, _ := sqltypes.MySQLToType(int64(typ), 0) + if !sqltypes.TypeEquivalenceCheck(t, st.Columns[i].Type) { + schemaMatch = false + break + } + } + } else { + schemaMatch = false + } + if schemaMatch { cols = st.Columns[:len(tm.Types)] } } From b9128119775f9b8d394e4eb575b260577619915e Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Mon, 23 Sep 2019 18:47:00 -0700 Subject: [PATCH 10/25] vstream optional field event Signed-off-by: Nitin Shatma --- go/mysql/replication_constants.go | 38 ++++++ .../automationservice/automationservice.pb.go | 7 + go/vt/proto/binlogdata/binlogdata.pb.go | 124 +++++++++++++++++- .../tabletserver/vstreamer/vstreamer.go | 37 +++++- proto/binlogdata.proto | 1 + py/vtproto/binlogdata_pb2.py | 75 ++++++----- 6 files changed, 238 insertions(+), 44 deletions(-) diff --git a/go/mysql/replication_constants.go b/go/mysql/replication_constants.go index cf5f2f8ce3..a3607fa212 100644 --- a/go/mysql/replication_constants.go +++ b/go/mysql/replication_constants.go @@ -16,6 +16,10 @@ limitations under the License. package mysql +import ( + querypb "vitess.io/vitess/go/vt/proto/query" +) + // This file contains the constant definitions for this package. // This is the data type for a field. @@ -115,6 +119,40 @@ const ( TypeGeometry = 255 ) +var MySqlTypeToVitessType = map[int32]querypb.Type{ + TypeDecimal: querypb.Type_DECIMAL, + TypeTiny: querypb.Type_INT8, + TypeShort: querypb.Type_INT16, + TypeLong: querypb.Type_INT32, + TypeFloat: querypb.Type_FLOAT32, + TypeDouble: querypb.Type_FLOAT64, + TypeNull: querypb.Type_NULL_TYPE, + TypeTimestamp: querypb.Type_TIMESTAMP, + TypeLongLong: querypb.Type_INT64, + TypeInt24: querypb.Type_INT24, + TypeDate: querypb.Type_DATE, + TypeTime: querypb.Type_TIME, + TypeDateTime: querypb.Type_DATETIME, + TypeYear: querypb.Type_YEAR, + TypeNewDate: querypb.Type_DATETIME, + TypeVarchar: querypb.Type_VARCHAR, + TypeBit: querypb.Type_BIT, + TypeTimestamp2: querypb.Type_TIMESTAMP, + TypeDateTime2: querypb.Type_DATETIME, + TypeTime2: querypb.Type_TIME, + TypeJSON: querypb.Type_JSON, + TypeNewDecimal: querypb.Type_DECIMAL, + TypeEnum: querypb.Type_ENUM, + TypeSet: querypb.Type_SET, + TypeTinyBlob: querypb.Type_BLOB, + TypeMediumBlob: querypb.Type_BLOB, + TypeLongBlob: querypb.Type_BLOB, + TypeBlob: querypb.Type_BLOB, + TypeVarString: querypb.Type_BINARY, + TypeString: querypb.Type_BINARY, + TypeGeometry: querypb.Type_GEOMETRY, +} + // Constants for the type of an INTVAR_EVENT. const ( // IntVarInvalidInt is INVALID_INT_EVENT diff --git a/go/vt/proto/automationservice/automationservice.pb.go b/go/vt/proto/automationservice/automationservice.pb.go index bc2062f662..f97c0afc70 100644 --- a/go/vt/proto/automationservice/automationservice.pb.go +++ b/go/vt/proto/automationservice/automationservice.pb.go @@ -6,12 +6,19 @@ package automationservice import ( context "context" fmt "fmt" +<<<<<<< HEAD math "math" +======= +>>>>>>> vstream optional field event proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" +<<<<<<< HEAD +======= + math "math" +>>>>>>> vstream optional field event automation "vitess.io/vitess/go/vt/proto/automation" ) diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index 5909c80761..d513b7df0e 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -5,9 +5,14 @@ package binlogdata import ( fmt "fmt" +<<<<<<< HEAD math "math" proto "github.com/golang/protobuf/proto" +======= + proto "github.com/golang/protobuf/proto" + math "math" +>>>>>>> vstream optional field event query "vitess.io/vitess/go/vt/proto/query" topodata "vitess.io/vitess/go/vt/proto/topodata" vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" @@ -627,10 +632,11 @@ func (m *Rule) GetFilter() string { // Filter represents a list of ordered rules. First match // wins. type Filter struct { - Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` + BestEffortNameInFieldEvent bool `protobuf:"varint,2,opt,name=bestEffortNameInFieldEvent,proto3" json:"bestEffortNameInFieldEvent,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Filter) Reset() { *m = Filter{} } @@ -665,6 +671,13 @@ func (m *Filter) GetRules() []*Rule { return nil } +func (m *Filter) GetBestEffortNameInFieldEvent() bool { + if m != nil { + return m.BestEffortNameInFieldEvent + } + return false +} + // BinlogSource specifies the source and filter parameters for // Filtered Replication. It currently supports a keyrange // or a list of tables. @@ -1527,6 +1540,7 @@ func init() { func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) } var fileDescriptor_5fd02bcb2e350dad = []byte{ +<<<<<<< HEAD // 1558 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xdb, 0xca, 0x11, 0x35, 0x09, 0xf0, 0xd5, 0x90, 0x28, 0x68, 0xf4, 0x08, 0xa3, 0x8a, 0x53, 0x0a, 0x2a, 0x8e, @@ -1626,4 +1640,106 @@ var fileDescriptor_5fd02bcb2e350dad = []byte{ 0x24, 0x49, 0xd3, 0x8f, 0x0e, 0x05, 0x75, 0x78, 0x1d, 0x1d, 0xce, 0xe9, 0x21, 0xff, 0x0b, 0x7a, 0xb8, 0x78, 0x3e, 0x97, 0x65, 0xce, 0xf9, 0xcd, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xb4, 0x72, 0xde, 0xde, 0x0e, 0x00, 0x00, +======= + // 1583 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xe3, 0x4c, + 0x15, 0x1e, 0x5b, 0xf2, 0xed, 0x28, 0x71, 0x94, 0xce, 0x05, 0x93, 0xe2, 0xa7, 0x82, 0x8a, 0x9f, + 0x84, 0x54, 0xe1, 0x80, 0x81, 0x61, 0x35, 0x33, 0xf8, 0xa2, 0xc9, 0x38, 0x51, 0xec, 0x4c, 0x5b, + 0xc9, 0x50, 0xb3, 0x51, 0x29, 0x56, 0x3b, 0x11, 0x91, 0x25, 0x8f, 0xd4, 0x76, 0xc8, 0x03, 0x50, + 0x3c, 0x00, 0x5b, 0x5e, 0x80, 0x3d, 0x5b, 0xb6, 0xec, 0x79, 0x02, 0x56, 0xbc, 0x07, 0xd5, 0x17, + 0xc9, 0x56, 0x66, 0x98, 0xc9, 0x50, 0xc5, 0xe2, 0xdf, 0xa8, 0x4e, 0x9f, 0x3e, 0xd7, 0xef, 0x9c, + 0xee, 0xd3, 0x02, 0xfd, 0xda, 0x0f, 0x83, 0xe8, 0xc6, 0x73, 0xa9, 0xdb, 0x9c, 0xc5, 0x11, 0x8d, + 0x10, 0x2c, 0x39, 0x7b, 0xda, 0x82, 0xc6, 0xb3, 0xb1, 0xd8, 0xd8, 0xd3, 0x3e, 0xcc, 0x49, 0xfc, + 0x20, 0x17, 0x75, 0x1a, 0xcd, 0xa2, 0xa5, 0x96, 0x71, 0x0e, 0x95, 0xee, 0xad, 0x1b, 0x27, 0x84, + 0xa2, 0x5d, 0x28, 0x8f, 0x03, 0x9f, 0x84, 0xb4, 0x51, 0xd8, 0x2f, 0x1c, 0x96, 0xb0, 0x5c, 0x21, + 0x04, 0xea, 0x38, 0x0a, 0xc3, 0x46, 0x91, 0x73, 0x39, 0xcd, 0x64, 0x13, 0x12, 0x2f, 0x48, 0xdc, + 0x50, 0x84, 0xac, 0x58, 0x19, 0xff, 0x56, 0x60, 0xb3, 0xc3, 0xe3, 0xb0, 0x63, 0x37, 0x4c, 0xdc, + 0x31, 0xf5, 0xa3, 0x10, 0x9d, 0x00, 0x24, 0xd4, 0xa5, 0x64, 0x4a, 0x42, 0x9a, 0x34, 0x0a, 0xfb, + 0xca, 0xa1, 0xd6, 0x3a, 0x68, 0xae, 0x64, 0xf0, 0x91, 0x4a, 0x73, 0x94, 0xca, 0xe3, 0x15, 0x55, + 0xd4, 0x02, 0x8d, 0x2c, 0x48, 0x48, 0x1d, 0x1a, 0xdd, 0x91, 0xb0, 0xa1, 0xee, 0x17, 0x0e, 0xb5, + 0xd6, 0x66, 0x53, 0x24, 0x68, 0xb2, 0x1d, 0x9b, 0x6d, 0x60, 0x20, 0x19, 0xbd, 0xf7, 0x8f, 0x22, + 0xd4, 0x32, 0x6b, 0xc8, 0x82, 0xea, 0xd8, 0xa5, 0xe4, 0x26, 0x8a, 0x1f, 0x78, 0x9a, 0xf5, 0xd6, + 0xcf, 0x9f, 0x18, 0x48, 0xb3, 0x2b, 0xf5, 0x70, 0x66, 0x01, 0xfd, 0x0c, 0x2a, 0x63, 0x81, 0x1e, + 0x47, 0x47, 0x6b, 0x6d, 0xad, 0x1a, 0x93, 0xc0, 0xe2, 0x54, 0x06, 0xe9, 0xa0, 0x24, 0x1f, 0x02, + 0x0e, 0xd9, 0x1a, 0x66, 0xa4, 0xf1, 0xd7, 0x02, 0x54, 0x53, 0xbb, 0x68, 0x0b, 0x36, 0x3a, 0x96, + 0x73, 0x39, 0xc0, 0x66, 0x77, 0x78, 0x32, 0xe8, 0xbf, 0x37, 0x7b, 0xfa, 0x33, 0xb4, 0x06, 0xd5, + 0x8e, 0xe5, 0x74, 0xcc, 0x93, 0xfe, 0x40, 0x2f, 0xa0, 0x75, 0xa8, 0x75, 0x2c, 0xa7, 0x3b, 0x3c, + 0x3f, 0xef, 0xdb, 0x7a, 0x11, 0x6d, 0x80, 0xd6, 0xb1, 0x1c, 0x3c, 0xb4, 0xac, 0x4e, 0xbb, 0x7b, + 0xa6, 0x2b, 0x68, 0x07, 0x36, 0x3b, 0x96, 0xd3, 0x3b, 0xb7, 0x9c, 0x9e, 0x79, 0x81, 0xcd, 0x6e, + 0xdb, 0x36, 0x7b, 0xba, 0x8a, 0x00, 0xca, 0x8c, 0xdd, 0xb3, 0xf4, 0x92, 0xa4, 0x47, 0xa6, 0xad, + 0x97, 0xa5, 0xb9, 0xfe, 0x60, 0x64, 0x62, 0x5b, 0xaf, 0xc8, 0xe5, 0xe5, 0x45, 0xaf, 0x6d, 0x9b, + 0x7a, 0x55, 0x2e, 0x7b, 0xa6, 0x65, 0xda, 0xa6, 0x5e, 0x3b, 0x55, 0xab, 0x45, 0x5d, 0x39, 0x55, + 0xab, 0x8a, 0xae, 0x1a, 0x7f, 0x2e, 0xc0, 0xce, 0x88, 0xc6, 0xc4, 0x9d, 0x9e, 0x91, 0x07, 0xec, + 0x86, 0x37, 0x04, 0x93, 0x0f, 0x73, 0x92, 0x50, 0xb4, 0x07, 0xd5, 0x59, 0x94, 0xf8, 0x0c, 0x3b, + 0x0e, 0x70, 0x0d, 0x67, 0x6b, 0x74, 0x0c, 0xb5, 0x3b, 0xf2, 0xe0, 0xc4, 0x4c, 0x5e, 0x02, 0x86, + 0x9a, 0x59, 0x43, 0x66, 0x96, 0xaa, 0x77, 0x92, 0x5a, 0xc5, 0x57, 0xf9, 0x32, 0xbe, 0xc6, 0x04, + 0x76, 0x1f, 0x07, 0x95, 0xcc, 0xa2, 0x30, 0x21, 0xc8, 0x02, 0x24, 0x14, 0x1d, 0xba, 0xac, 0x2d, + 0x8f, 0x4f, 0x6b, 0x7d, 0xf3, 0xd9, 0x06, 0xc0, 0x9b, 0xd7, 0x8f, 0x59, 0xc6, 0x1f, 0x60, 0x4b, + 0xf8, 0xb1, 0xdd, 0xeb, 0x80, 0x24, 0x4f, 0x49, 0x7d, 0x17, 0xca, 0x94, 0x0b, 0x37, 0x8a, 0xfb, + 0xca, 0x61, 0x0d, 0xcb, 0xd5, 0xd7, 0x66, 0xe8, 0xc1, 0x76, 0xde, 0xf3, 0xff, 0x25, 0xbf, 0x5f, + 0x81, 0x8a, 0xe7, 0x01, 0x41, 0xdb, 0x50, 0x9a, 0xba, 0x74, 0x7c, 0x2b, 0xb3, 0x11, 0x0b, 0x96, + 0xca, 0xc4, 0x0f, 0x28, 0x89, 0x79, 0x09, 0x6b, 0x58, 0xae, 0x8c, 0x19, 0x94, 0x5f, 0x73, 0x0a, + 0xfd, 0x04, 0x4a, 0xf1, 0x9c, 0xe5, 0x2a, 0x8e, 0xba, 0xbe, 0x1a, 0x00, 0x33, 0x8c, 0xc5, 0x36, + 0x7a, 0x09, 0x7b, 0xd7, 0x24, 0xa1, 0xe6, 0x64, 0x12, 0xc5, 0x74, 0xe0, 0x4e, 0x49, 0x3f, 0x7c, + 0xed, 0x93, 0xc0, 0xe3, 0x27, 0x99, 0x5b, 0xaf, 0xe2, 0xcf, 0x48, 0x18, 0x7f, 0x29, 0xc2, 0x9a, + 0x48, 0x68, 0x14, 0xcd, 0xe3, 0x31, 0x61, 0x15, 0xb8, 0x23, 0x0f, 0xc9, 0xcc, 0x1d, 0x93, 0xb4, + 0x02, 0xe9, 0x9a, 0x25, 0x93, 0xdc, 0xba, 0xb1, 0x27, 0xa3, 0x16, 0x0b, 0xf4, 0x6b, 0xd0, 0x78, + 0x25, 0xa8, 0x43, 0x1f, 0x66, 0x84, 0xd7, 0xa0, 0xde, 0xda, 0x5e, 0x36, 0x25, 0xc7, 0x99, 0xda, + 0x0f, 0x33, 0x82, 0x81, 0x66, 0x74, 0xbe, 0x93, 0xd5, 0x27, 0x74, 0xf2, 0xb2, 0xfe, 0xa5, 0x5c, + 0xfd, 0x8f, 0x32, 0x30, 0xcb, 0xd2, 0xca, 0x0a, 0x56, 0x02, 0xce, 0x14, 0x60, 0xd4, 0x84, 0x72, + 0x14, 0x3a, 0x9e, 0x17, 0x34, 0x2a, 0x3c, 0xcc, 0xef, 0xad, 0xca, 0x0e, 0xc3, 0x5e, 0xcf, 0x6a, + 0x8b, 0x92, 0x96, 0xa2, 0xb0, 0xe7, 0x05, 0xc6, 0x5b, 0xa8, 0xe1, 0xe8, 0xbe, 0x7b, 0xcb, 0x03, + 0x30, 0xa0, 0x7c, 0x4d, 0x26, 0x51, 0x4c, 0x64, 0x57, 0x80, 0xbc, 0x35, 0x71, 0x74, 0x8f, 0xe5, + 0x0e, 0xda, 0x87, 0x92, 0x3b, 0x49, 0x0b, 0x9b, 0x17, 0x11, 0x1b, 0x86, 0x0b, 0x55, 0x1c, 0xdd, + 0x73, 0xf4, 0xd1, 0x37, 0x20, 0x10, 0x71, 0x42, 0x77, 0x9a, 0xc2, 0x5d, 0xe3, 0x1c, 0x56, 0x28, + 0xf4, 0x1c, 0xb4, 0x38, 0xba, 0x77, 0xc6, 0xdc, 0xbd, 0x68, 0x7b, 0xad, 0xb5, 0x93, 0x6b, 0x85, + 0x34, 0x38, 0x0c, 0x71, 0x4a, 0x26, 0xc6, 0x5b, 0x80, 0x65, 0x89, 0xbf, 0xe4, 0xe4, 0xc7, 0x0c, + 0x3e, 0x12, 0x78, 0xa9, 0xfd, 0x35, 0x19, 0x32, 0xb7, 0x80, 0xe5, 0x1e, 0x03, 0x62, 0xc4, 0xaa, + 0x7d, 0x42, 0x7d, 0xef, 0x7f, 0xe8, 0x11, 0x04, 0xea, 0x0d, 0xf5, 0x3d, 0xde, 0x1c, 0x35, 0xcc, + 0x69, 0xe3, 0x15, 0x94, 0xae, 0xb8, 0xb9, 0xe7, 0xa0, 0x71, 0x29, 0x87, 0xb1, 0xd3, 0x8e, 0xcf, + 0xa5, 0x99, 0xb9, 0xc6, 0x90, 0xa4, 0x64, 0x62, 0xb4, 0x61, 0xfd, 0x4c, 0xba, 0xe5, 0x02, 0x5f, + 0x1f, 0x97, 0xf1, 0xb7, 0x22, 0x54, 0x4e, 0xa3, 0x79, 0x1c, 0xba, 0x01, 0xaa, 0x43, 0xd1, 0xf7, + 0xb8, 0x9e, 0x82, 0x8b, 0xbe, 0x87, 0x7e, 0x0b, 0xf5, 0xa9, 0x7f, 0x13, 0xbb, 0xac, 0x1f, 0x44, + 0x6b, 0x17, 0x79, 0xcf, 0x7c, 0x7f, 0x35, 0xb2, 0xf3, 0x54, 0x82, 0xf7, 0xf7, 0xfa, 0x74, 0x75, + 0xb9, 0xd2, 0xb1, 0x4a, 0xae, 0x63, 0xbf, 0x85, 0x7a, 0x10, 0x8d, 0xdd, 0xc0, 0xc9, 0xee, 0x3a, + 0x95, 0x07, 0xb5, 0xce, 0xb9, 0x17, 0xe9, 0x85, 0xf7, 0x08, 0x97, 0xd2, 0x13, 0x71, 0x41, 0x2f, + 0x60, 0x6d, 0xe6, 0xc6, 0xd4, 0x1f, 0xfb, 0x33, 0x97, 0xbd, 0x16, 0xca, 0x5c, 0x31, 0x17, 0x76, + 0x0e, 0x37, 0x9c, 0x13, 0x47, 0x3f, 0x82, 0xb5, 0x98, 0x2c, 0x48, 0x9c, 0x10, 0xcf, 0x61, 0x7e, + 0x2b, 0xfb, 0xca, 0xa1, 0x82, 0xb5, 0x94, 0xd7, 0xf7, 0x12, 0xe3, 0x5f, 0x45, 0x28, 0x5f, 0x89, + 0xee, 0x3a, 0x02, 0x95, 0x63, 0x23, 0x5e, 0x02, 0xbb, 0xab, 0x4e, 0x84, 0x04, 0x07, 0x86, 0xcb, + 0xa0, 0x1f, 0x40, 0x8d, 0xfa, 0x53, 0x92, 0x50, 0x77, 0x3a, 0xe3, 0x60, 0x2a, 0x78, 0xc9, 0xf8, + 0x54, 0x8f, 0xb0, 0x71, 0xcf, 0x0e, 0xab, 0x80, 0x87, 0x91, 0xe8, 0x17, 0x50, 0x63, 0x67, 0x82, + 0xbf, 0x4e, 0x1a, 0x25, 0x7e, 0xc8, 0xb6, 0x1f, 0x9d, 0x08, 0xee, 0x16, 0x57, 0xe3, 0xf4, 0x94, + 0xfd, 0x06, 0x34, 0xde, 0xc5, 0x52, 0x49, 0xdc, 0x12, 0xbb, 0xf9, 0x5b, 0x22, 0x3d, 0x2d, 0x18, + 0x26, 0xcb, 0x93, 0x73, 0x00, 0xa5, 0x05, 0x0f, 0xa9, 0x22, 0x5f, 0x49, 0xab, 0xc9, 0x71, 0xd8, + 0xc5, 0x3e, 0x1b, 0x41, 0xbf, 0x17, 0x5d, 0xd4, 0xa8, 0x7e, 0x3c, 0x82, 0x64, 0x83, 0xe1, 0x54, + 0x86, 0x21, 0x3c, 0x9e, 0xc7, 0x31, 0x7f, 0x85, 0xf9, 0x53, 0xd2, 0xd8, 0xe6, 0x50, 0x68, 0x92, + 0x67, 0xfb, 0x53, 0x62, 0xfc, 0xa9, 0x08, 0xf5, 0x2b, 0x31, 0xa7, 0xd2, 0xd9, 0xf8, 0x0a, 0xb6, + 0xc8, 0x64, 0x42, 0xc6, 0xd4, 0x5f, 0x10, 0x67, 0xec, 0x06, 0x01, 0x89, 0x1d, 0xd9, 0xb0, 0x5a, + 0x6b, 0xa3, 0x29, 0xde, 0xab, 0x5d, 0xce, 0xef, 0xf7, 0xf0, 0x66, 0x26, 0x2b, 0x59, 0x1e, 0x32, + 0x61, 0xcb, 0x9f, 0x4e, 0x89, 0xe7, 0xbb, 0x74, 0xd5, 0x80, 0xb8, 0xa9, 0x76, 0xe4, 0xb1, 0xbf, + 0xb2, 0x4f, 0x5c, 0x4a, 0x96, 0x66, 0x32, 0x8d, 0xcc, 0xcc, 0xb7, 0xac, 0xab, 0xe3, 0x9b, 0x6c, + 0xdc, 0xae, 0x4b, 0x4d, 0x9b, 0x33, 0xb1, 0xdc, 0xcc, 0x8d, 0x72, 0xf5, 0xd1, 0x28, 0x5f, 0x5e, + 0xd9, 0xa5, 0x2f, 0x5d, 0xd9, 0xc6, 0x0b, 0xd8, 0xc8, 0x80, 0x90, 0xa3, 0xfa, 0x08, 0xca, 0xbc, + 0x94, 0xe9, 0x5d, 0x81, 0x3e, 0xee, 0x3a, 0x2c, 0x25, 0x8c, 0x3f, 0x16, 0x01, 0xa5, 0xfa, 0xd1, + 0x7d, 0xf2, 0x1d, 0x05, 0x73, 0x1b, 0x4a, 0x9c, 0x2f, 0x91, 0x14, 0x0b, 0x86, 0x43, 0xe0, 0x26, + 0x74, 0x76, 0x97, 0xc1, 0x28, 0x94, 0xdf, 0xb2, 0x2f, 0x26, 0xc9, 0x3c, 0xa0, 0x58, 0x4a, 0x18, + 0x7f, 0x2f, 0xc0, 0x56, 0x0e, 0x07, 0x89, 0xe5, 0xf2, 0xfa, 0x2f, 0xfc, 0xf7, 0xeb, 0x1f, 0x1d, + 0x42, 0x75, 0x76, 0xf7, 0x99, 0x31, 0x91, 0xed, 0x7e, 0xf2, 0x14, 0xff, 0x10, 0xd4, 0x38, 0xba, + 0x4f, 0x1a, 0x2a, 0xd7, 0x5c, 0x9d, 0x89, 0x9c, 0xcf, 0x06, 0x6b, 0x2e, 0x8f, 0xdc, 0x60, 0x15, + 0x3b, 0x47, 0x2f, 0x41, 0x5b, 0x99, 0xcf, 0xec, 0x09, 0xde, 0x3f, 0x19, 0x0c, 0xb1, 0xa9, 0x3f, + 0x43, 0x55, 0x50, 0x47, 0xf6, 0xf0, 0x42, 0x2f, 0x30, 0xca, 0xfc, 0x9d, 0xd9, 0x15, 0xcf, 0x7a, + 0x46, 0x39, 0x52, 0x48, 0x39, 0xfa, 0x67, 0x01, 0x60, 0x79, 0x21, 0x21, 0x0d, 0x2a, 0x97, 0x83, + 0xb3, 0xc1, 0xf0, 0xdd, 0x40, 0x18, 0x38, 0xb1, 0xfb, 0x3d, 0xbd, 0x80, 0x6a, 0x50, 0x12, 0xff, + 0x09, 0x45, 0xe6, 0x41, 0xfe, 0x24, 0x28, 0xec, 0x0f, 0x22, 0xfb, 0x43, 0x50, 0x51, 0x05, 0x94, + 0xec, 0x3f, 0x40, 0x3e, 0xfc, 0xcb, 0xcc, 0x20, 0x36, 0x2f, 0xac, 0x76, 0xd7, 0xd4, 0x2b, 0x6c, + 0x23, 0xfb, 0x05, 0x00, 0x28, 0xa7, 0xef, 0x7f, 0xa6, 0xc9, 0xfe, 0x1a, 0x80, 0xf9, 0x19, 0xda, + 0x6f, 0x4c, 0xac, 0x6b, 0x8c, 0x87, 0x87, 0xef, 0xf4, 0x35, 0xc6, 0x7b, 0xdd, 0x37, 0xad, 0x9e, + 0xbe, 0xce, 0x7e, 0x1b, 0xde, 0x98, 0x6d, 0x6c, 0x77, 0xcc, 0xb6, 0xad, 0xd7, 0xd9, 0xce, 0x15, + 0x0f, 0x70, 0x83, 0xb9, 0x39, 0x1d, 0x5e, 0xe2, 0x41, 0xdb, 0xd2, 0xf5, 0xa3, 0x03, 0x58, 0xcf, + 0xcd, 0x1f, 0xe6, 0xcb, 0x6e, 0x77, 0x2c, 0x73, 0xa4, 0x3f, 0x63, 0xf4, 0xe8, 0x4d, 0x1b, 0xf7, + 0x46, 0x7a, 0xa1, 0xf3, 0xd3, 0xf7, 0x07, 0x0b, 0x9f, 0x92, 0x24, 0x69, 0xfa, 0xd1, 0xb1, 0xa0, + 0x8e, 0x6f, 0xa2, 0xe3, 0x05, 0x3d, 0xe6, 0xbf, 0xb0, 0xc7, 0xcb, 0xe3, 0x73, 0x5d, 0xe6, 0x9c, + 0x5f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x62, 0xe7, 0xb4, 0xdc, 0x1e, 0x0f, 0x00, 0x00, +>>>>>>> vstream optional field event } diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 91e09e8f33..6fb2f81b17 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -342,17 +342,42 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e vs.plans[id] = nil return nil, nil } + + tableName := tm.Name + var cols []schema.TableColumn + hasFilter := false + for _, rule := range vs.filter.Rules { + if rule.Filter != "" { + // throw error. Column name might be need in filter. + hasFilter = true + break + } + } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) + vs.filter.BestEffortNameInFieldEvent = true if st == nil { - return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } - if len(st.Columns) < len(tm.Types) { - return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + if hasFilter || vs.filter.BestEffortNameInFieldEvent == false { + // throw error. Column name might be need in filter. + return nil, fmt.Errorf("unknown table %v in schema", tm.Name) + } + for _, typ := range tm.Types { + cols = append(cols, schema.TableColumn{ + Name: sqlparser.NewColIdent(""), + Type: mysql.MySqlTypeToVitessType[int32(typ)], + }) + } + } else { + tableName = st.Name.String() + if len(st.Columns) < len(tm.Types) && vs.filter.BestEffortNameInFieldEvent == false { + return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + } + cols = st.Columns[:len(tm.Types)] } + table := &Table{ - Name: st.Name.String(), + Name: tableName, // Columns should be truncated to match those in tm. - Columns: st.Columns[:len(tm.Types)], + Columns: cols, } plan, err := buildPlan(table, vs.kschema, vs.filter) if err != nil { diff --git a/proto/binlogdata.proto b/proto/binlogdata.proto index b28dbc5356..5bf2ef7f7d 100644 --- a/proto/binlogdata.proto +++ b/proto/binlogdata.proto @@ -130,6 +130,7 @@ message Rule { // wins. message Filter { repeated Rule rules = 1; + bool bestEffortNameInFieldEvent = 2; } // OnDDLAction lists the possible actions for DDLs. diff --git a/py/vtproto/binlogdata_pb2.py b/py/vtproto/binlogdata_pb2.py index 53eda7da5b..0a066c13a7 100644 --- a/py/vtproto/binlogdata_pb2.py +++ b/py/vtproto/binlogdata_pb2.py @@ -23,7 +23,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='binlogdata', syntax='proto3', serialized_options=_b('Z\'vitess.io/vitess/go/vt/proto/binlogdata'), - serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\")\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x90\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') + serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\"M\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\x12\"\n\x1a\x62\x65stEffortNameInFieldEvent\x18\x02 \x01(\x08\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x90\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') , dependencies=[vtrpc__pb2.DESCRIPTOR,query__pb2.DESCRIPTOR,topodata__pb2.DESCRIPTOR,]) @@ -52,8 +52,8 @@ _ONDDLACTION = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2751, - serialized_end=2813, + serialized_start=2787, + serialized_end=2849, ) _sym_db.RegisterEnumDescriptor(_ONDDLACTION) @@ -135,8 +135,8 @@ _VEVENTTYPE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2816, - serialized_end=3025, + serialized_start=2852, + serialized_end=3061, ) _sym_db.RegisterEnumDescriptor(_VEVENTTYPE) @@ -158,8 +158,8 @@ _MIGRATIONTYPE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=3027, - serialized_end=3066, + serialized_start=3063, + serialized_end=3102, ) _sym_db.RegisterEnumDescriptor(_MIGRATIONTYPE) @@ -576,6 +576,13 @@ _FILTER = _descriptor.Descriptor( message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), + _descriptor.FieldDescriptor( + name='bestEffortNameInFieldEvent', full_name='binlogdata.Filter.bestEffortNameInFieldEvent', index=1, + number=2, type=8, cpp_type=7, label=1, + has_default_value=False, default_value=False, + message_type=None, enum_type=None, containing_type=None, + is_extension=False, extension_scope=None, + serialized_options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -589,7 +596,7 @@ _FILTER = _descriptor.Descriptor( oneofs=[ ], serialized_start=993, - serialized_end=1034, + serialized_end=1070, ) @@ -661,8 +668,8 @@ _BINLOGSOURCE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1037, - serialized_end=1259, + serialized_start=1073, + serialized_end=1295, ) @@ -699,8 +706,8 @@ _ROWCHANGE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1261, - serialized_end=1327, + serialized_start=1297, + serialized_end=1363, ) @@ -737,8 +744,8 @@ _ROWEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1329, - serialized_end=1403, + serialized_start=1365, + serialized_end=1439, ) @@ -775,8 +782,8 @@ _FIELDEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1405, - serialized_end=1467, + serialized_start=1441, + serialized_end=1503, ) @@ -820,8 +827,8 @@ _SHARDGTID = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1469, - serialized_end=1527, + serialized_start=1505, + serialized_end=1563, ) @@ -851,8 +858,8 @@ _VGTID = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1529, - serialized_end=1580, + serialized_start=1565, + serialized_end=1616, ) @@ -889,8 +896,8 @@ _KEYSPACESHARD = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1582, - serialized_end=1630, + serialized_start=1618, + serialized_end=1666, ) @@ -962,8 +969,8 @@ _JOURNAL = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1633, - serialized_end=1860, + serialized_start=1669, + serialized_end=1896, ) @@ -1049,8 +1056,8 @@ _VEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1863, - serialized_end=2135, + serialized_start=1899, + serialized_end=2171, ) @@ -1108,8 +1115,8 @@ _VSTREAMREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2138, - serialized_end=2337, + serialized_start=2174, + serialized_end=2373, ) @@ -1139,8 +1146,8 @@ _VSTREAMRESPONSE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2339, - serialized_end=2392, + serialized_start=2375, + serialized_end=2428, ) @@ -1198,8 +1205,8 @@ _VSTREAMROWSREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2395, - serialized_end=2595, + serialized_start=2431, + serialized_end=2631, ) @@ -1257,8 +1264,8 @@ _VSTREAMROWSRESPONSE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2598, - serialized_end=2749, + serialized_start=2634, + serialized_end=2785, ) _BINLOGTRANSACTION_STATEMENT.fields_by_name['category'].enum_type = _BINLOGTRANSACTION_STATEMENT_CATEGORY From 34c595d6e985830071c07a95524da19ac7f7ea8f Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Mon, 23 Sep 2019 18:53:21 -0700 Subject: [PATCH 11/25] minor-cleanup Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 6fb2f81b17..55fd15798a 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -345,18 +345,9 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e tableName := tm.Name var cols []schema.TableColumn - hasFilter := false - for _, rule := range vs.filter.Rules { - if rule.Filter != "" { - // throw error. Column name might be need in filter. - hasFilter = true - break - } - } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) - vs.filter.BestEffortNameInFieldEvent = true if st == nil { - if hasFilter || vs.filter.BestEffortNameInFieldEvent == false { + if vs.filter.BestEffortNameInFieldEvent == false { // throw error. Column name might be need in filter. return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } From b736b1792455efcb1871288e050740575bb40272 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 13:23:51 -0700 Subject: [PATCH 12/25] review-feedback Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/vstreamer.go | 44 +++++++++++++------ 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 55fd15798a..19b9cdcb39 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -345,24 +345,40 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e tableName := tm.Name var cols []schema.TableColumn + for i, typ := range tm.Types { + t, err := sqltypes.MySQLToType(int64(typ), int64(tm.Flags)) + if err != nil { + return nil, fmt.Errorf("unsupported type: %d", typ) + } + cols = append(cols, schema.TableColumn{ + Name: sqlparser.NewColIdent(fmt.Sprintf("@%d", i+1)), + Type: t, + }) + } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) - if st == nil { - if vs.filter.BestEffortNameInFieldEvent == false { - // throw error. Column name might be need in filter. - return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } - for _, typ := range tm.Types { - cols = append(cols, schema.TableColumn{ - Name: sqlparser.NewColIdent(""), - Type: mysql.MySqlTypeToVitessType[int32(typ)], - }) - } + if st == nil && !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } else { - tableName = st.Name.String() - if len(st.Columns) < len(tm.Types) && vs.filter.BestEffortNameInFieldEvent == false { + if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } - cols = st.Columns[:len(tm.Types)] + tableName = st.Name.String() + // check if the schema returned by schema.Engine matches with row. + schemaMatch := true + if len(tm.Types) == len(st.Columns) { + for i := range tm.Types { + t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) + if t != st.Columns[i].Type { + schemaMatch = false + break + } + } + } else { + schemaMatch = false + } + if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { + cols = st.Columns[:len(tm.Types)] + } } table := &Table{ From a4ce7d81e08fd5059b0b80d714ab42856c49f183 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 15:00:49 -0700 Subject: [PATCH 13/25] add-missing-type-mapping Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/vstreamer.go | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 19b9cdcb39..5cc0b0d667 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -348,7 +348,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e for i, typ := range tm.Types { t, err := sqltypes.MySQLToType(int64(typ), int64(tm.Flags)) if err != nil { - return nil, fmt.Errorf("unsupported type: %d", typ) + return nil, fmt.Errorf("unsupported type: %d, position: %d", typ, i) } cols = append(cols, schema.TableColumn{ Name: sqlparser.NewColIdent(fmt.Sprintf("@%d", i+1)), @@ -358,27 +358,26 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) if st == nil && !vs.filter.BestEffortNameInFieldEvent { return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } else { - if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { - return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) - } - tableName = st.Name.String() - // check if the schema returned by schema.Engine matches with row. - schemaMatch := true - if len(tm.Types) == len(st.Columns) { - for i := range tm.Types { - t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) - if t != st.Columns[i].Type { - schemaMatch = false - break - } + } + if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + } + tableName = st.Name.String() + // check if the schema returned by schema.Engine matches with row. + schemaMatch := true + if len(tm.Types) == len(st.Columns) { + for i := range tm.Types { + t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) + if t != st.Columns[i].Type { + schemaMatch = false + break } - } else { - schemaMatch = false - } - if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { - cols = st.Columns[:len(tm.Types)] } + } else { + schemaMatch = false + } + if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { + cols = st.Columns[:len(tm.Types)] } table := &Table{ From fe59f7b8822a9ad2fc9fd6db726d159b6441354b Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 17:13:25 -0700 Subject: [PATCH 14/25] minor Signed-off-by: Nitin Shatma --- go/mysql/replication_constants.go | 38 ------------------------------- go/sqltypes/type.go | 6 +++++ 2 files changed, 6 insertions(+), 38 deletions(-) diff --git a/go/mysql/replication_constants.go b/go/mysql/replication_constants.go index a3607fa212..cf5f2f8ce3 100644 --- a/go/mysql/replication_constants.go +++ b/go/mysql/replication_constants.go @@ -16,10 +16,6 @@ limitations under the License. package mysql -import ( - querypb "vitess.io/vitess/go/vt/proto/query" -) - // This file contains the constant definitions for this package. // This is the data type for a field. @@ -119,40 +115,6 @@ const ( TypeGeometry = 255 ) -var MySqlTypeToVitessType = map[int32]querypb.Type{ - TypeDecimal: querypb.Type_DECIMAL, - TypeTiny: querypb.Type_INT8, - TypeShort: querypb.Type_INT16, - TypeLong: querypb.Type_INT32, - TypeFloat: querypb.Type_FLOAT32, - TypeDouble: querypb.Type_FLOAT64, - TypeNull: querypb.Type_NULL_TYPE, - TypeTimestamp: querypb.Type_TIMESTAMP, - TypeLongLong: querypb.Type_INT64, - TypeInt24: querypb.Type_INT24, - TypeDate: querypb.Type_DATE, - TypeTime: querypb.Type_TIME, - TypeDateTime: querypb.Type_DATETIME, - TypeYear: querypb.Type_YEAR, - TypeNewDate: querypb.Type_DATETIME, - TypeVarchar: querypb.Type_VARCHAR, - TypeBit: querypb.Type_BIT, - TypeTimestamp2: querypb.Type_TIMESTAMP, - TypeDateTime2: querypb.Type_DATETIME, - TypeTime2: querypb.Type_TIME, - TypeJSON: querypb.Type_JSON, - TypeNewDecimal: querypb.Type_DECIMAL, - TypeEnum: querypb.Type_ENUM, - TypeSet: querypb.Type_SET, - TypeTinyBlob: querypb.Type_BLOB, - TypeMediumBlob: querypb.Type_BLOB, - TypeLongBlob: querypb.Type_BLOB, - TypeBlob: querypb.Type_BLOB, - TypeVarString: querypb.Type_BINARY, - TypeString: querypb.Type_BINARY, - TypeGeometry: querypb.Type_GEOMETRY, -} - // Constants for the type of an INTVAR_EVENT. const ( // IntVarInvalidInt is INVALID_INT_EVENT diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go index b123e882d7..c25e38580b 100644 --- a/go/sqltypes/type.go +++ b/go/sqltypes/type.go @@ -154,6 +154,7 @@ const ( // If you add to this map, make sure you add a test case // in tabletserver/endtoend. var mysqlToType = map[int64]querypb.Type{ + 0: Decimal, 1: Int8, 2: Int16, 3: Int32, @@ -169,8 +170,13 @@ var mysqlToType = map[int64]querypb.Type{ 13: Year, 15: VarChar, 16: Bit, + 17: Timestamp, + 18: Datetime, + 19: Time, 245: TypeJSON, 246: Decimal, + 247: Enum, + 248: Set, 249: Text, 250: Text, 251: Text, From 513c7f4414552b337a5467bcea4851eef60914cf Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 20:59:16 -0700 Subject: [PATCH 15/25] test Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/engine_test.go | 2 +- .../tabletserver/vstreamer/vstreamer.go | 32 +++----- .../tabletserver/vstreamer/vstreamer_test.go | 80 +++++++++++++++---- 3 files changed, 76 insertions(+), 38 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/engine_test.go b/go/vt/vttablet/tabletserver/vstreamer/engine_test.go index c88a9aeef4..575b146b6e 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/engine_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/engine_test.go @@ -62,7 +62,7 @@ func TestUpdateVSchema(t *testing.T) { }}, } - _ = startStream(ctx, t, filter) + _ = startStream(ctx, t, filter, "") cancel() startCount := expectUpdateCount(t, 1) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 5cc0b0d667..b7848a1212 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -356,30 +356,20 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e }) } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) - if st == nil && !vs.filter.BestEffortNameInFieldEvent { - return nil, fmt.Errorf("unknown table %v in schema", tm.Name) - } - if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { - return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) - } - tableName = st.Name.String() - // check if the schema returned by schema.Engine matches with row. - schemaMatch := true - if len(tm.Types) == len(st.Columns) { - for i := range tm.Types { - t, _ := sqltypes.MySQLToType(int64(tm.Types[i]), int64(tm.Flags)) - if t != st.Columns[i].Type { - schemaMatch = false - break - } + if st == nil { + if !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } } else { - schemaMatch = false + // preserving old behavior. + if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { + return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) + } + tableName = st.Name.String() + if len(tm.Types) == len(st.Columns) || !vs.filter.BestEffortNameInFieldEvent { + cols = st.Columns + } } - if schemaMatch || !vs.filter.BestEffortNameInFieldEvent { - cols = st.Columns[:len(tm.Types)] - } - table := &Table{ Name: tableName, // Columns should be truncated to match those in tm. diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go index baa49af74e..5a7167768d 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go @@ -130,7 +130,7 @@ func TestStatements(t *testing.T) { }, { input: "describe stream1", }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestRegexp(t *testing.T) { @@ -172,7 +172,7 @@ func TestRegexp(t *testing.T) { `commit`, }}, }} - runCases(t, filter, testcases) + runCases(t, filter, testcases, "") } func TestREKeyRange(t *testing.T) { @@ -202,7 +202,7 @@ func TestREKeyRange(t *testing.T) { Filter: "-80", }}, } - ch := startStream(ctx, t, filter) + ch := startStream(ctx, t, filter, "") // 1, 2, 3 and 5 are in shard -80. // 4 and 6 are in shard 80-. @@ -306,7 +306,7 @@ func TestSelectFilter(t *testing.T) { `commit`, }}, }} - runCases(t, filter, testcases) + runCases(t, filter, testcases, "") } func TestDDLAddColumn(t *testing.T) { @@ -446,7 +446,7 @@ func TestUnsentDDL(t *testing.T) { Match: "/none/", }}, } - runCases(t, filter, testcases) + runCases(t, filter, testcases, "") } func TestBuffering(t *testing.T) { @@ -546,7 +546,55 @@ func TestBuffering(t *testing.T) { `type:DDL ddl:"alter table packet_test change val val varchar(128)" `, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") +} + +func TestBestEffortNameInFieldEvent(t *testing.T) { + if testing.Short() { + t.Skip() + } + filter := &binlogdatapb.Filter{ + BestEffortNameInFieldEvent: true, + Rules: []*binlogdatapb.Rule{{ + Match: "/.*/", + }}, + } + // Modeled after vttablet endtoend compatibility tests. + execStatements(t, []string{ + "create table vitess_null(id int, val varbinary(128), primary key(id))", + }) + position := masterPosition(t) + execStatements(t, []string{ + "insert into vitess_null values(1, 'abc')", + "rename table vitess_null to vitess_null_new", + }) + + defer execStatements(t, []string{ + "drop table vitess_null_new", + }) + engine.se.Reload(context.Background()) + testcases := []testcase{{ + input: []string{ + "insert into vitess_null_new values(2, 'abc')", + }, + output: [][]string{{ + `gtid|begin`, + `gtid|begin`, + `type:FIELD field_event: fields: > `, + `type:ROW row_event: > > `, + `commit`, + }, { + `gtid|begin`, + `type:DDL ddl:"rename table vitess_null to vitess_null_new" `, + }, { + `gtid|begin`, + `gtid|begin`, + `type:FIELD field_event: fields: > `, + `type:ROW row_event: > > `, + `commit`, + }}, + }} + runCases(t, filter, testcases, position) } func TestTypes(t *testing.T) { @@ -687,7 +735,7 @@ func TestTypes(t *testing.T) { `commit`, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestJSON(t *testing.T) { @@ -716,7 +764,7 @@ func TestJSON(t *testing.T) { `commit`, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestExternalTable(t *testing.T) { @@ -746,7 +794,7 @@ func TestExternalTable(t *testing.T) { `commit`, }}, }} - runCases(t, nil, testcases) + runCases(t, nil, testcases, "") } func TestMinimalMode(t *testing.T) { @@ -827,12 +875,11 @@ func TestStatementMode(t *testing.T) { } } -func runCases(t *testing.T, filter *binlogdatapb.Filter, testcases []testcase) { +func runCases(t *testing.T, filter *binlogdatapb.Filter, testcases []testcase, postion string) { t.Helper() ctx, cancel := context.WithCancel(context.Background()) defer cancel() - - ch := startStream(ctx, t, filter) + ch := startStream(ctx, t, filter, postion) for _, tcase := range testcases { switch input := tcase.input.(type) { @@ -853,7 +900,6 @@ func runCases(t *testing.T, filter *binlogdatapb.Filter, testcases []testcase) { func expectLog(ctx context.Context, t *testing.T, input interface{}, ch <-chan []*binlogdatapb.VEvent, output [][]string) { t.Helper() - for _, wantset := range output { var evs []*binlogdatapb.VEvent var ok bool @@ -897,13 +943,15 @@ func expectLog(ctx context.Context, t *testing.T, input interface{}, ch <-chan [ } } -func startStream(ctx context.Context, t *testing.T, filter *binlogdatapb.Filter) <-chan []*binlogdatapb.VEvent { - pos := masterPosition(t) +func startStream(ctx context.Context, t *testing.T, filter *binlogdatapb.Filter, position string) <-chan []*binlogdatapb.VEvent { + if position == "" { + position = masterPosition(t) + } ch := make(chan []*binlogdatapb.VEvent) go func() { defer close(ch) - if err := vstream(ctx, t, pos, filter, ch); err != nil { + if err := vstream(ctx, t, position, filter, ch); err != nil { t.Error(err) } }() From df4ce5f294a6039552db78e89b19d9eff5a91fda Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 21:30:46 -0700 Subject: [PATCH 16/25] test Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/planbuilder.go | 3 +++ go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go index dc241c73b7..ac889024b1 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go +++ b/go/vt/vttablet/tabletserver/vstreamer/planbuilder.go @@ -72,6 +72,9 @@ func (plan *Plan) fields() []*querypb.Field { func (plan *Plan) filter(values []sqltypes.Value) (bool, []sqltypes.Value, error) { result := make([]sqltypes.Value, len(plan.ColExprs)) for i, colExpr := range plan.ColExprs { + if colExpr.ColNum >= len(values) { + return false, nil, fmt.Errorf("index out of range. colExpr.ColNum: %d len(values):%d!!", colExpr.ColNum, len(values)) + } result[i] = values[colExpr.ColNum] } if plan.Vindex == nil { diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index b7848a1212..ac7904e74d 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -361,15 +361,15 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } } else { - // preserving old behavior. if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } tableName = st.Name.String() - if len(tm.Types) == len(st.Columns) || !vs.filter.BestEffortNameInFieldEvent { - cols = st.Columns + if len(st.Columns) >= len(tm.Types) { + cols = st.Columns[:len(tm.Types)] } } + table := &Table{ Name: tableName, // Columns should be truncated to match those in tm. From 4ee1527009db83c266021ad65896b736719ab561 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Tue, 24 Sep 2019 23:08:56 -0700 Subject: [PATCH 17/25] fix-test Signed-off-by: Nitin Shatma --- go/sqltypes/type_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go/sqltypes/type_test.go b/go/sqltypes/type_test.go index a4d5ed6f9b..c7b96fbe29 100644 --- a/go/sqltypes/type_test.go +++ b/go/sqltypes/type_test.go @@ -406,8 +406,8 @@ func TestMySQLToType(t *testing.T) { } func TestTypeError(t *testing.T) { - _, err := MySQLToType(17, 0) - want := "unsupported type: 17" + _, err := MySQLToType(50, 0) + want := "unsupported type: 50" if err == nil || err.Error() != want { t.Errorf("MySQLToType: %v, want %s", err, want) } From 59bb792b51670a4209f7ac297dc22e123477fb3f Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Sun, 29 Sep 2019 17:20:38 -0700 Subject: [PATCH 18/25] add-type-equivalence Signed-off-by: Nitin Shatma --- go/sqltypes/type.go | 16 ++++++++++++++ go/sqltypes/type_test.go | 21 +++++++++++++++++++ .../tabletserver/vstreamer/vstreamer.go | 19 ++++++++++++++--- 3 files changed, 53 insertions(+), 3 deletions(-) diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go index c25e38580b..a9c843c326 100644 --- a/go/sqltypes/type.go +++ b/go/sqltypes/type.go @@ -251,6 +251,22 @@ func MySQLToType(mysqlType, flags int64) (typ querypb.Type, err error) { return modifyType(result, flags), nil } +//TypeEquivalenceCheck returns whether two types are equivalent. +func TypeEquivalenceCheck(mysqlTypeFromBinlog, mysqlTypeFromSchema querypb.Type) (isEquivalent bool) { + return (mysqlTypeFromBinlog == mysqlTypeFromSchema) || + (mysqlTypeFromBinlog == VarChar && mysqlTypeFromSchema == VarBinary) || + (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Binary) || + (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Enum) || + (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Set) || + (mysqlTypeFromBinlog == Text && mysqlTypeFromSchema == Blob) || + (mysqlTypeFromBinlog == Int8 && mysqlTypeFromSchema == Uint8) || + (mysqlTypeFromBinlog == Int16 && mysqlTypeFromSchema == Uint16) || + (mysqlTypeFromBinlog == Int24 && mysqlTypeFromSchema == Uint24) || + (mysqlTypeFromBinlog == Int32 && mysqlTypeFromSchema == Uint32) || + (mysqlTypeFromBinlog == Int64 && mysqlTypeFromSchema == Uint64) + +} + // typeToMySQL is the reverse of mysqlToType. var typeToMySQL = map[querypb.Type]struct { typ int64 diff --git a/go/sqltypes/type_test.go b/go/sqltypes/type_test.go index c7b96fbe29..7b44d72af3 100644 --- a/go/sqltypes/type_test.go +++ b/go/sqltypes/type_test.go @@ -412,3 +412,24 @@ func TestTypeError(t *testing.T) { t.Errorf("MySQLToType: %v, want %s", err, want) } } + +func TestTypeEquivalenceCheck(t *testing.T) { + if !TypeEquivalenceCheck(Int16, Int16) { + t.Errorf("Int16 and Int16 are same type.") + } + if TypeEquivalenceCheck(Int16, Int24) { + t.Errorf("Int16 and Int24 are not same type.") + } + if !TypeEquivalenceCheck(VarChar, VarBinary) { + t.Errorf("VarChar in binlog and VarBinary in schema are equivalent type.") + } + if TypeEquivalenceCheck(VarBinary, VarChar) { + t.Errorf("VarBinary in binlog and VarChar in schema are not equivalent type.") + } + if !TypeEquivalenceCheck(Uint16, Uint16) { + t.Errorf("Int16 in binlog and Uint16 in schema are equivalent type.") + } + if TypeEquivalenceCheck(Uint16, Int16) { + t.Errorf("UInt16 in binlog and int16 in schema are not equivalent type.") + } +} diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index ac7904e74d..b733c1e6c4 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -342,11 +342,11 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e vs.plans[id] = nil return nil, nil } - tableName := tm.Name var cols []schema.TableColumn for i, typ := range tm.Types { - t, err := sqltypes.MySQLToType(int64(typ), int64(tm.Flags)) + t, err := sqltypes.MySQLToType(int64(typ), 0) + fmt.Printf("type conversion table tableName:%s typ:%d tm.Metadata[i]:%d t:%d\n", tableName, int64(typ), int64(tm.Metadata[i]), t) if err != nil { return nil, fmt.Errorf("unsupported type: %d, position: %d", typ, i) } @@ -365,7 +365,20 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } tableName = st.Name.String() - if len(st.Columns) >= len(tm.Types) { + // check if the schema returned by schema.Engine matches with row. + schemaMatch := true + if len(tm.Types) <= len(st.Columns) { + for i, typ := range tm.Types { + t, _ := sqltypes.MySQLToType(int64(typ), 0) + if !sqltypes.TypeEquivalenceCheck(t, st.Columns[i].Type) { + schemaMatch = false + break + } + } + } else { + schemaMatch = false + } + if schemaMatch { cols = st.Columns[:len(tm.Types)] } } From 097744730fb87ddd1e1001c41b192aacad4b5892 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 12:26:19 -0700 Subject: [PATCH 19/25] rebase Signed-off-by: Nitin Shatma --- go.mod | 4 +- .../automationservice/automationservice.pb.go | 7 -- go/vt/proto/binlogdata/binlogdata.pb.go | 108 ------------------ 3 files changed, 3 insertions(+), 116 deletions(-) diff --git a/go.mod b/go.mod index 0ec813f0d7..ad559faad3 100644 --- a/go.mod +++ b/go.mod @@ -44,6 +44,8 @@ require ( github.com/minio/minio-go v0.0.0-20190131015406-c8a261de75c1 github.com/mitchellh/go-testing-interface v1.0.0 // indirect github.com/mitchellh/mapstructure v1.1.2 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect github.com/olekukonko/tablewriter v0.0.0-20160115111002-cca8bbc07984 github.com/opentracing-contrib/go-grpc v0.0.0-20180928155321-4b5a12d3ff02 github.com/opentracing/opentracing-go v1.1.0 @@ -58,7 +60,7 @@ require ( github.com/uber-go/atomic v1.4.0 // indirect github.com/uber/jaeger-client-go v2.16.0+incompatible github.com/uber/jaeger-lib v2.0.0+incompatible // indirect - github.com/ugorji/go/codec v1.1.7 // indirect + github.com/ugorji/go v1.1.7 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/z-division/go-zookeeper v0.0.0-20190128072838-6d7457066b9b golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472 diff --git a/go/vt/proto/automationservice/automationservice.pb.go b/go/vt/proto/automationservice/automationservice.pb.go index f97c0afc70..bc2062f662 100644 --- a/go/vt/proto/automationservice/automationservice.pb.go +++ b/go/vt/proto/automationservice/automationservice.pb.go @@ -6,19 +6,12 @@ package automationservice import ( context "context" fmt "fmt" -<<<<<<< HEAD math "math" -======= ->>>>>>> vstream optional field event proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" -<<<<<<< HEAD -======= - math "math" ->>>>>>> vstream optional field event automation "vitess.io/vitess/go/vt/proto/automation" ) diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index d513b7df0e..45b871b908 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -5,14 +5,9 @@ package binlogdata import ( fmt "fmt" -<<<<<<< HEAD math "math" proto "github.com/golang/protobuf/proto" -======= - proto "github.com/golang/protobuf/proto" - math "math" ->>>>>>> vstream optional field event query "vitess.io/vitess/go/vt/proto/query" topodata "vitess.io/vitess/go/vt/proto/topodata" vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" @@ -1540,7 +1535,6 @@ func init() { func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) } var fileDescriptor_5fd02bcb2e350dad = []byte{ -<<<<<<< HEAD // 1558 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xdb, 0xca, 0x11, 0x35, 0x09, 0xf0, 0xd5, 0x90, 0x28, 0x68, 0xf4, 0x08, 0xa3, 0x8a, 0x53, 0x0a, 0x2a, 0x8e, @@ -1640,106 +1634,4 @@ var fileDescriptor_5fd02bcb2e350dad = []byte{ 0x24, 0x49, 0xd3, 0x8f, 0x0e, 0x05, 0x75, 0x78, 0x1d, 0x1d, 0xce, 0xe9, 0x21, 0xff, 0x0b, 0x7a, 0xb8, 0x78, 0x3e, 0x97, 0x65, 0xce, 0xf9, 0xcd, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xb4, 0x72, 0xde, 0xde, 0x0e, 0x00, 0x00, -======= - // 1583 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xe3, 0x4c, - 0x15, 0x1e, 0x5b, 0xf2, 0xed, 0x28, 0x71, 0x94, 0xce, 0x05, 0x93, 0xe2, 0xa7, 0x82, 0x8a, 0x9f, - 0x84, 0x54, 0xe1, 0x80, 0x81, 0x61, 0x35, 0x33, 0xf8, 0xa2, 0xc9, 0x38, 0x51, 0xec, 0x4c, 0x5b, - 0xc9, 0x50, 0xb3, 0x51, 0x29, 0x56, 0x3b, 0x11, 0x91, 0x25, 0x8f, 0xd4, 0x76, 0xc8, 0x03, 0x50, - 0x3c, 0x00, 0x5b, 0x5e, 0x80, 0x3d, 0x5b, 0xb6, 0xec, 0x79, 0x02, 0x56, 0xbc, 0x07, 0xd5, 0x17, - 0xc9, 0x56, 0x66, 0x98, 0xc9, 0x50, 0xc5, 0xe2, 0xdf, 0xa8, 0x4e, 0x9f, 0x3e, 0xd7, 0xef, 0x9c, - 0xee, 0xd3, 0x02, 0xfd, 0xda, 0x0f, 0x83, 0xe8, 0xc6, 0x73, 0xa9, 0xdb, 0x9c, 0xc5, 0x11, 0x8d, - 0x10, 0x2c, 0x39, 0x7b, 0xda, 0x82, 0xc6, 0xb3, 0xb1, 0xd8, 0xd8, 0xd3, 0x3e, 0xcc, 0x49, 0xfc, - 0x20, 0x17, 0x75, 0x1a, 0xcd, 0xa2, 0xa5, 0x96, 0x71, 0x0e, 0x95, 0xee, 0xad, 0x1b, 0x27, 0x84, - 0xa2, 0x5d, 0x28, 0x8f, 0x03, 0x9f, 0x84, 0xb4, 0x51, 0xd8, 0x2f, 0x1c, 0x96, 0xb0, 0x5c, 0x21, - 0x04, 0xea, 0x38, 0x0a, 0xc3, 0x46, 0x91, 0x73, 0x39, 0xcd, 0x64, 0x13, 0x12, 0x2f, 0x48, 0xdc, - 0x50, 0x84, 0xac, 0x58, 0x19, 0xff, 0x56, 0x60, 0xb3, 0xc3, 0xe3, 0xb0, 0x63, 0x37, 0x4c, 0xdc, - 0x31, 0xf5, 0xa3, 0x10, 0x9d, 0x00, 0x24, 0xd4, 0xa5, 0x64, 0x4a, 0x42, 0x9a, 0x34, 0x0a, 0xfb, - 0xca, 0xa1, 0xd6, 0x3a, 0x68, 0xae, 0x64, 0xf0, 0x91, 0x4a, 0x73, 0x94, 0xca, 0xe3, 0x15, 0x55, - 0xd4, 0x02, 0x8d, 0x2c, 0x48, 0x48, 0x1d, 0x1a, 0xdd, 0x91, 0xb0, 0xa1, 0xee, 0x17, 0x0e, 0xb5, - 0xd6, 0x66, 0x53, 0x24, 0x68, 0xb2, 0x1d, 0x9b, 0x6d, 0x60, 0x20, 0x19, 0xbd, 0xf7, 0x8f, 0x22, - 0xd4, 0x32, 0x6b, 0xc8, 0x82, 0xea, 0xd8, 0xa5, 0xe4, 0x26, 0x8a, 0x1f, 0x78, 0x9a, 0xf5, 0xd6, - 0xcf, 0x9f, 0x18, 0x48, 0xb3, 0x2b, 0xf5, 0x70, 0x66, 0x01, 0xfd, 0x0c, 0x2a, 0x63, 0x81, 0x1e, - 0x47, 0x47, 0x6b, 0x6d, 0xad, 0x1a, 0x93, 0xc0, 0xe2, 0x54, 0x06, 0xe9, 0xa0, 0x24, 0x1f, 0x02, - 0x0e, 0xd9, 0x1a, 0x66, 0xa4, 0xf1, 0xd7, 0x02, 0x54, 0x53, 0xbb, 0x68, 0x0b, 0x36, 0x3a, 0x96, - 0x73, 0x39, 0xc0, 0x66, 0x77, 0x78, 0x32, 0xe8, 0xbf, 0x37, 0x7b, 0xfa, 0x33, 0xb4, 0x06, 0xd5, - 0x8e, 0xe5, 0x74, 0xcc, 0x93, 0xfe, 0x40, 0x2f, 0xa0, 0x75, 0xa8, 0x75, 0x2c, 0xa7, 0x3b, 0x3c, - 0x3f, 0xef, 0xdb, 0x7a, 0x11, 0x6d, 0x80, 0xd6, 0xb1, 0x1c, 0x3c, 0xb4, 0xac, 0x4e, 0xbb, 0x7b, - 0xa6, 0x2b, 0x68, 0x07, 0x36, 0x3b, 0x96, 0xd3, 0x3b, 0xb7, 0x9c, 0x9e, 0x79, 0x81, 0xcd, 0x6e, - 0xdb, 0x36, 0x7b, 0xba, 0x8a, 0x00, 0xca, 0x8c, 0xdd, 0xb3, 0xf4, 0x92, 0xa4, 0x47, 0xa6, 0xad, - 0x97, 0xa5, 0xb9, 0xfe, 0x60, 0x64, 0x62, 0x5b, 0xaf, 0xc8, 0xe5, 0xe5, 0x45, 0xaf, 0x6d, 0x9b, - 0x7a, 0x55, 0x2e, 0x7b, 0xa6, 0x65, 0xda, 0xa6, 0x5e, 0x3b, 0x55, 0xab, 0x45, 0x5d, 0x39, 0x55, - 0xab, 0x8a, 0xae, 0x1a, 0x7f, 0x2e, 0xc0, 0xce, 0x88, 0xc6, 0xc4, 0x9d, 0x9e, 0x91, 0x07, 0xec, - 0x86, 0x37, 0x04, 0x93, 0x0f, 0x73, 0x92, 0x50, 0xb4, 0x07, 0xd5, 0x59, 0x94, 0xf8, 0x0c, 0x3b, - 0x0e, 0x70, 0x0d, 0x67, 0x6b, 0x74, 0x0c, 0xb5, 0x3b, 0xf2, 0xe0, 0xc4, 0x4c, 0x5e, 0x02, 0x86, - 0x9a, 0x59, 0x43, 0x66, 0x96, 0xaa, 0x77, 0x92, 0x5a, 0xc5, 0x57, 0xf9, 0x32, 0xbe, 0xc6, 0x04, - 0x76, 0x1f, 0x07, 0x95, 0xcc, 0xa2, 0x30, 0x21, 0xc8, 0x02, 0x24, 0x14, 0x1d, 0xba, 0xac, 0x2d, - 0x8f, 0x4f, 0x6b, 0x7d, 0xf3, 0xd9, 0x06, 0xc0, 0x9b, 0xd7, 0x8f, 0x59, 0xc6, 0x1f, 0x60, 0x4b, - 0xf8, 0xb1, 0xdd, 0xeb, 0x80, 0x24, 0x4f, 0x49, 0x7d, 0x17, 0xca, 0x94, 0x0b, 0x37, 0x8a, 0xfb, - 0xca, 0x61, 0x0d, 0xcb, 0xd5, 0xd7, 0x66, 0xe8, 0xc1, 0x76, 0xde, 0xf3, 0xff, 0x25, 0xbf, 0x5f, - 0x81, 0x8a, 0xe7, 0x01, 0x41, 0xdb, 0x50, 0x9a, 0xba, 0x74, 0x7c, 0x2b, 0xb3, 0x11, 0x0b, 0x96, - 0xca, 0xc4, 0x0f, 0x28, 0x89, 0x79, 0x09, 0x6b, 0x58, 0xae, 0x8c, 0x19, 0x94, 0x5f, 0x73, 0x0a, - 0xfd, 0x04, 0x4a, 0xf1, 0x9c, 0xe5, 0x2a, 0x8e, 0xba, 0xbe, 0x1a, 0x00, 0x33, 0x8c, 0xc5, 0x36, - 0x7a, 0x09, 0x7b, 0xd7, 0x24, 0xa1, 0xe6, 0x64, 0x12, 0xc5, 0x74, 0xe0, 0x4e, 0x49, 0x3f, 0x7c, - 0xed, 0x93, 0xc0, 0xe3, 0x27, 0x99, 0x5b, 0xaf, 0xe2, 0xcf, 0x48, 0x18, 0x7f, 0x29, 0xc2, 0x9a, - 0x48, 0x68, 0x14, 0xcd, 0xe3, 0x31, 0x61, 0x15, 0xb8, 0x23, 0x0f, 0xc9, 0xcc, 0x1d, 0x93, 0xb4, - 0x02, 0xe9, 0x9a, 0x25, 0x93, 0xdc, 0xba, 0xb1, 0x27, 0xa3, 0x16, 0x0b, 0xf4, 0x6b, 0xd0, 0x78, - 0x25, 0xa8, 0x43, 0x1f, 0x66, 0x84, 0xd7, 0xa0, 0xde, 0xda, 0x5e, 0x36, 0x25, 0xc7, 0x99, 0xda, - 0x0f, 0x33, 0x82, 0x81, 0x66, 0x74, 0xbe, 0x93, 0xd5, 0x27, 0x74, 0xf2, 0xb2, 0xfe, 0xa5, 0x5c, - 0xfd, 0x8f, 0x32, 0x30, 0xcb, 0xd2, 0xca, 0x0a, 0x56, 0x02, 0xce, 0x14, 0x60, 0xd4, 0x84, 0x72, - 0x14, 0x3a, 0x9e, 0x17, 0x34, 0x2a, 0x3c, 0xcc, 0xef, 0xad, 0xca, 0x0e, 0xc3, 0x5e, 0xcf, 0x6a, - 0x8b, 0x92, 0x96, 0xa2, 0xb0, 0xe7, 0x05, 0xc6, 0x5b, 0xa8, 0xe1, 0xe8, 0xbe, 0x7b, 0xcb, 0x03, - 0x30, 0xa0, 0x7c, 0x4d, 0x26, 0x51, 0x4c, 0x64, 0x57, 0x80, 0xbc, 0x35, 0x71, 0x74, 0x8f, 0xe5, - 0x0e, 0xda, 0x87, 0x92, 0x3b, 0x49, 0x0b, 0x9b, 0x17, 0x11, 0x1b, 0x86, 0x0b, 0x55, 0x1c, 0xdd, - 0x73, 0xf4, 0xd1, 0x37, 0x20, 0x10, 0x71, 0x42, 0x77, 0x9a, 0xc2, 0x5d, 0xe3, 0x1c, 0x56, 0x28, - 0xf4, 0x1c, 0xb4, 0x38, 0xba, 0x77, 0xc6, 0xdc, 0xbd, 0x68, 0x7b, 0xad, 0xb5, 0x93, 0x6b, 0x85, - 0x34, 0x38, 0x0c, 0x71, 0x4a, 0x26, 0xc6, 0x5b, 0x80, 0x65, 0x89, 0xbf, 0xe4, 0xe4, 0xc7, 0x0c, - 0x3e, 0x12, 0x78, 0xa9, 0xfd, 0x35, 0x19, 0x32, 0xb7, 0x80, 0xe5, 0x1e, 0x03, 0x62, 0xc4, 0xaa, - 0x7d, 0x42, 0x7d, 0xef, 0x7f, 0xe8, 0x11, 0x04, 0xea, 0x0d, 0xf5, 0x3d, 0xde, 0x1c, 0x35, 0xcc, - 0x69, 0xe3, 0x15, 0x94, 0xae, 0xb8, 0xb9, 0xe7, 0xa0, 0x71, 0x29, 0x87, 0xb1, 0xd3, 0x8e, 0xcf, - 0xa5, 0x99, 0xb9, 0xc6, 0x90, 0xa4, 0x64, 0x62, 0xb4, 0x61, 0xfd, 0x4c, 0xba, 0xe5, 0x02, 0x5f, - 0x1f, 0x97, 0xf1, 0xb7, 0x22, 0x54, 0x4e, 0xa3, 0x79, 0x1c, 0xba, 0x01, 0xaa, 0x43, 0xd1, 0xf7, - 0xb8, 0x9e, 0x82, 0x8b, 0xbe, 0x87, 0x7e, 0x0b, 0xf5, 0xa9, 0x7f, 0x13, 0xbb, 0xac, 0x1f, 0x44, - 0x6b, 0x17, 0x79, 0xcf, 0x7c, 0x7f, 0x35, 0xb2, 0xf3, 0x54, 0x82, 0xf7, 0xf7, 0xfa, 0x74, 0x75, - 0xb9, 0xd2, 0xb1, 0x4a, 0xae, 0x63, 0xbf, 0x85, 0x7a, 0x10, 0x8d, 0xdd, 0xc0, 0xc9, 0xee, 0x3a, - 0x95, 0x07, 0xb5, 0xce, 0xb9, 0x17, 0xe9, 0x85, 0xf7, 0x08, 0x97, 0xd2, 0x13, 0x71, 0x41, 0x2f, - 0x60, 0x6d, 0xe6, 0xc6, 0xd4, 0x1f, 0xfb, 0x33, 0x97, 0xbd, 0x16, 0xca, 0x5c, 0x31, 0x17, 0x76, - 0x0e, 0x37, 0x9c, 0x13, 0x47, 0x3f, 0x82, 0xb5, 0x98, 0x2c, 0x48, 0x9c, 0x10, 0xcf, 0x61, 0x7e, - 0x2b, 0xfb, 0xca, 0xa1, 0x82, 0xb5, 0x94, 0xd7, 0xf7, 0x12, 0xe3, 0x5f, 0x45, 0x28, 0x5f, 0x89, - 0xee, 0x3a, 0x02, 0x95, 0x63, 0x23, 0x5e, 0x02, 0xbb, 0xab, 0x4e, 0x84, 0x04, 0x07, 0x86, 0xcb, - 0xa0, 0x1f, 0x40, 0x8d, 0xfa, 0x53, 0x92, 0x50, 0x77, 0x3a, 0xe3, 0x60, 0x2a, 0x78, 0xc9, 0xf8, - 0x54, 0x8f, 0xb0, 0x71, 0xcf, 0x0e, 0xab, 0x80, 0x87, 0x91, 0xe8, 0x17, 0x50, 0x63, 0x67, 0x82, - 0xbf, 0x4e, 0x1a, 0x25, 0x7e, 0xc8, 0xb6, 0x1f, 0x9d, 0x08, 0xee, 0x16, 0x57, 0xe3, 0xf4, 0x94, - 0xfd, 0x06, 0x34, 0xde, 0xc5, 0x52, 0x49, 0xdc, 0x12, 0xbb, 0xf9, 0x5b, 0x22, 0x3d, 0x2d, 0x18, - 0x26, 0xcb, 0x93, 0x73, 0x00, 0xa5, 0x05, 0x0f, 0xa9, 0x22, 0x5f, 0x49, 0xab, 0xc9, 0x71, 0xd8, - 0xc5, 0x3e, 0x1b, 0x41, 0xbf, 0x17, 0x5d, 0xd4, 0xa8, 0x7e, 0x3c, 0x82, 0x64, 0x83, 0xe1, 0x54, - 0x86, 0x21, 0x3c, 0x9e, 0xc7, 0x31, 0x7f, 0x85, 0xf9, 0x53, 0xd2, 0xd8, 0xe6, 0x50, 0x68, 0x92, - 0x67, 0xfb, 0x53, 0x62, 0xfc, 0xa9, 0x08, 0xf5, 0x2b, 0x31, 0xa7, 0xd2, 0xd9, 0xf8, 0x0a, 0xb6, - 0xc8, 0x64, 0x42, 0xc6, 0xd4, 0x5f, 0x10, 0x67, 0xec, 0x06, 0x01, 0x89, 0x1d, 0xd9, 0xb0, 0x5a, - 0x6b, 0xa3, 0x29, 0xde, 0xab, 0x5d, 0xce, 0xef, 0xf7, 0xf0, 0x66, 0x26, 0x2b, 0x59, 0x1e, 0x32, - 0x61, 0xcb, 0x9f, 0x4e, 0x89, 0xe7, 0xbb, 0x74, 0xd5, 0x80, 0xb8, 0xa9, 0x76, 0xe4, 0xb1, 0xbf, - 0xb2, 0x4f, 0x5c, 0x4a, 0x96, 0x66, 0x32, 0x8d, 0xcc, 0xcc, 0xb7, 0xac, 0xab, 0xe3, 0x9b, 0x6c, - 0xdc, 0xae, 0x4b, 0x4d, 0x9b, 0x33, 0xb1, 0xdc, 0xcc, 0x8d, 0x72, 0xf5, 0xd1, 0x28, 0x5f, 0x5e, - 0xd9, 0xa5, 0x2f, 0x5d, 0xd9, 0xc6, 0x0b, 0xd8, 0xc8, 0x80, 0x90, 0xa3, 0xfa, 0x08, 0xca, 0xbc, - 0x94, 0xe9, 0x5d, 0x81, 0x3e, 0xee, 0x3a, 0x2c, 0x25, 0x8c, 0x3f, 0x16, 0x01, 0xa5, 0xfa, 0xd1, - 0x7d, 0xf2, 0x1d, 0x05, 0x73, 0x1b, 0x4a, 0x9c, 0x2f, 0x91, 0x14, 0x0b, 0x86, 0x43, 0xe0, 0x26, - 0x74, 0x76, 0x97, 0xc1, 0x28, 0x94, 0xdf, 0xb2, 0x2f, 0x26, 0xc9, 0x3c, 0xa0, 0x58, 0x4a, 0x18, - 0x7f, 0x2f, 0xc0, 0x56, 0x0e, 0x07, 0x89, 0xe5, 0xf2, 0xfa, 0x2f, 0xfc, 0xf7, 0xeb, 0x1f, 0x1d, - 0x42, 0x75, 0x76, 0xf7, 0x99, 0x31, 0x91, 0xed, 0x7e, 0xf2, 0x14, 0xff, 0x10, 0xd4, 0x38, 0xba, - 0x4f, 0x1a, 0x2a, 0xd7, 0x5c, 0x9d, 0x89, 0x9c, 0xcf, 0x06, 0x6b, 0x2e, 0x8f, 0xdc, 0x60, 0x15, - 0x3b, 0x47, 0x2f, 0x41, 0x5b, 0x99, 0xcf, 0xec, 0x09, 0xde, 0x3f, 0x19, 0x0c, 0xb1, 0xa9, 0x3f, - 0x43, 0x55, 0x50, 0x47, 0xf6, 0xf0, 0x42, 0x2f, 0x30, 0xca, 0xfc, 0x9d, 0xd9, 0x15, 0xcf, 0x7a, - 0x46, 0x39, 0x52, 0x48, 0x39, 0xfa, 0x67, 0x01, 0x60, 0x79, 0x21, 0x21, 0x0d, 0x2a, 0x97, 0x83, - 0xb3, 0xc1, 0xf0, 0xdd, 0x40, 0x18, 0x38, 0xb1, 0xfb, 0x3d, 0xbd, 0x80, 0x6a, 0x50, 0x12, 0xff, - 0x09, 0x45, 0xe6, 0x41, 0xfe, 0x24, 0x28, 0xec, 0x0f, 0x22, 0xfb, 0x43, 0x50, 0x51, 0x05, 0x94, - 0xec, 0x3f, 0x40, 0x3e, 0xfc, 0xcb, 0xcc, 0x20, 0x36, 0x2f, 0xac, 0x76, 0xd7, 0xd4, 0x2b, 0x6c, - 0x23, 0xfb, 0x05, 0x00, 0x28, 0xa7, 0xef, 0x7f, 0xa6, 0xc9, 0xfe, 0x1a, 0x80, 0xf9, 0x19, 0xda, - 0x6f, 0x4c, 0xac, 0x6b, 0x8c, 0x87, 0x87, 0xef, 0xf4, 0x35, 0xc6, 0x7b, 0xdd, 0x37, 0xad, 0x9e, - 0xbe, 0xce, 0x7e, 0x1b, 0xde, 0x98, 0x6d, 0x6c, 0x77, 0xcc, 0xb6, 0xad, 0xd7, 0xd9, 0xce, 0x15, - 0x0f, 0x70, 0x83, 0xb9, 0x39, 0x1d, 0x5e, 0xe2, 0x41, 0xdb, 0xd2, 0xf5, 0xa3, 0x03, 0x58, 0xcf, - 0xcd, 0x1f, 0xe6, 0xcb, 0x6e, 0x77, 0x2c, 0x73, 0xa4, 0x3f, 0x63, 0xf4, 0xe8, 0x4d, 0x1b, 0xf7, - 0x46, 0x7a, 0xa1, 0xf3, 0xd3, 0xf7, 0x07, 0x0b, 0x9f, 0x92, 0x24, 0x69, 0xfa, 0xd1, 0xb1, 0xa0, - 0x8e, 0x6f, 0xa2, 0xe3, 0x05, 0x3d, 0xe6, 0xbf, 0xb0, 0xc7, 0xcb, 0xe3, 0x73, 0x5d, 0xe6, 0x9c, - 0x5f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x62, 0xe7, 0xb4, 0xdc, 0x1e, 0x0f, 0x00, 0x00, ->>>>>>> vstream optional field event } From 14d18cc5cbd5df3b1efd384d4881a1345b502fbe Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 12:49:54 -0700 Subject: [PATCH 20/25] minor-cleanup Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index b733c1e6c4..381408d962 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -346,7 +346,6 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e var cols []schema.TableColumn for i, typ := range tm.Types { t, err := sqltypes.MySQLToType(int64(typ), 0) - fmt.Printf("type conversion table tableName:%s typ:%d tm.Metadata[i]:%d t:%d\n", tableName, int64(typ), int64(tm.Metadata[i]), t) if err != nil { return nil, fmt.Errorf("unsupported type: %d, position: %d", typ, i) } @@ -368,8 +367,8 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e // check if the schema returned by schema.Engine matches with row. schemaMatch := true if len(tm.Types) <= len(st.Columns) { - for i, typ := range tm.Types { - t, _ := sqltypes.MySQLToType(int64(typ), 0) + for i := range tm.Types { + t := cols[i].Type if !sqltypes.TypeEquivalenceCheck(t, st.Columns[i].Type) { schemaMatch = false break From b6a41fe6e6c21ae12210fada07a114cd4e64bbe8 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 15:22:43 -0700 Subject: [PATCH 21/25] address-review-feedback Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 6 +++--- go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index 381408d962..d55e8ee623 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -369,7 +369,7 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e if len(tm.Types) <= len(st.Columns) { for i := range tm.Types { t := cols[i].Type - if !sqltypes.TypeEquivalenceCheck(t, st.Columns[i].Type) { + if !sqltypes.AreTypesEquivalent(t, st.Columns[i].Type) { schemaMatch = false break } @@ -378,13 +378,13 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e schemaMatch = false } if schemaMatch { + // Columns should be truncated to match those in tm. cols = st.Columns[:len(tm.Types)] } } table := &Table{ - Name: tableName, - // Columns should be truncated to match those in tm. + Name: tableName, Columns: cols, } plan, err := buildPlan(table, vs.kschema, vs.filter) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go index 5a7167768d..814a4dab47 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go @@ -577,6 +577,8 @@ func TestBestEffortNameInFieldEvent(t *testing.T) { input: []string{ "insert into vitess_null_new values(2, 'abc')", }, + // In this case, we don't have information about vitess_null since it was renamed to vitess_null_test. + // information returned by binlog for val column == varchar (rather than varbinary). output: [][]string{{ `gtid|begin`, `gtid|begin`, From 6ee9ce3e65d108188cde165f3f1b8c6c95ee1851 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 15:26:17 -0700 Subject: [PATCH 22/25] address-review-feedback Signed-off-by: Nitin Shatma --- go/sqltypes/type.go | 6 ++++-- go/sqltypes/type_test.go | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/go/sqltypes/type.go b/go/sqltypes/type.go index a9c843c326..9f7165439a 100644 --- a/go/sqltypes/type.go +++ b/go/sqltypes/type.go @@ -252,9 +252,12 @@ func MySQLToType(mysqlType, flags int64) (typ querypb.Type, err error) { } //TypeEquivalenceCheck returns whether two types are equivalent. -func TypeEquivalenceCheck(mysqlTypeFromBinlog, mysqlTypeFromSchema querypb.Type) (isEquivalent bool) { +func AreTypesEquivalent(mysqlTypeFromBinlog, mysqlTypeFromSchema querypb.Type) bool { return (mysqlTypeFromBinlog == mysqlTypeFromSchema) || (mysqlTypeFromBinlog == VarChar && mysqlTypeFromSchema == VarBinary) || + // Binlog only has base type. But doesn't have per-column-flags to differentiate + // various logical types. For Binary, Enum, Set types, binlog only returns Char + // as data type. (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Binary) || (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Enum) || (mysqlTypeFromBinlog == Char && mysqlTypeFromSchema == Set) || @@ -264,7 +267,6 @@ func TypeEquivalenceCheck(mysqlTypeFromBinlog, mysqlTypeFromSchema querypb.Type) (mysqlTypeFromBinlog == Int24 && mysqlTypeFromSchema == Uint24) || (mysqlTypeFromBinlog == Int32 && mysqlTypeFromSchema == Uint32) || (mysqlTypeFromBinlog == Int64 && mysqlTypeFromSchema == Uint64) - } // typeToMySQL is the reverse of mysqlToType. diff --git a/go/sqltypes/type_test.go b/go/sqltypes/type_test.go index 7b44d72af3..e3218105cc 100644 --- a/go/sqltypes/type_test.go +++ b/go/sqltypes/type_test.go @@ -414,22 +414,22 @@ func TestTypeError(t *testing.T) { } func TestTypeEquivalenceCheck(t *testing.T) { - if !TypeEquivalenceCheck(Int16, Int16) { - t.Errorf("Int16 and Int16 are same type.") + if !AreTypesEquivalent(Int16, Int16) { + t.Errorf("Int16 and Int16 are same types.") } - if TypeEquivalenceCheck(Int16, Int24) { - t.Errorf("Int16 and Int24 are not same type.") + if AreTypesEquivalent(Int16, Int24) { + t.Errorf("Int16 and Int24 are not same types.") } - if !TypeEquivalenceCheck(VarChar, VarBinary) { - t.Errorf("VarChar in binlog and VarBinary in schema are equivalent type.") + if !AreTypesEquivalent(VarChar, VarBinary) { + t.Errorf("VarChar in binlog and VarBinary in schema are equivalent types.") } - if TypeEquivalenceCheck(VarBinary, VarChar) { - t.Errorf("VarBinary in binlog and VarChar in schema are not equivalent type.") + if AreTypesEquivalent(VarBinary, VarChar) { + t.Errorf("VarBinary in binlog and VarChar in schema are not equivalent types.") } - if !TypeEquivalenceCheck(Uint16, Uint16) { - t.Errorf("Int16 in binlog and Uint16 in schema are equivalent type.") + if !AreTypesEquivalent(Int16, Uint16) { + t.Errorf("Int16 in binlog and Uint16 in schema are equivalent types.") } - if TypeEquivalenceCheck(Uint16, Int16) { - t.Errorf("UInt16 in binlog and int16 in schema are not equivalent type.") + if AreTypesEquivalent(Uint16, Int16) { + t.Errorf("Uint16 in binlog and Int16 in schema are not equivalent types.") } } From 84d6205c648e2d0e54ecb6c334b33db72431d236 Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 17:38:41 -0700 Subject: [PATCH 23/25] address-review-feedback Signed-off-by: Nitin Shatma --- go/vt/vttablet/tabletserver/vstreamer/vstreamer.go | 4 ++-- go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go index d55e8ee623..3724a27485 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer.go @@ -356,11 +356,11 @@ func (vs *vstreamer) parseEvent(ev mysql.BinlogEvent) ([]*binlogdatapb.VEvent, e } st := vs.se.GetTable(sqlparser.NewTableIdent(tm.Name)) if st == nil { - if !vs.filter.BestEffortNameInFieldEvent { + if vs.filter.FieldEventMode == binlogdatapb.Filter_ERR_ON_MISMATCH { return nil, fmt.Errorf("unknown table %v in schema", tm.Name) } } else { - if len(st.Columns) < len(tm.Types) && !vs.filter.BestEffortNameInFieldEvent { + if len(st.Columns) < len(tm.Types) && vs.filter.FieldEventMode == binlogdatapb.Filter_ERR_ON_MISMATCH { return nil, fmt.Errorf("cannot determine table columns for %s: event has %d columns, current schema has %d: %#v", tm.Name, len(tm.Types), len(st.Columns), ev) } tableName = st.Name.String() diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go index 814a4dab47..02fe3b70c6 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go @@ -554,7 +554,7 @@ func TestBestEffortNameInFieldEvent(t *testing.T) { t.Skip() } filter := &binlogdatapb.Filter{ - BestEffortNameInFieldEvent: true, + FieldEventMode: binlogdatapb.Filter_BEST_EFFORT, Rules: []*binlogdatapb.Rule{{ Match: "/.*/", }}, From d93239c76e5cfcce770f979d7439d4404dce02aa Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 18:51:16 -0700 Subject: [PATCH 24/25] proto-changes Signed-off-by: Nitin Shatma --- go/vt/proto/automation/automation.pb.go | 3 +- .../automationservice/automationservice.pb.go | 3 +- go/vt/proto/binlogdata/binlogdata.pb.go | 247 ++++++++++-------- go/vt/proto/binlogservice/binlogservice.pb.go | 3 +- go/vt/proto/logutil/logutil.pb.go | 3 +- go/vt/proto/mysqlctl/mysqlctl.pb.go | 3 +- go/vt/proto/query/query.pb.go | 3 +- go/vt/proto/queryservice/queryservice.pb.go | 3 +- .../replicationdata/replicationdata.pb.go | 3 +- go/vt/proto/tableacl/tableacl.pb.go | 3 +- .../tabletmanagerdata/tabletmanagerdata.pb.go | 3 +- .../tabletmanagerservice.pb.go | 3 +- go/vt/proto/throttlerdata/throttlerdata.pb.go | 3 +- .../throttlerservice/throttlerservice.pb.go | 3 +- go/vt/proto/topodata/topodata.pb.go | 3 +- go/vt/proto/vschema/vschema.pb.go | 3 +- go/vt/proto/vtctldata/vtctldata.pb.go | 3 +- go/vt/proto/vtctlservice/vtctlservice.pb.go | 3 +- go/vt/proto/vtgate/vtgate.pb.go | 3 +- go/vt/proto/vtgateservice/vtgateservice.pb.go | 3 +- go/vt/proto/vtrpc/vtrpc.pb.go | 3 +- go/vt/proto/vttest/vttest.pb.go | 3 +- go/vt/proto/vtworkerdata/vtworkerdata.pb.go | 3 +- .../vtworkerservice/vtworkerservice.pb.go | 3 +- go/vt/proto/workflow/workflow.pb.go | 3 +- proto/binlogdata.proto | 6 +- py/vtproto/binlogdata_pb2.py | 101 ++++--- 27 files changed, 230 insertions(+), 196 deletions(-) diff --git a/go/vt/proto/automation/automation.pb.go b/go/vt/proto/automation/automation.pb.go index fe039ca84e..527028c2c7 100644 --- a/go/vt/proto/automation/automation.pb.go +++ b/go/vt/proto/automation/automation.pb.go @@ -5,9 +5,8 @@ package automation import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/automationservice/automationservice.pb.go b/go/vt/proto/automationservice/automationservice.pb.go index bc2062f662..e776217b6f 100644 --- a/go/vt/proto/automationservice/automationservice.pb.go +++ b/go/vt/proto/automationservice/automationservice.pb.go @@ -6,12 +6,11 @@ package automationservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" automation "vitess.io/vitess/go/vt/proto/automation" ) diff --git a/go/vt/proto/binlogdata/binlogdata.pb.go b/go/vt/proto/binlogdata/binlogdata.pb.go index 45b871b908..ab28426b03 100644 --- a/go/vt/proto/binlogdata/binlogdata.pb.go +++ b/go/vt/proto/binlogdata/binlogdata.pb.go @@ -5,9 +5,8 @@ package binlogdata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" query "vitess.io/vitess/go/vt/proto/query" topodata "vitess.io/vitess/go/vt/proto/topodata" vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" @@ -205,6 +204,31 @@ func (BinlogTransaction_Statement_Category) EnumDescriptor() ([]byte, []int) { return fileDescriptor_5fd02bcb2e350dad, []int{1, 0, 0} } +type Filter_FieldEventMode int32 + +const ( + Filter_ERR_ON_MISMATCH Filter_FieldEventMode = 0 + Filter_BEST_EFFORT Filter_FieldEventMode = 1 +) + +var Filter_FieldEventMode_name = map[int32]string{ + 0: "ERR_ON_MISMATCH", + 1: "BEST_EFFORT", +} + +var Filter_FieldEventMode_value = map[string]int32{ + "ERR_ON_MISMATCH": 0, + "BEST_EFFORT": 1, +} + +func (x Filter_FieldEventMode) String() string { + return proto.EnumName(Filter_FieldEventMode_name, int32(x)) +} + +func (Filter_FieldEventMode) EnumDescriptor() ([]byte, []int) { + return fileDescriptor_5fd02bcb2e350dad, []int{7, 0} +} + // Charset is the per-statement charset info from a QUERY_EVENT binlog entry. type Charset struct { // @@session.character_set_client @@ -627,11 +651,11 @@ func (m *Rule) GetFilter() string { // Filter represents a list of ordered rules. First match // wins. type Filter struct { - Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` - BestEffortNameInFieldEvent bool `protobuf:"varint,2,opt,name=bestEffortNameInFieldEvent,proto3" json:"bestEffortNameInFieldEvent,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Rules []*Rule `protobuf:"bytes,1,rep,name=rules,proto3" json:"rules,omitempty"` + FieldEventMode Filter_FieldEventMode `protobuf:"varint,2,opt,name=fieldEventMode,proto3,enum=binlogdata.Filter_FieldEventMode" json:"fieldEventMode,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Filter) Reset() { *m = Filter{} } @@ -666,11 +690,11 @@ func (m *Filter) GetRules() []*Rule { return nil } -func (m *Filter) GetBestEffortNameInFieldEvent() bool { +func (m *Filter) GetFieldEventMode() Filter_FieldEventMode { if m != nil { - return m.BestEffortNameInFieldEvent + return m.FieldEventMode } - return false + return Filter_ERR_ON_MISMATCH } // BinlogSource specifies the source and filter parameters for @@ -1508,6 +1532,7 @@ func init() { proto.RegisterEnum("binlogdata.VEventType", VEventType_name, VEventType_value) proto.RegisterEnum("binlogdata.MigrationType", MigrationType_name, MigrationType_value) proto.RegisterEnum("binlogdata.BinlogTransaction_Statement_Category", BinlogTransaction_Statement_Category_name, BinlogTransaction_Statement_Category_value) + proto.RegisterEnum("binlogdata.Filter_FieldEventMode", Filter_FieldEventMode_name, Filter_FieldEventMode_value) proto.RegisterType((*Charset)(nil), "binlogdata.Charset") proto.RegisterType((*BinlogTransaction)(nil), "binlogdata.BinlogTransaction") proto.RegisterType((*BinlogTransaction_Statement)(nil), "binlogdata.BinlogTransaction.Statement") @@ -1535,103 +1560,107 @@ func init() { func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) } var fileDescriptor_5fd02bcb2e350dad = []byte{ - // 1558 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcb, 0x72, 0xdb, 0xca, - 0x11, 0x35, 0x09, 0xf0, 0xd5, 0x90, 0x28, 0x68, 0xf4, 0x08, 0xa3, 0x8a, 0x53, 0x0a, 0x2a, 0x8e, - 0x14, 0x55, 0x85, 0x72, 0x98, 0xc4, 0x59, 0x39, 0x0e, 0x1f, 0xb0, 0x4c, 0x09, 0x22, 0xe5, 0x21, - 0x24, 0xa7, 0xbc, 0x41, 0x41, 0xc4, 0x48, 0x42, 0x04, 0x02, 0x34, 0x30, 0xa4, 0xa2, 0x0f, 0x48, - 0xe5, 0x03, 0xb2, 0xcd, 0x0f, 0x64, 0x9f, 0x6d, 0xb6, 0xd9, 0xe7, 0x0b, 0xb2, 0xca, 0x7f, 0xdc, - 0x9a, 0x07, 0x40, 0x42, 0xf6, 0xb5, 0xe5, 0x5b, 0x75, 0x17, 0x77, 0xc3, 0xea, 0xe9, 0xe9, 0xe7, - 0x41, 0x4f, 0x77, 0x13, 0xf4, 0x4b, 0x3f, 0x0c, 0xa2, 0x6b, 0xcf, 0xa5, 0x6e, 0x73, 0x1a, 0x47, - 0x34, 0x42, 0xb0, 0xe0, 0xec, 0x68, 0x73, 0x1a, 0x4f, 0xc7, 0xe2, 0x62, 0x47, 0xfb, 0x30, 0x23, - 0xf1, 0xbd, 0x3c, 0xd4, 0x69, 0x34, 0x8d, 0x16, 0x5a, 0xc6, 0x29, 0x54, 0xba, 0x37, 0x6e, 0x9c, - 0x10, 0x8a, 0xb6, 0xa1, 0x3c, 0x0e, 0x7c, 0x12, 0xd2, 0x46, 0x61, 0xb7, 0xb0, 0x5f, 0xc2, 0xf2, - 0x84, 0x10, 0xa8, 0xe3, 0x28, 0x0c, 0x1b, 0x45, 0xce, 0xe5, 0x34, 0x93, 0x4d, 0x48, 0x3c, 0x27, - 0x71, 0x43, 0x11, 0xb2, 0xe2, 0x64, 0xfc, 0x5f, 0x81, 0xf5, 0x0e, 0x8f, 0xc3, 0x8e, 0xdd, 0x30, - 0x71, 0xc7, 0xd4, 0x8f, 0x42, 0x74, 0x04, 0x90, 0x50, 0x97, 0x92, 0x09, 0x09, 0x69, 0xd2, 0x28, - 0xec, 0x2a, 0xfb, 0x5a, 0x6b, 0xaf, 0xb9, 0x94, 0xc1, 0x47, 0x2a, 0xcd, 0x51, 0x2a, 0x8f, 0x97, - 0x54, 0x51, 0x0b, 0x34, 0x32, 0x27, 0x21, 0x75, 0x68, 0x74, 0x4b, 0xc2, 0x86, 0xba, 0x5b, 0xd8, - 0xd7, 0x5a, 0xeb, 0x4d, 0x91, 0xa0, 0xc9, 0x6e, 0x6c, 0x76, 0x81, 0x81, 0x64, 0xf4, 0xce, 0x7f, - 0x8a, 0x50, 0xcb, 0xac, 0x21, 0x0b, 0xaa, 0x63, 0x97, 0x92, 0xeb, 0x28, 0xbe, 0xe7, 0x69, 0xd6, - 0x5b, 0xcf, 0x1f, 0x19, 0x48, 0xb3, 0x2b, 0xf5, 0x70, 0x66, 0x01, 0xfd, 0x0a, 0x2a, 0x63, 0x81, - 0x1e, 0x47, 0x47, 0x6b, 0x6d, 0x2c, 0x1b, 0x93, 0xc0, 0xe2, 0x54, 0x06, 0xe9, 0xa0, 0x24, 0x1f, - 0x02, 0x0e, 0xd9, 0x0a, 0x66, 0xa4, 0xf1, 0xcf, 0x02, 0x54, 0x53, 0xbb, 0x68, 0x03, 0xd6, 0x3a, - 0x96, 0x73, 0x3e, 0xc0, 0x66, 0x77, 0x78, 0x34, 0xe8, 0xbf, 0x37, 0x7b, 0xfa, 0x13, 0xb4, 0x02, - 0xd5, 0x8e, 0xe5, 0x74, 0xcc, 0xa3, 0xfe, 0x40, 0x2f, 0xa0, 0x55, 0xa8, 0x75, 0x2c, 0xa7, 0x3b, - 0x3c, 0x3d, 0xed, 0xdb, 0x7a, 0x11, 0xad, 0x81, 0xd6, 0xb1, 0x1c, 0x3c, 0xb4, 0xac, 0x4e, 0xbb, - 0x7b, 0xa2, 0x2b, 0x68, 0x0b, 0xd6, 0x3b, 0x96, 0xd3, 0x3b, 0xb5, 0x9c, 0x9e, 0x79, 0x86, 0xcd, - 0x6e, 0xdb, 0x36, 0x7b, 0xba, 0x8a, 0x00, 0xca, 0x8c, 0xdd, 0xb3, 0xf4, 0x92, 0xa4, 0x47, 0xa6, - 0xad, 0x97, 0xa5, 0xb9, 0xfe, 0x60, 0x64, 0x62, 0x5b, 0xaf, 0xc8, 0xe3, 0xf9, 0x59, 0xaf, 0x6d, - 0x9b, 0x7a, 0x55, 0x1e, 0x7b, 0xa6, 0x65, 0xda, 0xa6, 0x5e, 0x3b, 0x56, 0xab, 0x45, 0x5d, 0x39, - 0x56, 0xab, 0x8a, 0xae, 0x1a, 0x7f, 0x2f, 0xc0, 0xd6, 0x88, 0xc6, 0xc4, 0x9d, 0x9c, 0x90, 0x7b, - 0xec, 0x86, 0xd7, 0x04, 0x93, 0x0f, 0x33, 0x92, 0x50, 0xb4, 0x03, 0xd5, 0x69, 0x94, 0xf8, 0x0c, - 0x3b, 0x0e, 0x70, 0x0d, 0x67, 0x67, 0x74, 0x08, 0xb5, 0x5b, 0x72, 0xef, 0xc4, 0x4c, 0x5e, 0x02, - 0x86, 0x9a, 0x59, 0x41, 0x66, 0x96, 0xaa, 0xb7, 0x92, 0x5a, 0xc6, 0x57, 0xf9, 0x32, 0xbe, 0xc6, - 0x15, 0x6c, 0x3f, 0x0c, 0x2a, 0x99, 0x46, 0x61, 0x42, 0x90, 0x05, 0x48, 0x28, 0x3a, 0x74, 0xf1, - 0x6d, 0x79, 0x7c, 0x5a, 0xeb, 0xe9, 0x67, 0x0b, 0x00, 0xaf, 0x5f, 0x3e, 0x64, 0x19, 0x7f, 0x81, - 0x0d, 0xe1, 0xc7, 0x76, 0x2f, 0x03, 0x92, 0x3c, 0x26, 0xf5, 0x6d, 0x28, 0x53, 0x2e, 0xdc, 0x28, - 0xee, 0x2a, 0xfb, 0x35, 0x2c, 0x4f, 0x5f, 0x9b, 0xa1, 0x07, 0x9b, 0x79, 0xcf, 0xdf, 0x4b, 0x7e, - 0xbf, 0x05, 0x15, 0xcf, 0x02, 0x82, 0x36, 0xa1, 0x34, 0x71, 0xe9, 0xf8, 0x46, 0x66, 0x23, 0x0e, - 0x2c, 0x95, 0x2b, 0x3f, 0xa0, 0x24, 0xe6, 0x9f, 0xb0, 0x86, 0xe5, 0xc9, 0x78, 0x0e, 0xe5, 0xd7, - 0x9c, 0x42, 0xbf, 0x80, 0x52, 0x3c, 0x63, 0xb9, 0x8a, 0xa7, 0xae, 0x2f, 0x07, 0xc0, 0x0c, 0x63, - 0x71, 0x6d, 0xfc, 0xa3, 0x08, 0x2b, 0x22, 0xa0, 0x51, 0x34, 0x8b, 0xc7, 0x84, 0x21, 0x78, 0x4b, - 0xee, 0x93, 0xa9, 0x3b, 0x26, 0x29, 0x82, 0xe9, 0x99, 0x05, 0x93, 0xdc, 0xb8, 0xb1, 0x27, 0xbd, - 0x8a, 0x03, 0xfa, 0x1d, 0x68, 0x1c, 0x49, 0xea, 0xd0, 0xfb, 0x29, 0xe1, 0x18, 0xd6, 0x5b, 0x9b, - 0x8b, 0xa2, 0xe2, 0x38, 0x51, 0xfb, 0x7e, 0x4a, 0x30, 0xd0, 0x8c, 0xce, 0x57, 0xa2, 0xfa, 0x88, - 0x4a, 0x5c, 0x7c, 0xbf, 0x52, 0xee, 0xfb, 0x1d, 0x64, 0x60, 0x94, 0xa5, 0x95, 0xa5, 0x5c, 0x05, - 0x1c, 0x29, 0x40, 0xa8, 0x09, 0xe5, 0x28, 0x74, 0x3c, 0x2f, 0x68, 0x54, 0x78, 0x98, 0x3f, 0x5a, - 0x96, 0x1d, 0x86, 0xbd, 0x9e, 0xd5, 0x16, 0x9f, 0xa4, 0x14, 0x85, 0x3d, 0x2f, 0x30, 0xde, 0x42, - 0x0d, 0x47, 0x77, 0xdd, 0x1b, 0x1e, 0x80, 0x01, 0xe5, 0x4b, 0x72, 0x15, 0xc5, 0x44, 0x7e, 0x55, - 0x90, 0x5d, 0x0f, 0x47, 0x77, 0x58, 0xde, 0xa0, 0x5d, 0x28, 0xb9, 0x57, 0xe9, 0x87, 0xc9, 0x8b, - 0x88, 0x0b, 0xc3, 0x85, 0x2a, 0x8e, 0xee, 0x78, 0xa7, 0x44, 0x4f, 0x41, 0x20, 0xe2, 0x84, 0xee, - 0x24, 0x85, 0xbb, 0xc6, 0x39, 0x03, 0x77, 0x42, 0xd0, 0x0b, 0xd0, 0xe2, 0xe8, 0xce, 0x19, 0x73, - 0xf7, 0xa2, 0x6c, 0xb5, 0xd6, 0x56, 0xee, 0x53, 0xa6, 0xc1, 0x61, 0x88, 0x53, 0x32, 0x31, 0xde, - 0x02, 0xbc, 0xf6, 0x49, 0xe0, 0x3d, 0xca, 0xc9, 0xcf, 0x19, 0x7c, 0x24, 0xf0, 0x52, 0xfb, 0x2b, - 0x32, 0x64, 0x6e, 0x01, 0xcb, 0x3b, 0x06, 0xc4, 0x88, 0x7d, 0xed, 0x23, 0xea, 0x7b, 0xdf, 0xa1, - 0x46, 0x10, 0xa8, 0xd7, 0xd4, 0xf7, 0x78, 0x71, 0xd4, 0x30, 0xa7, 0x8d, 0x57, 0x50, 0xba, 0xe0, - 0xe6, 0x5e, 0x80, 0xc6, 0xa5, 0x1c, 0xc6, 0x4e, 0x2b, 0x36, 0x97, 0x66, 0xe6, 0x1a, 0x43, 0x92, - 0x92, 0x89, 0xd1, 0x86, 0xd5, 0x13, 0xe9, 0x96, 0x0b, 0x7c, 0x7d, 0x5c, 0xc6, 0xbf, 0x8a, 0x50, - 0x39, 0x8e, 0x66, 0x71, 0xe8, 0x06, 0xa8, 0x0e, 0x45, 0xdf, 0xe3, 0x7a, 0x0a, 0x2e, 0xfa, 0x1e, - 0xfa, 0x23, 0xd4, 0x27, 0xfe, 0x75, 0xec, 0xb2, 0x7a, 0x10, 0xa5, 0x5d, 0xe4, 0x35, 0xf3, 0xe3, - 0xe5, 0xc8, 0x4e, 0x53, 0x09, 0x5e, 0xdf, 0xab, 0x93, 0xe5, 0xe3, 0x52, 0xc5, 0x2a, 0xb9, 0x8a, - 0x7d, 0x06, 0xf5, 0x20, 0x1a, 0xbb, 0x81, 0x93, 0xf5, 0x2a, 0x95, 0x07, 0xb5, 0xca, 0xb9, 0x67, - 0x69, 0xc3, 0x7a, 0x80, 0x4b, 0xe9, 0x91, 0xb8, 0xa0, 0x97, 0xb0, 0x32, 0x75, 0x63, 0xea, 0x8f, - 0xfd, 0xa9, 0xcb, 0xa6, 0x7d, 0x99, 0x2b, 0xe6, 0xc2, 0xce, 0xe1, 0x86, 0x73, 0xe2, 0xe8, 0x67, - 0xb0, 0x12, 0x93, 0x39, 0x89, 0x13, 0xe2, 0x39, 0xcc, 0x6f, 0x65, 0x57, 0xd9, 0x57, 0xb0, 0x96, - 0xf2, 0xfa, 0x5e, 0x62, 0xfc, 0xaf, 0x08, 0xe5, 0x0b, 0x51, 0x5d, 0x07, 0xa0, 0x72, 0x6c, 0xc4, - 0x24, 0xdf, 0x5e, 0x76, 0x22, 0x24, 0x38, 0x30, 0x5c, 0x06, 0xfd, 0x04, 0x6a, 0xd4, 0x9f, 0x90, - 0x84, 0xba, 0x93, 0x29, 0x07, 0x53, 0xc1, 0x0b, 0xc6, 0xa7, 0x6a, 0x84, 0x8d, 0x6b, 0xf6, 0x58, - 0x05, 0x3c, 0x8c, 0x44, 0xbf, 0x86, 0x1a, 0x7b, 0x13, 0x7c, 0xbb, 0x68, 0x94, 0xf8, 0x23, 0xdb, - 0x7c, 0xf0, 0x22, 0xb8, 0x5b, 0x5c, 0x8d, 0xd3, 0x57, 0xf6, 0x7b, 0xd0, 0x78, 0x15, 0x4b, 0x25, - 0xd1, 0x25, 0xb6, 0xf3, 0x5d, 0x22, 0x7d, 0x2d, 0x18, 0xae, 0x16, 0x2f, 0x67, 0x0f, 0x4a, 0x73, - 0x1e, 0x52, 0x45, 0x6e, 0x39, 0xcb, 0xc9, 0x71, 0xd8, 0xc5, 0x3d, 0x1b, 0x21, 0x7f, 0x16, 0x55, - 0xd4, 0xa8, 0x7e, 0x3c, 0x42, 0x64, 0x81, 0xe1, 0x54, 0x86, 0x21, 0x3c, 0x9e, 0xc5, 0x31, 0xdf, - 0xa2, 0xfc, 0x09, 0x69, 0x6c, 0x72, 0x28, 0x34, 0xc9, 0xb3, 0xfd, 0x09, 0x31, 0xfe, 0x56, 0x84, - 0xfa, 0x85, 0x98, 0x33, 0xe9, 0x6c, 0x7b, 0x05, 0x1b, 0xe4, 0xea, 0x8a, 0x8c, 0xa9, 0x3f, 0x27, - 0xce, 0xd8, 0x0d, 0x02, 0x12, 0x3b, 0xb2, 0x60, 0xb5, 0xd6, 0x5a, 0x53, 0xec, 0x9b, 0x5d, 0xce, - 0xef, 0xf7, 0xf0, 0x7a, 0x26, 0x2b, 0x59, 0x1e, 0x32, 0x61, 0xc3, 0x9f, 0x4c, 0x88, 0xe7, 0xbb, - 0x74, 0xd9, 0x80, 0xe8, 0x54, 0x5b, 0xf2, 0xd9, 0x5f, 0xd8, 0x47, 0x2e, 0x25, 0x0b, 0x33, 0x99, - 0x46, 0x66, 0xe6, 0x19, 0xab, 0xea, 0xf8, 0x3a, 0x1b, 0x97, 0xab, 0x52, 0xd3, 0xe6, 0x4c, 0x2c, - 0x2f, 0x73, 0xa3, 0x58, 0x7d, 0x30, 0x8a, 0x17, 0x2d, 0xbb, 0xf4, 0xa5, 0x96, 0x6d, 0xbc, 0x84, - 0xb5, 0x0c, 0x08, 0x39, 0x6a, 0x0f, 0xa0, 0xcc, 0x3f, 0x65, 0xda, 0x2b, 0xd0, 0xc7, 0x55, 0x87, - 0xa5, 0x84, 0xf1, 0xd7, 0x22, 0xa0, 0x54, 0x3f, 0xba, 0x4b, 0x7e, 0xa0, 0x60, 0x6e, 0x42, 0x89, - 0xf3, 0x25, 0x92, 0xe2, 0xc0, 0x70, 0x08, 0xdc, 0x84, 0x4e, 0x6f, 0x33, 0x18, 0x85, 0xf2, 0x5b, - 0xf6, 0x8b, 0x49, 0x32, 0x0b, 0x28, 0x96, 0x12, 0xc6, 0xbf, 0x0b, 0xb0, 0x91, 0xc3, 0x41, 0x62, - 0xb9, 0x68, 0xff, 0x85, 0x6f, 0x6f, 0xff, 0x68, 0x1f, 0xaa, 0xd3, 0xdb, 0xcf, 0x8c, 0x89, 0xec, - 0xf6, 0x93, 0xaf, 0xf8, 0xa7, 0xa0, 0xc6, 0xd1, 0x5d, 0xd2, 0x50, 0xb9, 0xe6, 0xf2, 0x4c, 0xe4, - 0x7c, 0x36, 0x58, 0x73, 0x79, 0xe4, 0x06, 0xab, 0xb8, 0x39, 0xf8, 0x03, 0x68, 0x4b, 0xf3, 0x99, - 0xad, 0xd0, 0xfd, 0xa3, 0xc1, 0x10, 0x9b, 0xfa, 0x13, 0x54, 0x05, 0x75, 0x64, 0x0f, 0xcf, 0xf4, - 0x02, 0xa3, 0xcc, 0x3f, 0x99, 0x5d, 0xb1, 0x96, 0x33, 0xca, 0x91, 0x42, 0xca, 0xc1, 0x7f, 0x0b, - 0x00, 0x8b, 0x86, 0x84, 0x34, 0xa8, 0x9c, 0x0f, 0x4e, 0x06, 0xc3, 0x77, 0x03, 0x61, 0xe0, 0xc8, - 0xee, 0xf7, 0xf4, 0x02, 0xaa, 0x41, 0x49, 0xec, 0xf9, 0x45, 0xe6, 0x41, 0x2e, 0xf9, 0x0a, 0xfb, - 0x07, 0x90, 0x6d, 0xf8, 0x2a, 0xaa, 0x80, 0x92, 0xed, 0xf1, 0x72, 0x71, 0x2f, 0x33, 0x83, 0xd8, - 0x3c, 0xb3, 0xda, 0x5d, 0x53, 0xaf, 0xb0, 0x8b, 0x6c, 0x85, 0x07, 0x28, 0xa7, 0xfb, 0x3b, 0xd3, - 0x64, 0x5b, 0x3f, 0x30, 0x3f, 0x43, 0xfb, 0x8d, 0x89, 0x75, 0x8d, 0xf1, 0xf0, 0xf0, 0x9d, 0xbe, - 0xc2, 0x78, 0xaf, 0xfb, 0xa6, 0xd5, 0xd3, 0x57, 0xd9, 0xda, 0xff, 0xc6, 0x6c, 0x63, 0xbb, 0x63, - 0xb6, 0x6d, 0xbd, 0xce, 0x6e, 0x2e, 0x78, 0x80, 0x6b, 0xcc, 0xcd, 0xf1, 0xf0, 0x1c, 0x0f, 0xda, - 0x96, 0xae, 0x1f, 0xec, 0xc1, 0x6a, 0x6e, 0xfe, 0x30, 0x5f, 0x76, 0xbb, 0x63, 0x99, 0x23, 0xfd, - 0x09, 0xa3, 0x47, 0x6f, 0xda, 0xb8, 0x37, 0xd2, 0x0b, 0x9d, 0x5f, 0xbe, 0xdf, 0x9b, 0xfb, 0x94, - 0x24, 0x49, 0xd3, 0x8f, 0x0e, 0x05, 0x75, 0x78, 0x1d, 0x1d, 0xce, 0xe9, 0x21, 0xff, 0x0b, 0x7a, - 0xb8, 0x78, 0x3e, 0x97, 0x65, 0xce, 0xf9, 0xcd, 0x37, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2e, 0xb4, - 0x72, 0xde, 0xde, 0x0e, 0x00, 0x00, + // 1620 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x4d, 0x73, 0xf3, 0x48, + 0x11, 0x8e, 0x2d, 0xf9, 0xab, 0x95, 0x38, 0xca, 0xe4, 0x03, 0x93, 0x62, 0xa9, 0xac, 0x8a, 0x25, + 0x21, 0x55, 0x38, 0x60, 0xe0, 0xe5, 0xb4, 0x2c, 0xfe, 0x50, 0x12, 0x27, 0xb2, 0x9d, 0x77, 0xac, + 0x64, 0xa9, 0xbd, 0xa8, 0x14, 0x6b, 0x92, 0x88, 0xc8, 0x92, 0x5f, 0x69, 0xec, 0x90, 0x1f, 0x40, + 0xf1, 0x03, 0xb8, 0xf2, 0x07, 0x38, 0xc3, 0x95, 0x2b, 0x77, 0x7e, 0x01, 0x27, 0xfe, 0x07, 0x35, + 0x1f, 0x92, 0xad, 0x64, 0xd9, 0x37, 0x4b, 0x15, 0x07, 0x2e, 0xaa, 0x9e, 0x9e, 0xee, 0x9e, 0x9e, + 0x67, 0x9e, 0xee, 0xd1, 0x80, 0x7e, 0xeb, 0x87, 0x41, 0x74, 0xef, 0xb9, 0xd4, 0x6d, 0xce, 0xe2, + 0x88, 0x46, 0x08, 0x96, 0x9a, 0x7d, 0x6d, 0x41, 0xe3, 0xd9, 0x44, 0x4c, 0xec, 0x6b, 0x1f, 0xe6, + 0x24, 0x7e, 0x96, 0x83, 0x3a, 0x8d, 0x66, 0xd1, 0xd2, 0xcb, 0x18, 0x40, 0xa5, 0xfb, 0xe0, 0xc6, + 0x09, 0xa1, 0x68, 0x0f, 0xca, 0x93, 0xc0, 0x27, 0x21, 0x6d, 0x14, 0x0e, 0x0a, 0x47, 0x25, 0x2c, + 0x47, 0x08, 0x81, 0x3a, 0x89, 0xc2, 0xb0, 0x51, 0xe4, 0x5a, 0x2e, 0x33, 0xdb, 0x84, 0xc4, 0x0b, + 0x12, 0x37, 0x14, 0x61, 0x2b, 0x46, 0xc6, 0xbf, 0x14, 0xd8, 0xea, 0xf0, 0x3c, 0xec, 0xd8, 0x0d, + 0x13, 0x77, 0x42, 0xfd, 0x28, 0x44, 0x67, 0x00, 0x09, 0x75, 0x29, 0x99, 0x92, 0x90, 0x26, 0x8d, + 0xc2, 0x81, 0x72, 0xa4, 0xb5, 0x0e, 0x9b, 0x2b, 0x3b, 0x78, 0xe5, 0xd2, 0x1c, 0xa7, 0xf6, 0x78, + 0xc5, 0x15, 0xb5, 0x40, 0x23, 0x0b, 0x12, 0x52, 0x87, 0x46, 0x8f, 0x24, 0x6c, 0xa8, 0x07, 0x85, + 0x23, 0xad, 0xb5, 0xd5, 0x14, 0x1b, 0x34, 0xd9, 0x8c, 0xcd, 0x26, 0x30, 0x90, 0x4c, 0xde, 0xff, + 0x7b, 0x11, 0x6a, 0x59, 0x34, 0x64, 0x41, 0x75, 0xe2, 0x52, 0x72, 0x1f, 0xc5, 0xcf, 0x7c, 0x9b, + 0xf5, 0xd6, 0x4f, 0xde, 0x98, 0x48, 0xb3, 0x2b, 0xfd, 0x70, 0x16, 0x01, 0xfd, 0x18, 0x2a, 0x13, + 0x81, 0x1e, 0x47, 0x47, 0x6b, 0x6d, 0xaf, 0x06, 0x93, 0xc0, 0xe2, 0xd4, 0x06, 0xe9, 0xa0, 0x24, + 0x1f, 0x02, 0x0e, 0xd9, 0x3a, 0x66, 0xa2, 0xf1, 0xe7, 0x02, 0x54, 0xd3, 0xb8, 0x68, 0x1b, 0x36, + 0x3b, 0x96, 0x73, 0x3d, 0xc4, 0x66, 0x77, 0x74, 0x36, 0xec, 0x7f, 0x65, 0xf6, 0xf4, 0x35, 0xb4, + 0x0e, 0xd5, 0x8e, 0xe5, 0x74, 0xcc, 0xb3, 0xfe, 0x50, 0x2f, 0xa0, 0x0d, 0xa8, 0x75, 0x2c, 0xa7, + 0x3b, 0x1a, 0x0c, 0xfa, 0xb6, 0x5e, 0x44, 0x9b, 0xa0, 0x75, 0x2c, 0x07, 0x8f, 0x2c, 0xab, 0xd3, + 0xee, 0x5e, 0xea, 0x0a, 0xda, 0x85, 0xad, 0x8e, 0xe5, 0xf4, 0x06, 0x96, 0xd3, 0x33, 0xaf, 0xb0, + 0xd9, 0x6d, 0xdb, 0x66, 0x4f, 0x57, 0x11, 0x40, 0x99, 0xa9, 0x7b, 0x96, 0x5e, 0x92, 0xf2, 0xd8, + 0xb4, 0xf5, 0xb2, 0x0c, 0xd7, 0x1f, 0x8e, 0x4d, 0x6c, 0xeb, 0x15, 0x39, 0xbc, 0xbe, 0xea, 0xb5, + 0x6d, 0x53, 0xaf, 0xca, 0x61, 0xcf, 0xb4, 0x4c, 0xdb, 0xd4, 0x6b, 0x17, 0x6a, 0xb5, 0xa8, 0x2b, + 0x17, 0x6a, 0x55, 0xd1, 0x55, 0xe3, 0x8f, 0x05, 0xd8, 0x1d, 0xd3, 0x98, 0xb8, 0xd3, 0x4b, 0xf2, + 0x8c, 0xdd, 0xf0, 0x9e, 0x60, 0xf2, 0x61, 0x4e, 0x12, 0x8a, 0xf6, 0xa1, 0x3a, 0x8b, 0x12, 0x9f, + 0x61, 0xc7, 0x01, 0xae, 0xe1, 0x6c, 0x8c, 0x4e, 0xa0, 0xf6, 0x48, 0x9e, 0x9d, 0x98, 0xd9, 0x4b, + 0xc0, 0x50, 0x33, 0x23, 0x64, 0x16, 0xa9, 0xfa, 0x28, 0xa5, 0x55, 0x7c, 0x95, 0x8f, 0xe3, 0x6b, + 0xdc, 0xc1, 0xde, 0xcb, 0xa4, 0x92, 0x59, 0x14, 0x26, 0x04, 0x59, 0x80, 0x84, 0xa3, 0x43, 0x97, + 0x67, 0xcb, 0xf3, 0xd3, 0x5a, 0x9f, 0x7c, 0x23, 0x01, 0xf0, 0xd6, 0xed, 0x4b, 0x95, 0xf1, 0x3b, + 0xd8, 0x16, 0xeb, 0xd8, 0xee, 0x6d, 0x40, 0x92, 0xb7, 0x6c, 0x7d, 0x0f, 0xca, 0x94, 0x1b, 0x37, + 0x8a, 0x07, 0xca, 0x51, 0x0d, 0xcb, 0xd1, 0xb7, 0xdd, 0xa1, 0x07, 0x3b, 0xf9, 0x95, 0xff, 0x27, + 0xfb, 0xfb, 0x39, 0xa8, 0x78, 0x1e, 0x10, 0xb4, 0x03, 0xa5, 0xa9, 0x4b, 0x27, 0x0f, 0x72, 0x37, + 0x62, 0xc0, 0xb6, 0x72, 0xe7, 0x07, 0x94, 0xc4, 0xfc, 0x08, 0x6b, 0x58, 0x8e, 0x8c, 0xbf, 0x14, + 0xa0, 0x7c, 0xca, 0x45, 0xf4, 0x43, 0x28, 0xc5, 0x73, 0xb6, 0x59, 0x51, 0xeb, 0xfa, 0x6a, 0x06, + 0x2c, 0x32, 0x16, 0xd3, 0xa8, 0x0f, 0xf5, 0x3b, 0x9f, 0x04, 0x1e, 0x2f, 0xdd, 0x41, 0xe4, 0x09, + 0x56, 0xd4, 0x5b, 0x9f, 0xae, 0x3a, 0x88, 0x98, 0xcd, 0xd3, 0x9c, 0x21, 0x7e, 0xe1, 0x68, 0xbc, + 0x83, 0x7a, 0xde, 0x82, 0x95, 0x93, 0x89, 0xb1, 0x33, 0x1a, 0x3a, 0x83, 0xfe, 0x78, 0xd0, 0xb6, + 0xbb, 0xe7, 0xfa, 0x1a, 0xaf, 0x18, 0x73, 0x6c, 0x3b, 0xe6, 0xe9, 0xe9, 0x08, 0xdb, 0x7a, 0xc1, + 0xf8, 0x53, 0x11, 0xd6, 0x05, 0x28, 0xe3, 0x68, 0x1e, 0x4f, 0x08, 0x3b, 0xc5, 0x47, 0xf2, 0x9c, + 0xcc, 0xdc, 0x09, 0x49, 0x4f, 0x31, 0x1d, 0x33, 0x40, 0x92, 0x07, 0x37, 0xf6, 0xe4, 0xce, 0xc5, + 0x00, 0xfd, 0x02, 0x34, 0x7e, 0x9a, 0xd4, 0xa1, 0xcf, 0x33, 0xc2, 0xcf, 0xb1, 0xde, 0xda, 0x59, + 0x12, 0x9b, 0x9f, 0x15, 0xb5, 0x9f, 0x67, 0x04, 0x03, 0xcd, 0xe4, 0x7c, 0x35, 0xa8, 0x6f, 0xa8, + 0x86, 0x25, 0x87, 0x4a, 0x39, 0x0e, 0x1d, 0x67, 0x07, 0x52, 0x96, 0x51, 0x5e, 0xa1, 0x97, 0x1e, + 0x12, 0x6a, 0x42, 0x39, 0x0a, 0x1d, 0xcf, 0x0b, 0x1a, 0x15, 0x9e, 0xe6, 0x77, 0x56, 0x6d, 0x47, + 0x61, 0xaf, 0x67, 0xb5, 0x05, 0x2d, 0x4a, 0x51, 0xd8, 0xf3, 0x02, 0xe3, 0x3d, 0xd4, 0x70, 0xf4, + 0xd4, 0x7d, 0xe0, 0x09, 0x18, 0x50, 0xbe, 0x25, 0x77, 0x51, 0x4c, 0x24, 0xb3, 0x40, 0x76, 0x5e, + 0x1c, 0x3d, 0x61, 0x39, 0x83, 0x0e, 0xa0, 0xe4, 0xde, 0xa5, 0xe4, 0xc8, 0x9b, 0x88, 0x09, 0xc3, + 0x85, 0x2a, 0x8e, 0x9e, 0xf8, 0x39, 0xa1, 0x4f, 0x40, 0x20, 0xe2, 0x84, 0xee, 0x34, 0x85, 0xbb, + 0xc6, 0x35, 0x43, 0x77, 0x4a, 0xd0, 0x3b, 0xd0, 0xe2, 0xe8, 0xc9, 0x99, 0xf0, 0xe5, 0x45, 0xe9, + 0x68, 0xad, 0xdd, 0x1c, 0x9b, 0xd2, 0xe4, 0x30, 0xc4, 0xa9, 0x98, 0x18, 0xef, 0x01, 0x96, 0x64, + 0xf8, 0xd8, 0x22, 0x3f, 0x60, 0xf0, 0x91, 0xc0, 0x4b, 0xe3, 0xaf, 0xcb, 0x94, 0x79, 0x04, 0x2c, + 0xe7, 0x18, 0x10, 0x63, 0x76, 0xda, 0x67, 0xd4, 0xf7, 0xfe, 0x0b, 0x8e, 0x20, 0x50, 0xef, 0xa9, + 0xef, 0x71, 0x72, 0xd4, 0x30, 0x97, 0x8d, 0x2f, 0xa0, 0x74, 0xc3, 0xc3, 0xbd, 0x03, 0x8d, 0x5b, + 0x39, 0x4c, 0x9d, 0x16, 0x4d, 0x6e, 0x9b, 0xd9, 0xd2, 0x18, 0x92, 0x54, 0x4c, 0x8c, 0x36, 0x6c, + 0x5c, 0xca, 0x65, 0xb9, 0xc1, 0xb7, 0xcf, 0xcb, 0xf8, 0x6b, 0x11, 0x2a, 0x17, 0xd1, 0x3c, 0x0e, + 0xdd, 0x00, 0xd5, 0xa1, 0xe8, 0x7b, 0xdc, 0x4f, 0xc1, 0x45, 0xdf, 0x43, 0xbf, 0x86, 0xfa, 0xd4, + 0xbf, 0x8f, 0x5d, 0xc6, 0x07, 0x41, 0x6d, 0x51, 0x9d, 0xdf, 0x5d, 0xcd, 0x6c, 0x90, 0x5a, 0x70, + 0x7e, 0x6f, 0x4c, 0x57, 0x87, 0x2b, 0x8c, 0x55, 0x72, 0x8c, 0xfd, 0x0c, 0xea, 0x41, 0x34, 0x71, + 0x03, 0x27, 0xeb, 0x97, 0x2a, 0x4f, 0x6a, 0x83, 0x6b, 0xaf, 0xd2, 0xa6, 0xf9, 0x02, 0x97, 0xd2, + 0x1b, 0x71, 0x41, 0x9f, 0xc3, 0xfa, 0xcc, 0x8d, 0xa9, 0x3f, 0xf1, 0x67, 0x2e, 0xfb, 0xe3, 0x28, + 0x73, 0xc7, 0x5c, 0xda, 0x39, 0xdc, 0x70, 0xce, 0x1c, 0x7d, 0x0a, 0xeb, 0x31, 0x59, 0x90, 0x38, + 0x21, 0x9e, 0xc3, 0xd6, 0xad, 0x1c, 0x28, 0x47, 0x0a, 0xd6, 0x52, 0x5d, 0xdf, 0x4b, 0x8c, 0x7f, + 0x16, 0xa1, 0x7c, 0x23, 0xd8, 0x75, 0x0c, 0x2a, 0xc7, 0x46, 0xfc, 0x4d, 0xec, 0xad, 0x2e, 0x22, + 0x2c, 0x38, 0x30, 0xdc, 0x06, 0x7d, 0x0f, 0x6a, 0xd4, 0x9f, 0x92, 0x84, 0xba, 0xd3, 0x19, 0x07, + 0x53, 0xc1, 0x4b, 0xc5, 0xd7, 0x71, 0x84, 0xfd, 0x32, 0xb0, 0x62, 0x15, 0xf0, 0x30, 0x11, 0xfd, + 0x14, 0x6a, 0xac, 0x26, 0xf8, 0x1f, 0x4e, 0xa3, 0xc4, 0x8b, 0x6c, 0xe7, 0x45, 0x45, 0xf0, 0x65, + 0x71, 0x35, 0x4e, 0xab, 0xec, 0x97, 0xa0, 0x71, 0x16, 0x4b, 0x27, 0xd1, 0x25, 0xf6, 0xf2, 0x5d, + 0x22, 0xad, 0x16, 0x0c, 0xcb, 0xc6, 0x8a, 0x0e, 0xa1, 0xb4, 0xe0, 0x29, 0x55, 0xe4, 0x9f, 0xd6, + 0xea, 0xe6, 0x38, 0xec, 0x62, 0x9e, 0x5d, 0x63, 0xbf, 0x15, 0x2c, 0x6a, 0x54, 0x5f, 0x5f, 0x63, + 0x92, 0x60, 0x38, 0xb5, 0x61, 0x08, 0x4f, 0xe6, 0x71, 0xcc, 0xff, 0xe4, 0xfc, 0x29, 0x69, 0xec, + 0x70, 0x28, 0x34, 0xa9, 0xb3, 0xfd, 0x29, 0x31, 0xfe, 0x50, 0x84, 0xfa, 0x8d, 0xb8, 0xeb, 0xd2, + 0xfb, 0xf5, 0x0b, 0xd8, 0x26, 0x77, 0x77, 0x64, 0x42, 0xfd, 0x05, 0x71, 0x26, 0x6e, 0x10, 0x90, + 0xd8, 0x91, 0x84, 0xd5, 0x5a, 0x9b, 0x4d, 0xf1, 0xcf, 0xdb, 0xe5, 0xfa, 0x7e, 0x0f, 0x6f, 0x65, + 0xb6, 0x52, 0xe5, 0x21, 0x13, 0xb6, 0xfd, 0xe9, 0x94, 0x78, 0xbe, 0x4b, 0x57, 0x03, 0x88, 0x4e, + 0xb5, 0x2b, 0xcb, 0xfe, 0xc6, 0x3e, 0x73, 0x29, 0x59, 0x86, 0xc9, 0x3c, 0xb2, 0x30, 0x9f, 0x31, + 0x56, 0xc7, 0xf7, 0xd9, 0x95, 0xbd, 0x21, 0x3d, 0x6d, 0xae, 0xc4, 0x72, 0x32, 0xf7, 0x3b, 0xa0, + 0xbe, 0xf8, 0x1d, 0x58, 0xb6, 0xec, 0xd2, 0xc7, 0x5a, 0xb6, 0xf1, 0x39, 0x6c, 0x66, 0x40, 0xc8, + 0xeb, 0xfe, 0x18, 0xca, 0xfc, 0x28, 0xd3, 0x5e, 0x81, 0x5e, 0xb3, 0x0e, 0x4b, 0x0b, 0xe3, 0xf7, + 0x45, 0x40, 0xa9, 0x7f, 0xf4, 0x94, 0xfc, 0x9f, 0x82, 0xb9, 0x03, 0x25, 0xae, 0x97, 0x48, 0x8a, + 0x01, 0xc3, 0x21, 0x70, 0x13, 0x3a, 0x7b, 0xcc, 0x60, 0x14, 0xce, 0xef, 0xd9, 0x17, 0x93, 0x64, + 0x1e, 0x50, 0x2c, 0x2d, 0x8c, 0xbf, 0x15, 0x60, 0x3b, 0x87, 0x83, 0xc4, 0x72, 0xd9, 0xfe, 0x0b, + 0xff, 0xb9, 0xfd, 0xa3, 0x23, 0xa8, 0xce, 0x1e, 0xbf, 0xe1, 0x9a, 0xc8, 0x66, 0xbf, 0xb6, 0x8a, + 0xbf, 0x0f, 0x6a, 0x1c, 0x3d, 0x25, 0x0d, 0x95, 0x7b, 0xae, 0xde, 0x89, 0x5c, 0xcf, 0x2e, 0xd6, + 0xdc, 0x3e, 0x72, 0x17, 0xab, 0x98, 0x39, 0xfe, 0x15, 0x68, 0x2b, 0xf7, 0x33, 0xfb, 0x8d, 0xef, + 0x9f, 0x0d, 0x47, 0xd8, 0xd4, 0xd7, 0x50, 0x15, 0xd4, 0xb1, 0x3d, 0xba, 0xd2, 0x0b, 0x4c, 0x32, + 0x7f, 0x63, 0x76, 0xc5, 0xd3, 0x80, 0x49, 0x8e, 0x34, 0x52, 0x8e, 0xff, 0x51, 0x00, 0x58, 0x36, + 0x24, 0xa4, 0x41, 0xe5, 0x7a, 0x78, 0x39, 0x1c, 0x7d, 0x39, 0x14, 0x01, 0xce, 0xec, 0x7e, 0x4f, + 0x2f, 0xa0, 0x1a, 0x94, 0xc4, 0x5b, 0xa3, 0xc8, 0x56, 0x90, 0x0f, 0x0d, 0x85, 0xbd, 0x42, 0xb2, + 0x57, 0x86, 0x8a, 0x2a, 0xa0, 0x64, 0x6f, 0x09, 0xf9, 0x78, 0x28, 0xb3, 0x80, 0xd8, 0xbc, 0xb2, + 0xda, 0x5d, 0x53, 0xaf, 0xb0, 0x89, 0xec, 0x19, 0x01, 0x50, 0x4e, 0xdf, 0x10, 0xcc, 0x93, 0xbd, + 0x3c, 0x80, 0xad, 0x33, 0xb2, 0xcf, 0x4d, 0xac, 0x6b, 0x4c, 0x87, 0x47, 0x5f, 0xea, 0xeb, 0x4c, + 0x77, 0xda, 0x37, 0xad, 0x9e, 0xbe, 0xc1, 0x9e, 0x1e, 0xe7, 0x66, 0x1b, 0xdb, 0x1d, 0xb3, 0x6d, + 0xeb, 0x75, 0x36, 0x73, 0xc3, 0x13, 0xdc, 0x64, 0xcb, 0x5c, 0x8c, 0xae, 0xf1, 0xb0, 0x6d, 0xe9, + 0xfa, 0xf1, 0x21, 0x6c, 0xe4, 0xee, 0x1f, 0xb6, 0x96, 0xdd, 0xee, 0x58, 0xe6, 0x58, 0x5f, 0x63, + 0xf2, 0xf8, 0xbc, 0x8d, 0x7b, 0x63, 0xbd, 0xd0, 0xf9, 0xd1, 0x57, 0x87, 0x0b, 0x9f, 0x92, 0x24, + 0x69, 0xfa, 0xd1, 0x89, 0x90, 0x4e, 0xee, 0xa3, 0x93, 0x05, 0x3d, 0xe1, 0xcf, 0xe0, 0x93, 0x65, + 0xf9, 0xdc, 0x96, 0xb9, 0xe6, 0x67, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x13, 0xef, 0x5d, 0xd6, + 0x62, 0x0f, 0x00, 0x00, } diff --git a/go/vt/proto/binlogservice/binlogservice.pb.go b/go/vt/proto/binlogservice/binlogservice.pb.go index 77312b9123..f10fe87e8b 100644 --- a/go/vt/proto/binlogservice/binlogservice.pb.go +++ b/go/vt/proto/binlogservice/binlogservice.pb.go @@ -6,12 +6,11 @@ package binlogservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" ) diff --git a/go/vt/proto/logutil/logutil.pb.go b/go/vt/proto/logutil/logutil.pb.go index 76d10f5ec8..5806897eb9 100644 --- a/go/vt/proto/logutil/logutil.pb.go +++ b/go/vt/proto/logutil/logutil.pb.go @@ -5,9 +5,8 @@ package logutil import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/mysqlctl/mysqlctl.pb.go b/go/vt/proto/mysqlctl/mysqlctl.pb.go index 2b80a9971d..f5c5fb76da 100644 --- a/go/vt/proto/mysqlctl/mysqlctl.pb.go +++ b/go/vt/proto/mysqlctl/mysqlctl.pb.go @@ -6,12 +6,11 @@ package mysqlctl import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/query/query.pb.go b/go/vt/proto/query/query.pb.go index d536cc1c24..fe91f5a052 100644 --- a/go/vt/proto/query/query.pb.go +++ b/go/vt/proto/query/query.pb.go @@ -5,9 +5,8 @@ package query import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" topodata "vitess.io/vitess/go/vt/proto/topodata" vtrpc "vitess.io/vitess/go/vt/proto/vtrpc" ) diff --git a/go/vt/proto/queryservice/queryservice.pb.go b/go/vt/proto/queryservice/queryservice.pb.go index 4291acefe3..1447b4458e 100644 --- a/go/vt/proto/queryservice/queryservice.pb.go +++ b/go/vt/proto/queryservice/queryservice.pb.go @@ -6,12 +6,11 @@ package queryservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" query "vitess.io/vitess/go/vt/proto/query" ) diff --git a/go/vt/proto/replicationdata/replicationdata.pb.go b/go/vt/proto/replicationdata/replicationdata.pb.go index 3924d47bb4..3fd65b925c 100644 --- a/go/vt/proto/replicationdata/replicationdata.pb.go +++ b/go/vt/proto/replicationdata/replicationdata.pb.go @@ -5,9 +5,8 @@ package replicationdata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/tableacl/tableacl.pb.go b/go/vt/proto/tableacl/tableacl.pb.go index 5fbfc778ba..bce52b0d6d 100644 --- a/go/vt/proto/tableacl/tableacl.pb.go +++ b/go/vt/proto/tableacl/tableacl.pb.go @@ -5,9 +5,8 @@ package tableacl import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go index ef33cf97c7..79887e76f6 100644 --- a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go +++ b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go @@ -5,9 +5,8 @@ package tabletmanagerdata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" logutil "vitess.io/vitess/go/vt/proto/logutil" query "vitess.io/vitess/go/vt/proto/query" replicationdata "vitess.io/vitess/go/vt/proto/replicationdata" diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go index 11699a3fbf..6be24ad1f7 100644 --- a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go +++ b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go @@ -6,12 +6,11 @@ package tabletmanagerservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" tabletmanagerdata "vitess.io/vitess/go/vt/proto/tabletmanagerdata" ) diff --git a/go/vt/proto/throttlerdata/throttlerdata.pb.go b/go/vt/proto/throttlerdata/throttlerdata.pb.go index fad03c327e..e80dc8c554 100644 --- a/go/vt/proto/throttlerdata/throttlerdata.pb.go +++ b/go/vt/proto/throttlerdata/throttlerdata.pb.go @@ -5,9 +5,8 @@ package throttlerdata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/throttlerservice/throttlerservice.pb.go b/go/vt/proto/throttlerservice/throttlerservice.pb.go index a9270a8df5..a1fad7d258 100644 --- a/go/vt/proto/throttlerservice/throttlerservice.pb.go +++ b/go/vt/proto/throttlerservice/throttlerservice.pb.go @@ -6,12 +6,11 @@ package throttlerservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" throttlerdata "vitess.io/vitess/go/vt/proto/throttlerdata" ) diff --git a/go/vt/proto/topodata/topodata.pb.go b/go/vt/proto/topodata/topodata.pb.go index 2132bd1faf..e3f8c175d0 100644 --- a/go/vt/proto/topodata/topodata.pb.go +++ b/go/vt/proto/topodata/topodata.pb.go @@ -5,9 +5,8 @@ package topodata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/vschema/vschema.pb.go b/go/vt/proto/vschema/vschema.pb.go index 097906df39..3f403b8b45 100644 --- a/go/vt/proto/vschema/vschema.pb.go +++ b/go/vt/proto/vschema/vschema.pb.go @@ -5,9 +5,8 @@ package vschema import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" query "vitess.io/vitess/go/vt/proto/query" ) diff --git a/go/vt/proto/vtctldata/vtctldata.pb.go b/go/vt/proto/vtctldata/vtctldata.pb.go index 0b7171a412..641589e481 100644 --- a/go/vt/proto/vtctldata/vtctldata.pb.go +++ b/go/vt/proto/vtctldata/vtctldata.pb.go @@ -5,9 +5,8 @@ package vtctldata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" logutil "vitess.io/vitess/go/vt/proto/logutil" ) diff --git a/go/vt/proto/vtctlservice/vtctlservice.pb.go b/go/vt/proto/vtctlservice/vtctlservice.pb.go index d661e47692..22e8102d6f 100644 --- a/go/vt/proto/vtctlservice/vtctlservice.pb.go +++ b/go/vt/proto/vtctlservice/vtctlservice.pb.go @@ -6,12 +6,11 @@ package vtctlservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" vtctldata "vitess.io/vitess/go/vt/proto/vtctldata" ) diff --git a/go/vt/proto/vtgate/vtgate.pb.go b/go/vt/proto/vtgate/vtgate.pb.go index 48186096d6..816d676f73 100644 --- a/go/vt/proto/vtgate/vtgate.pb.go +++ b/go/vt/proto/vtgate/vtgate.pb.go @@ -5,9 +5,8 @@ package vtgate import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" binlogdata "vitess.io/vitess/go/vt/proto/binlogdata" query "vitess.io/vitess/go/vt/proto/query" topodata "vitess.io/vitess/go/vt/proto/topodata" diff --git a/go/vt/proto/vtgateservice/vtgateservice.pb.go b/go/vt/proto/vtgateservice/vtgateservice.pb.go index 2f82480284..c020e282f5 100644 --- a/go/vt/proto/vtgateservice/vtgateservice.pb.go +++ b/go/vt/proto/vtgateservice/vtgateservice.pb.go @@ -6,12 +6,11 @@ package vtgateservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" query "vitess.io/vitess/go/vt/proto/query" vtgate "vitess.io/vitess/go/vt/proto/vtgate" ) diff --git a/go/vt/proto/vtrpc/vtrpc.pb.go b/go/vt/proto/vtrpc/vtrpc.pb.go index 8a673537d9..560e65230d 100644 --- a/go/vt/proto/vtrpc/vtrpc.pb.go +++ b/go/vt/proto/vtrpc/vtrpc.pb.go @@ -5,9 +5,8 @@ package vtrpc import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/vttest/vttest.pb.go b/go/vt/proto/vttest/vttest.pb.go index 7dad543bdf..9d72df30f4 100644 --- a/go/vt/proto/vttest/vttest.pb.go +++ b/go/vt/proto/vttest/vttest.pb.go @@ -5,9 +5,8 @@ package vttest import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go index 986447754b..799436b8e1 100644 --- a/go/vt/proto/vtworkerdata/vtworkerdata.pb.go +++ b/go/vt/proto/vtworkerdata/vtworkerdata.pb.go @@ -5,9 +5,8 @@ package vtworkerdata import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" logutil "vitess.io/vitess/go/vt/proto/logutil" ) diff --git a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go index 22a1a03e8a..70e54ab317 100644 --- a/go/vt/proto/vtworkerservice/vtworkerservice.pb.go +++ b/go/vt/proto/vtworkerservice/vtworkerservice.pb.go @@ -6,12 +6,11 @@ package vtworkerservice import ( context "context" fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + math "math" vtworkerdata "vitess.io/vitess/go/vt/proto/vtworkerdata" ) diff --git a/go/vt/proto/workflow/workflow.pb.go b/go/vt/proto/workflow/workflow.pb.go index 44e4c45178..ffd9d3b695 100644 --- a/go/vt/proto/workflow/workflow.pb.go +++ b/go/vt/proto/workflow/workflow.pb.go @@ -5,9 +5,8 @@ package workflow import ( fmt "fmt" - math "math" - proto "github.com/golang/protobuf/proto" + math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/proto/binlogdata.proto b/proto/binlogdata.proto index 5bf2ef7f7d..c1be45c5c1 100644 --- a/proto/binlogdata.proto +++ b/proto/binlogdata.proto @@ -130,7 +130,11 @@ message Rule { // wins. message Filter { repeated Rule rules = 1; - bool bestEffortNameInFieldEvent = 2; + enum FieldEventMode { + ERR_ON_MISMATCH = 0; + BEST_EFFORT = 1; + } + FieldEventMode fieldEventMode = 2; } // OnDDLAction lists the possible actions for DDLs. diff --git a/py/vtproto/binlogdata_pb2.py b/py/vtproto/binlogdata_pb2.py index 0a066c13a7..62da1fe51c 100644 --- a/py/vtproto/binlogdata_pb2.py +++ b/py/vtproto/binlogdata_pb2.py @@ -23,7 +23,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( package='binlogdata', syntax='proto3', serialized_options=_b('Z\'vitess.io/vitess/go/vt/proto/binlogdata'), - serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\"M\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\x12\"\n\x1a\x62\x65stEffortNameInFieldEvent\x18\x02 \x01(\x08\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x90\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') + serialized_pb=_b('\n\x10\x62inlogdata.proto\x12\nbinlogdata\x1a\x0bvtrpc.proto\x1a\x0bquery.proto\x1a\x0etopodata.proto\"7\n\x07\x43harset\x12\x0e\n\x06\x63lient\x18\x01 \x01(\x05\x12\x0c\n\x04\x63onn\x18\x02 \x01(\x05\x12\x0e\n\x06server\x18\x03 \x01(\x05\"\xb5\x03\n\x11\x42inlogTransaction\x12;\n\nstatements\x18\x01 \x03(\x0b\x32\'.binlogdata.BinlogTransaction.Statement\x12&\n\x0b\x65vent_token\x18\x04 \x01(\x0b\x32\x11.query.EventToken\x1a\xae\x02\n\tStatement\x12\x42\n\x08\x63\x61tegory\x18\x01 \x01(\x0e\x32\x30.binlogdata.BinlogTransaction.Statement.Category\x12$\n\x07\x63harset\x18\x02 \x01(\x0b\x32\x13.binlogdata.Charset\x12\x0b\n\x03sql\x18\x03 \x01(\x0c\"\xa9\x01\n\x08\x43\x61tegory\x12\x13\n\x0f\x42L_UNRECOGNIZED\x10\x00\x12\x0c\n\x08\x42L_BEGIN\x10\x01\x12\r\n\tBL_COMMIT\x10\x02\x12\x0f\n\x0b\x42L_ROLLBACK\x10\x03\x12\x15\n\x11\x42L_DML_DEPRECATED\x10\x04\x12\n\n\x06\x42L_DDL\x10\x05\x12\n\n\x06\x42L_SET\x10\x06\x12\r\n\tBL_INSERT\x10\x07\x12\r\n\tBL_UPDATE\x10\x08\x12\r\n\tBL_DELETE\x10\tJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"v\n\x15StreamKeyRangeRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12%\n\tkey_range\x18\x02 \x01(\x0b\x32\x12.topodata.KeyRange\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"S\n\x16StreamKeyRangeResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"]\n\x13StreamTablesRequest\x12\x10\n\x08position\x18\x01 \x01(\t\x12\x0e\n\x06tables\x18\x02 \x03(\t\x12$\n\x07\x63harset\x18\x03 \x01(\x0b\x32\x13.binlogdata.Charset\"Q\n\x14StreamTablesResponse\x12\x39\n\x12\x62inlog_transaction\x18\x01 \x01(\x0b\x32\x1d.binlogdata.BinlogTransaction\"%\n\x04Rule\x12\r\n\x05match\x18\x01 \x01(\t\x12\x0e\n\x06\x66ilter\x18\x02 \x01(\t\"\x9c\x01\n\x06\x46ilter\x12\x1f\n\x05rules\x18\x01 \x03(\x0b\x32\x10.binlogdata.Rule\x12\x39\n\x0e\x66ieldEventMode\x18\x02 \x01(\x0e\x32!.binlogdata.Filter.FieldEventMode\"6\n\x0e\x46ieldEventMode\x12\x13\n\x0f\x45RR_ON_MISMATCH\x10\x00\x12\x0f\n\x0b\x42\x45ST_EFFORT\x10\x01\"\xde\x01\n\x0c\x42inlogSource\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12)\n\x0btablet_type\x18\x03 \x01(\x0e\x32\x14.topodata.TabletType\x12%\n\tkey_range\x18\x04 \x01(\x0b\x32\x12.topodata.KeyRange\x12\x0e\n\x06tables\x18\x05 \x03(\t\x12\"\n\x06\x66ilter\x18\x06 \x01(\x0b\x32\x12.binlogdata.Filter\x12\'\n\x06on_ddl\x18\x07 \x01(\x0e\x32\x17.binlogdata.OnDDLAction\"B\n\tRowChange\x12\x1a\n\x06\x62\x65\x66ore\x18\x01 \x01(\x0b\x32\n.query.Row\x12\x19\n\x05\x61\x66ter\x18\x02 \x01(\x0b\x32\n.query.Row\"J\n\x08RowEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12*\n\x0brow_changes\x18\x02 \x03(\x0b\x32\x15.binlogdata.RowChange\">\n\nFieldEvent\x12\x12\n\ntable_name\x18\x01 \x01(\t\x12\x1c\n\x06\x66ields\x18\x02 \x03(\x0b\x32\x0c.query.Field\":\n\tShardGtid\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\x12\x0c\n\x04gtid\x18\x03 \x01(\t\"3\n\x05VGtid\x12*\n\x0bshard_gtids\x18\x01 \x03(\x0b\x32\x15.binlogdata.ShardGtid\"0\n\rKeyspaceShard\x12\x10\n\x08keyspace\x18\x01 \x01(\t\x12\r\n\x05shard\x18\x02 \x01(\t\"\xe3\x01\n\x07Journal\x12\n\n\x02id\x18\x01 \x01(\x03\x12\x31\n\x0emigration_type\x18\x02 \x01(\x0e\x32\x19.binlogdata.MigrationType\x12\x0e\n\x06tables\x18\x03 \x03(\t\x12\x16\n\x0elocal_position\x18\x04 \x01(\t\x12*\n\x0bshard_gtids\x18\x05 \x03(\x0b\x32\x15.binlogdata.ShardGtid\x12/\n\x0cparticipants\x18\x06 \x03(\x0b\x32\x19.binlogdata.KeyspaceShard\x12\x14\n\x0creversed_ids\x18\x07 \x03(\x03\"\x90\x02\n\x06VEvent\x12$\n\x04type\x18\x01 \x01(\x0e\x32\x16.binlogdata.VEventType\x12\x11\n\ttimestamp\x18\x02 \x01(\x03\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x0b\n\x03\x64\x64l\x18\x04 \x01(\t\x12\'\n\trow_event\x18\x05 \x01(\x0b\x32\x14.binlogdata.RowEvent\x12+\n\x0b\x66ield_event\x18\x06 \x01(\x0b\x32\x16.binlogdata.FieldEvent\x12 \n\x05vgtid\x18\x07 \x01(\x0b\x32\x11.binlogdata.VGtid\x12$\n\x07journal\x18\x08 \x01(\x0b\x32\x13.binlogdata.Journal\x12\x14\n\x0c\x63urrent_time\x18\x14 \x01(\x03\"\xc7\x01\n\x0eVStreamRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\x10\n\x08position\x18\x04 \x01(\t\x12\"\n\x06\x66ilter\x18\x05 \x01(\x0b\x32\x12.binlogdata.Filter\"5\n\x0fVStreamResponse\x12\"\n\x06\x65vents\x18\x01 \x03(\x0b\x32\x12.binlogdata.VEvent\"\xc8\x01\n\x12VStreamRowsRequest\x12,\n\x13\x65\x66\x66\x65\x63tive_caller_id\x18\x01 \x01(\x0b\x32\x0f.vtrpc.CallerID\x12\x32\n\x13immediate_caller_id\x18\x02 \x01(\x0b\x32\x15.query.VTGateCallerID\x12\x1d\n\x06target\x18\x03 \x01(\x0b\x32\r.query.Target\x12\r\n\x05query\x18\x04 \x01(\t\x12\"\n\x06lastpk\x18\x05 \x01(\x0b\x32\x12.query.QueryResult\"\x97\x01\n\x13VStreamRowsResponse\x12\x1c\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x0c.query.Field\x12\x1e\n\x08pkfields\x18\x02 \x03(\x0b\x32\x0c.query.Field\x12\x0c\n\x04gtid\x18\x03 \x01(\t\x12\x18\n\x04rows\x18\x04 \x03(\x0b\x32\n.query.Row\x12\x1a\n\x06lastpk\x18\x05 \x01(\x0b\x32\n.query.Row*>\n\x0bOnDDLAction\x12\n\n\x06IGNORE\x10\x00\x12\x08\n\x04STOP\x10\x01\x12\x08\n\x04\x45XEC\x10\x02\x12\x0f\n\x0b\x45XEC_IGNORE\x10\x03*\xd1\x01\n\nVEventType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x08\n\x04GTID\x10\x01\x12\t\n\x05\x42\x45GIN\x10\x02\x12\n\n\x06\x43OMMIT\x10\x03\x12\x0c\n\x08ROLLBACK\x10\x04\x12\x07\n\x03\x44\x44L\x10\x05\x12\n\n\x06INSERT\x10\x06\x12\x0b\n\x07REPLACE\x10\x07\x12\n\n\x06UPDATE\x10\x08\x12\n\n\x06\x44\x45LETE\x10\t\x12\x07\n\x03SET\x10\n\x12\t\n\x05OTHER\x10\x0b\x12\x07\n\x03ROW\x10\x0c\x12\t\n\x05\x46IELD\x10\r\x12\r\n\tHEARTBEAT\x10\x0e\x12\t\n\x05VGTID\x10\x0f\x12\x0b\n\x07JOURNAL\x10\x10*\'\n\rMigrationType\x12\n\n\x06TABLES\x10\x00\x12\n\n\x06SHARDS\x10\x01\x42)Z\'vitess.io/vitess/go/vt/proto/binlogdatab\x06proto3') , dependencies=[vtrpc__pb2.DESCRIPTOR,query__pb2.DESCRIPTOR,topodata__pb2.DESCRIPTOR,]) @@ -52,8 +52,8 @@ _ONDDLACTION = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2787, - serialized_end=2849, + serialized_start=2867, + serialized_end=2929, ) _sym_db.RegisterEnumDescriptor(_ONDDLACTION) @@ -135,8 +135,8 @@ _VEVENTTYPE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=2852, - serialized_end=3061, + serialized_start=2932, + serialized_end=3141, ) _sym_db.RegisterEnumDescriptor(_VEVENTTYPE) @@ -158,8 +158,8 @@ _MIGRATIONTYPE = _descriptor.EnumDescriptor( ], containing_type=None, serialized_options=None, - serialized_start=3063, - serialized_end=3102, + serialized_start=3143, + serialized_end=3182, ) _sym_db.RegisterEnumDescriptor(_MIGRATIONTYPE) @@ -243,6 +243,28 @@ _BINLOGTRANSACTION_STATEMENT_CATEGORY = _descriptor.EnumDescriptor( ) _sym_db.RegisterEnumDescriptor(_BINLOGTRANSACTION_STATEMENT_CATEGORY) +_FILTER_FIELDEVENTMODE = _descriptor.EnumDescriptor( + name='FieldEventMode', + full_name='binlogdata.Filter.FieldEventMode', + filename=None, + file=DESCRIPTOR, + values=[ + _descriptor.EnumValueDescriptor( + name='ERR_ON_MISMATCH', index=0, number=0, + serialized_options=None, + type=None), + _descriptor.EnumValueDescriptor( + name='BEST_EFFORT', index=1, number=1, + serialized_options=None, + type=None), + ], + containing_type=None, + serialized_options=None, + serialized_start=1096, + serialized_end=1150, +) +_sym_db.RegisterEnumDescriptor(_FILTER_FIELDEVENTMODE) + _CHARSET = _descriptor.Descriptor( name='Charset', @@ -577,9 +599,9 @@ _FILTER = _descriptor.Descriptor( is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( - name='bestEffortNameInFieldEvent', full_name='binlogdata.Filter.bestEffortNameInFieldEvent', index=1, - number=2, type=8, cpp_type=7, label=1, - has_default_value=False, default_value=False, + name='fieldEventMode', full_name='binlogdata.Filter.fieldEventMode', index=1, + number=2, type=14, cpp_type=8, label=1, + has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, serialized_options=None, file=DESCRIPTOR), @@ -588,6 +610,7 @@ _FILTER = _descriptor.Descriptor( ], nested_types=[], enum_types=[ + _FILTER_FIELDEVENTMODE, ], serialized_options=None, is_extendable=False, @@ -595,8 +618,8 @@ _FILTER = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=993, - serialized_end=1070, + serialized_start=994, + serialized_end=1150, ) @@ -668,8 +691,8 @@ _BINLOGSOURCE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1073, - serialized_end=1295, + serialized_start=1153, + serialized_end=1375, ) @@ -706,8 +729,8 @@ _ROWCHANGE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1297, - serialized_end=1363, + serialized_start=1377, + serialized_end=1443, ) @@ -744,8 +767,8 @@ _ROWEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1365, - serialized_end=1439, + serialized_start=1445, + serialized_end=1519, ) @@ -782,8 +805,8 @@ _FIELDEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1441, - serialized_end=1503, + serialized_start=1521, + serialized_end=1583, ) @@ -827,8 +850,8 @@ _SHARDGTID = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1505, - serialized_end=1563, + serialized_start=1585, + serialized_end=1643, ) @@ -858,8 +881,8 @@ _VGTID = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1565, - serialized_end=1616, + serialized_start=1645, + serialized_end=1696, ) @@ -896,8 +919,8 @@ _KEYSPACESHARD = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1618, - serialized_end=1666, + serialized_start=1698, + serialized_end=1746, ) @@ -969,8 +992,8 @@ _JOURNAL = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1669, - serialized_end=1896, + serialized_start=1749, + serialized_end=1976, ) @@ -1056,8 +1079,8 @@ _VEVENT = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=1899, - serialized_end=2171, + serialized_start=1979, + serialized_end=2251, ) @@ -1115,8 +1138,8 @@ _VSTREAMREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2174, - serialized_end=2373, + serialized_start=2254, + serialized_end=2453, ) @@ -1146,8 +1169,8 @@ _VSTREAMRESPONSE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2375, - serialized_end=2428, + serialized_start=2455, + serialized_end=2508, ) @@ -1205,8 +1228,8 @@ _VSTREAMROWSREQUEST = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2431, - serialized_end=2631, + serialized_start=2511, + serialized_end=2711, ) @@ -1264,8 +1287,8 @@ _VSTREAMROWSRESPONSE = _descriptor.Descriptor( extension_ranges=[], oneofs=[ ], - serialized_start=2634, - serialized_end=2785, + serialized_start=2714, + serialized_end=2865, ) _BINLOGTRANSACTION_STATEMENT.fields_by_name['category'].enum_type = _BINLOGTRANSACTION_STATEMENT_CATEGORY @@ -1280,6 +1303,8 @@ _STREAMKEYRANGERESPONSE.fields_by_name['binlog_transaction'].message_type = _BIN _STREAMTABLESREQUEST.fields_by_name['charset'].message_type = _CHARSET _STREAMTABLESRESPONSE.fields_by_name['binlog_transaction'].message_type = _BINLOGTRANSACTION _FILTER.fields_by_name['rules'].message_type = _RULE +_FILTER.fields_by_name['fieldEventMode'].enum_type = _FILTER_FIELDEVENTMODE +_FILTER_FIELDEVENTMODE.containing_type = _FILTER _BINLOGSOURCE.fields_by_name['tablet_type'].enum_type = topodata__pb2._TABLETTYPE _BINLOGSOURCE.fields_by_name['key_range'].message_type = topodata__pb2._KEYRANGE _BINLOGSOURCE.fields_by_name['filter'].message_type = _FILTER From a6c53fd030e7c5aa1612842b568a7414d9e64e1d Mon Sep 17 00:00:00 2001 From: Nitin Shatma Date: Wed, 2 Oct 2019 21:28:01 -0700 Subject: [PATCH 25/25] minor-changes Signed-off-by: Nitin Shatma --- .../tabletserver/vstreamer/vstreamer_test.go | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go index 02fe3b70c6..b98137d7b0 100644 --- a/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go +++ b/go/vt/vttablet/tabletserver/vstreamer/vstreamer_test.go @@ -561,38 +561,38 @@ func TestBestEffortNameInFieldEvent(t *testing.T) { } // Modeled after vttablet endtoend compatibility tests. execStatements(t, []string{ - "create table vitess_null(id int, val varbinary(128), primary key(id))", + "create table vitess_test(id int, val varbinary(128), primary key(id))", }) position := masterPosition(t) execStatements(t, []string{ - "insert into vitess_null values(1, 'abc')", - "rename table vitess_null to vitess_null_new", + "insert into vitess_test values(1, 'abc')", + "rename table vitess_test to vitess_test_new", }) defer execStatements(t, []string{ - "drop table vitess_null_new", + "drop table vitess_test_new", }) engine.se.Reload(context.Background()) testcases := []testcase{{ input: []string{ - "insert into vitess_null_new values(2, 'abc')", + "insert into vitess_test_new values(2, 'abc')", }, - // In this case, we don't have information about vitess_null since it was renamed to vitess_null_test. + // In this case, we don't have information about vitess_test since it was renamed to vitess_test_test. // information returned by binlog for val column == varchar (rather than varbinary). output: [][]string{{ `gtid|begin`, `gtid|begin`, - `type:FIELD field_event: fields: > `, - `type:ROW row_event: > > `, + `type:FIELD field_event: fields: > `, + `type:ROW row_event: > > `, `commit`, }, { `gtid|begin`, - `type:DDL ddl:"rename table vitess_null to vitess_null_new" `, + `type:DDL ddl:"rename table vitess_test to vitess_test_new" `, }, { `gtid|begin`, `gtid|begin`, - `type:FIELD field_event: fields: > `, - `type:ROW row_event: > > `, + `type:FIELD field_event: fields: > `, + `type:ROW row_event: > > `, `commit`, }}, }}