diff --git a/.gitignore b/.gitignore index ee7f1935cca..95590f1b43f 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ dm/ui/stats.html # npm dependencies node_modules +tools/bin +tools/include diff --git a/Makefile b/Makefile index dd7d4f999f6..a160bbe3dd5 100644 --- a/Makefile +++ b/Makefile @@ -112,7 +112,7 @@ kafka_consumer: install: go install ./... -unit_test: check_failpoint_ctl generate_mock generate-msgp-code +unit_test: check_failpoint_ctl generate_mock generate-msgp-code generate-protobuf mkdir -p "$(TEST_DIR)" $(FAILPOINT_ENABLE) @export log_level=error;\ @@ -167,7 +167,7 @@ integration_test_mysql: integration_test_kafka: check_third_party_binary tests/integration_tests/run.sh kafka "$(CASE)" "$(START_AT)" -fmt: tools/bin/gofumports tools/bin/shfmt generate_mock generate-msgp-code +fmt: tools/bin/gofumports tools/bin/shfmt generate_mock generate-msgp-code generate-protobuf @echo "gofmt (simplify)" tools/bin/gofumports -l -w $(FILES) 2>&1 | $(FAIL_ON_STDOUT) @echo "run shfmt" @@ -213,6 +213,10 @@ generate-msgp-code: tools/bin/msgp @echo "generate-msgp-code" ./scripts/generate-msgp-code.sh +generate-protobuf: tools/bin/protoc tools/bin/protoc-gen-gogofaster + @echo "generate-protobuf" + ./scripts/generate-protobuf.sh + vet: @echo "vet" $(GO) vet $(PACKAGES) 2>&1 | $(FAIL_ON_STDOUT) @@ -452,6 +456,9 @@ tools/bin/swag: tools/check/go.mod tools/bin/msgp: tools/check/go.mod cd tools/check && $(GO) build -mod=mod -o ../bin/msgp github.com/tinylib/msgp +tools/bin/protoc: + ./scripts/download-protoc.sh + check_failpoint_ctl: tools/bin/failpoint-ctl failpoint-enable: check_failpoint_ctl diff --git a/proto/benchmark/CraftBenchmark.pb.go b/proto/benchmark/CraftBenchmark.pb.go index 3eff4dc5b2c..56512d67ebe 100644 --- a/proto/benchmark/CraftBenchmark.pb.go +++ b/proto/benchmark/CraftBenchmark.pb.go @@ -5,7 +5,7 @@ package benchmark import ( fmt "fmt" - proto "github.com/golang/protobuf/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -20,18 +20,15 @@ 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.ProtoPackageIsVersion3 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Key struct { - Ts uint64 `protobuf:"varint,1,opt,name=ts,proto3" json:"ts,omitempty"` - Schema string `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"` - Table string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"` - RowId int64 `protobuf:"varint,4,opt,name=row_id,json=rowId,proto3" json:"row_id,omitempty"` - Type uint32 `protobuf:"varint,5,opt,name=type,proto3" json:"type,omitempty"` - Partition int64 `protobuf:"varint,6,opt,name=partition,proto3" json:"partition,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Ts uint64 `protobuf:"varint,1,opt,name=ts,proto3" json:"ts,omitempty"` + Schema string `protobuf:"bytes,2,opt,name=schema,proto3" json:"schema,omitempty"` + Table string `protobuf:"bytes,3,opt,name=table,proto3" json:"table,omitempty"` + RowId int64 `protobuf:"varint,4,opt,name=row_id,json=rowId,proto3" json:"row_id,omitempty"` + Type uint32 `protobuf:"varint,5,opt,name=type,proto3" json:"type,omitempty"` + Partition int64 `protobuf:"varint,6,opt,name=partition,proto3" json:"partition,omitempty"` } func (m *Key) Reset() { *m = Key{} } @@ -110,13 +107,10 @@ func (m *Key) GetPartition() int64 { } type Column struct { - Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` - Type uint32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"` - Flag uint32 `protobuf:"varint,3,opt,name=flag,proto3" json:"flag,omitempty"` - Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name string `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"` + Type uint32 `protobuf:"varint,2,opt,name=type,proto3" json:"type,omitempty"` + Flag uint32 `protobuf:"varint,3,opt,name=flag,proto3" json:"flag,omitempty"` + Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"` } func (m *Column) Reset() { *m = Column{} } @@ -181,11 +175,8 @@ func (m *Column) GetValue() []byte { } type RowChanged struct { - OldValue []*Column `protobuf:"bytes,1,rep,name=old_value,json=oldValue,proto3" json:"old_value,omitempty"` - NewValue []*Column `protobuf:"bytes,2,rep,name=new_value,json=newValue,proto3" json:"new_value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OldValue []*Column `protobuf:"bytes,1,rep,name=old_value,json=oldValue,proto3" json:"old_value,omitempty"` + NewValue []*Column `protobuf:"bytes,2,rep,name=new_value,json=newValue,proto3" json:"new_value,omitempty"` } func (m *RowChanged) Reset() { *m = RowChanged{} } @@ -236,15 +227,12 @@ func (m *RowChanged) GetNewValue() []*Column { } type KeysColumnar struct { - Ts []uint64 `protobuf:"varint,1,rep,packed,name=ts,proto3" json:"ts,omitempty"` - Schema []string `protobuf:"bytes,2,rep,name=schema,proto3" json:"schema,omitempty"` - Table []string `protobuf:"bytes,3,rep,name=table,proto3" json:"table,omitempty"` - RowId []int64 `protobuf:"varint,4,rep,packed,name=row_id,json=rowId,proto3" json:"row_id,omitempty"` - Type []uint32 `protobuf:"varint,5,rep,packed,name=type,proto3" json:"type,omitempty"` - Partition []int64 `protobuf:"varint,6,rep,packed,name=partition,proto3" json:"partition,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Ts []uint64 `protobuf:"varint,1,rep,packed,name=ts,proto3" json:"ts,omitempty"` + Schema []string `protobuf:"bytes,2,rep,name=schema,proto3" json:"schema,omitempty"` + Table []string `protobuf:"bytes,3,rep,name=table,proto3" json:"table,omitempty"` + RowId []int64 `protobuf:"varint,4,rep,packed,name=row_id,json=rowId,proto3" json:"row_id,omitempty"` + Type []uint32 `protobuf:"varint,5,rep,packed,name=type,proto3" json:"type,omitempty"` + Partition []int64 `protobuf:"varint,6,rep,packed,name=partition,proto3" json:"partition,omitempty"` } func (m *KeysColumnar) Reset() { *m = KeysColumnar{} } @@ -323,14 +311,11 @@ func (m *KeysColumnar) GetPartition() []int64 { } type ColumnsColumnar struct { - Name []string `protobuf:"bytes,1,rep,name=name,proto3" json:"name,omitempty"` - Type []uint32 `protobuf:"varint,2,rep,packed,name=type,proto3" json:"type,omitempty"` - WhereHandle []bool `protobuf:"varint,3,rep,packed,name=where_handle,json=whereHandle,proto3" json:"where_handle,omitempty"` - Flag []uint32 `protobuf:"varint,4,rep,packed,name=flag,proto3" json:"flag,omitempty"` - Value [][]byte `protobuf:"bytes,5,rep,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Name []string `protobuf:"bytes,1,rep,name=name,proto3" json:"name,omitempty"` + Type []uint32 `protobuf:"varint,2,rep,packed,name=type,proto3" json:"type,omitempty"` + WhereHandle []bool `protobuf:"varint,3,rep,packed,name=where_handle,json=whereHandle,proto3" json:"where_handle,omitempty"` + Flag []uint32 `protobuf:"varint,4,rep,packed,name=flag,proto3" json:"flag,omitempty"` + Value [][]byte `protobuf:"bytes,5,rep,name=value,proto3" json:"value,omitempty"` } func (m *ColumnsColumnar) Reset() { *m = ColumnsColumnar{} } @@ -402,11 +387,8 @@ func (m *ColumnsColumnar) GetValue() [][]byte { } type RowChangedColumnar struct { - OldValue []*ColumnsColumnar `protobuf:"bytes,1,rep,name=old_value,json=oldValue,proto3" json:"old_value,omitempty"` - NewValue []*ColumnsColumnar `protobuf:"bytes,2,rep,name=new_value,json=newValue,proto3" json:"new_value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OldValue []*ColumnsColumnar `protobuf:"bytes,1,rep,name=old_value,json=oldValue,proto3" json:"old_value,omitempty"` + NewValue []*ColumnsColumnar `protobuf:"bytes,2,rep,name=new_value,json=newValue,proto3" json:"new_value,omitempty"` } func (m *RowChangedColumnar) Reset() { *m = RowChangedColumnar{} } @@ -468,34 +450,35 @@ func init() { func init() { proto.RegisterFile("CraftBenchmark.proto", fileDescriptor_14a6b0a2c8322bed) } var fileDescriptor_14a6b0a2c8322bed = []byte{ - // 430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x31, 0x6f, 0xd4, 0x30, - 0x14, 0xc7, 0x71, 0x9c, 0x8b, 0x9a, 0xd7, 0x6b, 0x11, 0x56, 0x41, 0x01, 0xa1, 0x53, 0xc8, 0x94, - 0xc9, 0x03, 0x0c, 0x9d, 0x58, 0x7a, 0x4b, 0x51, 0x37, 0x0f, 0x0c, 0x2c, 0x27, 0x27, 0x76, 0x2f, - 0x11, 0x89, 0x7d, 0x72, 0x5c, 0xa2, 0xfb, 0x02, 0x9d, 0x58, 0x91, 0xf8, 0x48, 0x8c, 0x7c, 0x04, - 0x74, 0x7c, 0x11, 0x14, 0xe7, 0x9a, 0xf4, 0x74, 0x29, 0x9b, 0xdf, 0xf3, 0xff, 0x3d, 0xfd, 0xf5, - 0xfb, 0xeb, 0xc1, 0xc5, 0xd2, 0xf0, 0x5b, 0x7b, 0x25, 0x55, 0x5e, 0xd4, 0xdc, 0x7c, 0xa5, 0x1b, - 0xa3, 0xad, 0x26, 0x61, 0xf6, 0xd0, 0x48, 0xbe, 0x23, 0xc0, 0x37, 0x72, 0x4b, 0xce, 0xc1, 0xb3, - 0x4d, 0x84, 0x62, 0x94, 0xfa, 0xcc, 0xb3, 0x0d, 0x79, 0x05, 0x41, 0x93, 0x17, 0xb2, 0xe6, 0x91, - 0x17, 0xa3, 0x34, 0x64, 0xfb, 0x8a, 0x5c, 0xc0, 0xcc, 0xf2, 0xac, 0x92, 0x11, 0x76, 0xed, 0xbe, - 0x20, 0x2f, 0x21, 0x30, 0xba, 0x5d, 0x95, 0x22, 0xf2, 0x63, 0x94, 0x62, 0x36, 0x33, 0xba, 0xfd, - 0x24, 0x08, 0x01, 0xdf, 0x6e, 0x37, 0x32, 0x9a, 0xc5, 0x28, 0x3d, 0x63, 0xee, 0x4d, 0xde, 0x42, - 0xb8, 0xe1, 0xc6, 0x96, 0xb6, 0xd4, 0x2a, 0x0a, 0x9c, 0x7a, 0x6c, 0x24, 0x5f, 0x20, 0x58, 0xea, - 0xea, 0xae, 0x56, 0xdd, 0xac, 0xe2, 0xb5, 0x74, 0x96, 0x42, 0xe6, 0xde, 0xc3, 0x3e, 0xef, 0xd1, - 0x3e, 0x02, 0xfe, 0x6d, 0xc5, 0xd7, 0xce, 0xcf, 0x19, 0x73, 0xef, 0xce, 0xe4, 0x37, 0x5e, 0xdd, - 0x49, 0xe7, 0x66, 0xce, 0xfa, 0x22, 0xa9, 0x00, 0x98, 0x6e, 0x97, 0x05, 0x57, 0x6b, 0x29, 0x08, - 0x85, 0x50, 0x57, 0x62, 0xd5, 0xeb, 0x50, 0x8c, 0xd3, 0xd3, 0xf7, 0x2f, 0xe8, 0xc0, 0x85, 0xf6, - 0x2e, 0xd8, 0x89, 0xae, 0xc4, 0xe7, 0x4e, 0xd2, 0xe9, 0x95, 0x6c, 0xf7, 0x7a, 0xef, 0x49, 0xbd, - 0x92, 0xad, 0xd3, 0x27, 0x3f, 0x10, 0xcc, 0x6f, 0xe4, 0xb6, 0xe9, 0x3f, 0xb8, 0x19, 0x08, 0xe3, - 0x09, 0xc2, 0x78, 0x9a, 0x30, 0x9e, 0x26, 0x8c, 0xa7, 0x08, 0xe3, 0xa7, 0x08, 0xe3, 0x43, 0xc2, - 0xf7, 0x08, 0x9e, 0xf7, 0x9e, 0x46, 0x6b, 0x23, 0x6b, 0x3c, 0xc1, 0x7a, 0xdc, 0xfc, 0x0e, 0xe6, - 0x6d, 0x21, 0x8d, 0x5c, 0x15, 0x5c, 0x89, 0xbd, 0xc3, 0x13, 0x76, 0xea, 0x7a, 0xd7, 0xae, 0x35, - 0xc4, 0xe1, 0xf7, 0x63, 0x87, 0x71, 0x74, 0x2e, 0x87, 0x38, 0xee, 0x11, 0x90, 0x31, 0x8f, 0xc1, - 0xcb, 0xe5, 0x71, 0x2e, 0x6f, 0x8e, 0x38, 0x0f, 0xd6, 0x1f, 0x05, 0x74, 0x79, 0x1c, 0xd0, 0x7f, - 0x07, 0x1f, 0x92, 0xba, 0xfa, 0xf8, 0x6b, 0xb7, 0x40, 0xbf, 0x77, 0x0b, 0xf4, 0x67, 0xb7, 0x40, - 0x3f, 0xff, 0x2e, 0x9e, 0xc1, 0xeb, 0x52, 0x53, 0x5b, 0x8a, 0x8c, 0x66, 0xe5, 0x5a, 0x70, 0xcb, - 0x69, 0x2e, 0x72, 0x9a, 0xbb, 0x4b, 0x3a, 0x3f, 0x3c, 0xa8, 0x6b, 0x94, 0x05, 0xee, 0xa6, 0x3e, - 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x8e, 0xf5, 0x0b, 0xd6, 0x6b, 0x03, 0x00, 0x00, + // 438 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0xb1, 0x6e, 0xdb, 0x30, + 0x10, 0x86, 0x4d, 0x51, 0x16, 0xa2, 0x8b, 0x93, 0xa2, 0x44, 0x5a, 0xa8, 0x45, 0x21, 0xa8, 0x9e, + 0x34, 0x71, 0x68, 0x87, 0xec, 0x31, 0x0a, 0xa4, 0xc8, 0xc6, 0xa1, 0x43, 0x17, 0x83, 0x12, 0x19, + 0x4b, 0xa8, 0x4c, 0x1a, 0x34, 0x53, 0xc1, 0x2f, 0x90, 0xa9, 0x43, 0x97, 0xbe, 0x53, 0xc7, 0x8c, + 0x1d, 0x0b, 0xfb, 0x45, 0x0a, 0x51, 0x8e, 0x14, 0xc3, 0x4a, 0x37, 0xde, 0xf1, 0xbf, 0xc3, 0x8f, + 0xef, 0xc7, 0xc1, 0xc5, 0xcc, 0xf0, 0x5b, 0x7b, 0x25, 0x55, 0x5e, 0x2c, 0xb9, 0xf9, 0x46, 0x57, + 0x46, 0x5b, 0x4d, 0xc2, 0xec, 0xb1, 0x31, 0xfd, 0x81, 0x00, 0xdf, 0xc8, 0x0d, 0x39, 0x07, 0xcf, + 0xae, 0x23, 0x94, 0xa0, 0xd4, 0x67, 0x9e, 0x5d, 0x93, 0xd7, 0x10, 0xac, 0xf3, 0x42, 0x2e, 0x79, + 0xe4, 0x25, 0x28, 0x0d, 0xd9, 0xbe, 0x22, 0x17, 0x30, 0xb6, 0x3c, 0xab, 0x64, 0x84, 0x5d, 0xbb, + 0x2d, 0xc8, 0x2b, 0x08, 0x8c, 0xae, 0xe7, 0xa5, 0x88, 0xfc, 0x04, 0xa5, 0x98, 0x8d, 0x8d, 0xae, + 0x3f, 0x0b, 0x42, 0xc0, 0xb7, 0x9b, 0x95, 0x8c, 0xc6, 0x09, 0x4a, 0xcf, 0x98, 0x7b, 0x93, 0x77, + 0x10, 0xae, 0xb8, 0xb1, 0xa5, 0x2d, 0xb5, 0x8a, 0x02, 0xa7, 0xee, 0x1b, 0xd3, 0xaf, 0x10, 0xcc, + 0x74, 0x75, 0xb7, 0x54, 0xcd, 0xac, 0xe2, 0x4b, 0xe9, 0x2c, 0x85, 0xcc, 0xbd, 0xbb, 0x7d, 0xde, + 0x93, 0x7d, 0x04, 0xfc, 0xdb, 0x8a, 0x2f, 0x9c, 0x9f, 0x33, 0xe6, 0xde, 0x8d, 0xc9, 0xef, 0xbc, + 0xba, 0x93, 0xce, 0xcd, 0x84, 0xb5, 0xc5, 0xb4, 0x02, 0x60, 0xba, 0x9e, 0x15, 0x5c, 0x2d, 0xa4, + 0x20, 0x14, 0x42, 0x5d, 0x89, 0x79, 0xab, 0x43, 0x09, 0x4e, 0x4f, 0x3f, 0xbc, 0xa4, 0x1d, 0x17, + 0xda, 0xba, 0x60, 0x27, 0xba, 0x12, 0x5f, 0x1a, 0x49, 0xa3, 0x57, 0xb2, 0xde, 0xeb, 0xbd, 0x67, + 0xf5, 0x4a, 0xd6, 0x4e, 0x3f, 0xfd, 0x85, 0x60, 0x72, 0x23, 0x37, 0xeb, 0xf6, 0x83, 0x9b, 0x8e, + 0x30, 0x1e, 0x20, 0x8c, 0x87, 0x09, 0xe3, 0x61, 0xc2, 0x78, 0x88, 0x30, 0x7e, 0x8e, 0x30, 0x3e, + 0x24, 0x7c, 0x8f, 0xe0, 0x45, 0xeb, 0xa9, 0xb7, 0xd6, 0xb3, 0xc6, 0x03, 0xac, 0xfb, 0xcd, 0xef, + 0x61, 0x52, 0x17, 0xd2, 0xc8, 0x79, 0xc1, 0x95, 0xd8, 0x3b, 0x3c, 0x61, 0xa7, 0xae, 0x77, 0xed, + 0x5a, 0x5d, 0x1c, 0x7e, 0x3b, 0x76, 0x18, 0x47, 0xe3, 0xb2, 0x8b, 0xe3, 0x1e, 0x01, 0xe9, 0xf3, + 0xe8, 0xbc, 0x5c, 0x1e, 0xe7, 0xf2, 0xf6, 0x88, 0x73, 0x67, 0xfd, 0x49, 0x40, 0x97, 0xc7, 0x01, + 0xfd, 0x77, 0xf0, 0x31, 0xa9, 0xab, 0x4f, 0xbf, 0xb7, 0x31, 0x7a, 0xd8, 0xc6, 0xe8, 0xef, 0x36, + 0x46, 0x3f, 0x77, 0xf1, 0xe8, 0x61, 0x17, 0x8f, 0xfe, 0xec, 0xe2, 0x11, 0xbc, 0x29, 0x35, 0xb5, + 0xa5, 0xc8, 0x68, 0x56, 0x2e, 0x04, 0xb7, 0x9c, 0xe6, 0x22, 0xa7, 0xb9, 0xbb, 0xa8, 0xf3, 0xc3, + 0xc3, 0xba, 0x46, 0x59, 0xe0, 0x6e, 0xeb, 0xe3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x29, 0xb1, + 0x59, 0x1d, 0x73, 0x03, 0x00, 0x00, } func (m *Key) Marshal() (dAtA []byte, err error) { @@ -518,10 +501,6 @@ func (m *Key) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.Partition != 0 { i = encodeVarintCraftBenchmark(dAtA, i, uint64(m.Partition)) i-- @@ -579,10 +558,6 @@ func (m *Column) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Value) > 0 { i -= len(m.Value) copy(dAtA[i:], m.Value) @@ -630,10 +605,6 @@ func (m *RowChanged) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.NewValue) > 0 { for iNdEx := len(m.NewValue) - 1; iNdEx >= 0; iNdEx-- { { @@ -685,10 +656,6 @@ func (m *KeysColumnar) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Partition) > 0 { dAtA2 := make([]byte, len(m.Partition)*10) var j1 int @@ -804,10 +771,6 @@ func (m *ColumnsColumnar) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Value) > 0 { for iNdEx := len(m.Value) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Value[iNdEx]) @@ -898,10 +861,6 @@ func (m *RowChangedColumnar) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.NewValue) > 0 { for iNdEx := len(m.NewValue) - 1; iNdEx >= 0; iNdEx-- { { @@ -970,9 +929,6 @@ func (m *Key) Size() (n int) { if m.Partition != 0 { n += 1 + sovCraftBenchmark(uint64(m.Partition)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -996,9 +952,6 @@ func (m *Column) Size() (n int) { if l > 0 { n += 1 + l + sovCraftBenchmark(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1020,9 +973,6 @@ func (m *RowChanged) Size() (n int) { n += 1 + l + sovCraftBenchmark(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1072,9 +1022,6 @@ func (m *KeysColumnar) Size() (n int) { } n += 1 + sovCraftBenchmark(uint64(l)) + l } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1113,9 +1060,6 @@ func (m *ColumnsColumnar) Size() (n int) { n += 1 + l + sovCraftBenchmark(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1137,9 +1081,6 @@ func (m *RowChangedColumnar) Size() (n int) { n += 1 + l + sovCraftBenchmark(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1330,7 +1271,6 @@ func (m *Key) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1485,7 +1425,6 @@ func (m *Column) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1604,7 +1543,6 @@ func (m *RowChanged) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2023,7 +1961,6 @@ func (m *KeysColumnar) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2360,7 +2297,6 @@ func (m *ColumnsColumnar) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2479,7 +2415,6 @@ func (m *RowChangedColumnar) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } diff --git a/proto/canal/CanalProtocol.pb.go b/proto/canal/CanalProtocol.pb.go index 94ade24d933..c7ca2d31422 100644 --- a/proto/canal/CanalProtocol.pb.go +++ b/proto/canal/CanalProtocol.pb.go @@ -5,7 +5,7 @@ package com_alibaba_otter_canal_protocol import ( fmt "fmt" - proto "github.com/golang/protobuf/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -20,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.ProtoPackageIsVersion3 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Compression int32 @@ -133,11 +133,8 @@ type Packet struct { // // Types that are valid to be assigned to CompressionPresent: // *Packet_Compression - CompressionPresent isPacket_CompressionPresent `protobuf_oneof:"compression_present"` - Body []byte `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + CompressionPresent isPacket_CompressionPresent `protobuf_oneof:"compression_present"` + Body []byte `protobuf:"bytes,5,opt,name=body,proto3" json:"body,omitempty"` } func (m *Packet) Reset() { *m = Packet{} } @@ -267,11 +264,8 @@ func (*Packet) XXX_OneofWrappers() []interface{} { } type HeartBeat struct { - SendTimestamp int64 `protobuf:"varint,1,opt,name=send_timestamp,json=sendTimestamp,proto3" json:"send_timestamp,omitempty"` - StartTimestamp int64 `protobuf:"varint,2,opt,name=start_timestamp,json=startTimestamp,proto3" json:"start_timestamp,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SendTimestamp int64 `protobuf:"varint,1,opt,name=send_timestamp,json=sendTimestamp,proto3" json:"send_timestamp,omitempty"` + StartTimestamp int64 `protobuf:"varint,2,opt,name=start_timestamp,json=startTimestamp,proto3" json:"start_timestamp,omitempty"` } func (m *HeartBeat) Reset() { *m = HeartBeat{} } @@ -329,9 +323,6 @@ type Handshake struct { CommunicationEncodingPresent isHandshake_CommunicationEncodingPresent `protobuf_oneof:"communication_encoding_present"` Seeds []byte `protobuf:"bytes,2,opt,name=seeds,proto3" json:"seeds,omitempty"` SupportedCompressions Compression `protobuf:"varint,3,opt,name=supported_compressions,json=supportedCompressions,proto3,enum=com.alibaba.otter.canal.protocol.Compression" json:"supported_compressions,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` } func (m *Handshake) Reset() { *m = Handshake{} } @@ -432,9 +423,6 @@ type ClientAuth struct { ClientId string `protobuf:"bytes,6,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` Filter string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"` StartTimestamp int64 `protobuf:"varint,8,opt,name=start_timestamp,json=startTimestamp,proto3" json:"start_timestamp,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` } func (m *ClientAuth) Reset() { *m = ClientAuth{} } @@ -573,11 +561,8 @@ type Ack struct { // // Types that are valid to be assigned to ErrorCodePresent: // *Ack_ErrorCode - ErrorCodePresent isAck_ErrorCodePresent `protobuf_oneof:"error_code_present"` - ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ErrorCodePresent isAck_ErrorCodePresent `protobuf_oneof:"error_code_present"` + ErrorMessage string `protobuf:"bytes,2,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` } func (m *Ack) Reset() { *m = Ack{} } @@ -654,12 +639,9 @@ func (*Ack) XXX_OneofWrappers() []interface{} { } type ClientAck struct { - Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` - ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - BatchId int64 `protobuf:"varint,3,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` + ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + BatchId int64 `protobuf:"varint,3,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"` } func (m *ClientAck) Reset() { *m = ClientAck{} } @@ -718,12 +700,9 @@ func (m *ClientAck) GetBatchId() int64 { // subscription type Sub struct { - Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` - ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - Filter string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` + ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + Filter string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"` } func (m *Sub) Reset() { *m = Sub{} } @@ -782,12 +761,9 @@ func (m *Sub) GetFilter() string { // Unsubscription type Unsub struct { - Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` - ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - Filter string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` + ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + Filter string `protobuf:"bytes,7,opt,name=filter,proto3" json:"filter,omitempty"` } func (m *Unsub) Reset() { *m = Unsub{} } @@ -863,10 +839,7 @@ type Get struct { // // Types that are valid to be assigned to AutoAckPresent: // *Get_AutoAck - AutoAckPresent isGet_AutoAckPresent `protobuf_oneof:"auto_ack_present"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + AutoAckPresent isGet_AutoAckPresent `protobuf_oneof:"auto_ack_present"` } func (m *Get) Reset() { *m = Get{} } @@ -1004,11 +977,8 @@ func (*Get) XXX_OneofWrappers() []interface{} { // type Messages struct { - BatchId int64 `protobuf:"varint,1,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"` - Messages [][]byte `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + BatchId int64 `protobuf:"varint,1,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"` + Messages [][]byte `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"` } func (m *Messages) Reset() { *m = Messages{} } @@ -1066,10 +1036,7 @@ type Dump struct { // // Types that are valid to be assigned to TimestampPresent: // *Dump_Timestamp - TimestampPresent isDump_TimestampPresent `protobuf_oneof:"timestamp_present"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + TimestampPresent isDump_TimestampPresent `protobuf_oneof:"timestamp_present"` } func (m *Dump) Reset() { *m = Dump{} } @@ -1153,12 +1120,9 @@ func (*Dump) XXX_OneofWrappers() []interface{} { } type ClientRollback struct { - Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` - ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - BatchId int64 `protobuf:"varint,3,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Destination string `protobuf:"bytes,1,opt,name=destination,proto3" json:"destination,omitempty"` + ClientId string `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + BatchId int64 `protobuf:"varint,3,opt,name=batch_id,json=batchId,proto3" json:"batch_id,omitempty"` } func (m *ClientRollback) Reset() { *m = ClientRollback{} } @@ -1235,72 +1199,73 @@ func init() { func init() { proto.RegisterFile("CanalProtocol.proto", fileDescriptor_638f57be23f1b015) } var fileDescriptor_638f57be23f1b015 = []byte{ - // 1038 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x5f, 0x6f, 0xe3, 0x44, - 0x10, 0xaf, 0xe3, 0xa4, 0x89, 0x27, 0x69, 0xea, 0x6e, 0xff, 0x28, 0xd7, 0x8a, 0x5c, 0x94, 0x13, - 0xa2, 0xaa, 0x8e, 0x3c, 0x1c, 0x0f, 0xbc, 0x62, 0xa7, 0xa6, 0x8e, 0x9a, 0x26, 0x61, 0xe3, 0xe8, - 0x44, 0x41, 0x44, 0x1b, 0x7b, 0xaf, 0xf5, 0x25, 0xf6, 0x06, 0x7b, 0xcd, 0xa9, 0xf7, 0x49, 0xf8, - 0x20, 0x7c, 0x08, 0x1e, 0x79, 0xe3, 0x15, 0x15, 0x09, 0x89, 0x6f, 0x81, 0x76, 0xed, 0xb8, 0x69, - 0x29, 0xaa, 0xd0, 0xe9, 0xde, 0x76, 0x7e, 0x33, 0x3b, 0xb3, 0xf3, 0x9b, 0xdf, 0xae, 0x0d, 0xbb, - 0x5d, 0x12, 0x92, 0xc5, 0x28, 0x62, 0x9c, 0xb9, 0x6c, 0xd1, 0x59, 0x8a, 0x05, 0x6a, 0xb9, 0x2c, - 0xe8, 0x90, 0x85, 0x3f, 0x23, 0x33, 0xd2, 0x61, 0x9c, 0xd3, 0xa8, 0xe3, 0x8a, 0xb0, 0xd4, 0xed, - 0xb2, 0x45, 0xfb, 0x97, 0x02, 0x6c, 0x8e, 0x88, 0x3b, 0xa7, 0x1c, 0xbd, 0x80, 0x5a, 0x40, 0xae, - 0x7c, 0x77, 0x1a, 0x26, 0xc1, 0x8c, 0x46, 0x0d, 0xa5, 0xa5, 0x1c, 0x97, 0xec, 0x0d, 0x5c, 0x95, - 0xe8, 0x40, 0x82, 0xe8, 0x10, 0xca, 0x3f, 0xd1, 0x28, 0xf6, 0x59, 0xd8, 0x28, 0x48, 0xbf, 0x82, - 0x57, 0x00, 0xfa, 0x0a, 0x8a, 0xfc, 0x66, 0x49, 0x1b, 0x6a, 0x4b, 0x39, 0xae, 0xbf, 0x7a, 0xd9, - 0x79, 0xaa, 0x78, 0x27, 0x2d, 0xec, 0xdc, 0x2c, 0x29, 0x96, 0x3b, 0xd1, 0x37, 0x50, 0x75, 0x59, - 0xb0, 0x8c, 0x68, 0x2c, 0x2b, 0x14, 0x65, 0xa2, 0xcf, 0x9f, 0x4e, 0xd4, 0xbd, 0xdb, 0x64, 0x17, - 0xf0, 0x7a, 0x0e, 0x84, 0xa0, 0x38, 0x63, 0xde, 0x4d, 0xa3, 0xd4, 0x52, 0x8e, 0x6b, 0x58, 0xae, - 0xcd, 0x03, 0xd8, 0x5b, 0xef, 0x74, 0x2a, 0x82, 0x69, 0xc8, 0xcd, 0x1d, 0xd8, 0xce, 0x7a, 0xc9, - 0xa1, 0x7d, 0xd8, 0x5d, 0xcb, 0xb6, 0x82, 0xdb, 0xdf, 0x81, 0x66, 0x53, 0x12, 0x71, 0x93, 0x12, - 0x8e, 0x3e, 0x85, 0x7a, 0x4c, 0x43, 0x6f, 0xca, 0xfd, 0x80, 0xc6, 0x9c, 0x04, 0x4b, 0x49, 0x9d, - 0x8a, 0xb7, 0x04, 0xea, 0xac, 0x40, 0xf4, 0x19, 0x6c, 0xc7, 0x9c, 0x44, 0x7c, 0x2d, 0xae, 0x20, - 0xe3, 0xea, 0x12, 0xce, 0x03, 0xdb, 0xb7, 0x0a, 0x68, 0x36, 0x09, 0xbd, 0xf8, 0x9a, 0xcc, 0x29, - 0xfa, 0x12, 0x0e, 0x5c, 0x16, 0x04, 0x49, 0xe8, 0xbb, 0x84, 0x8b, 0x33, 0xd0, 0xd0, 0x65, 0x9e, - 0x1f, 0x5e, 0xc9, 0x2a, 0x9a, 0xbd, 0x81, 0xf7, 0xef, 0xf9, 0xad, 0xcc, 0x8d, 0xf6, 0xa0, 0x14, - 0x53, 0xea, 0xc5, 0xb2, 0x4a, 0x0d, 0xa7, 0x06, 0xf2, 0xe0, 0x20, 0x4e, 0x96, 0x4b, 0x16, 0x71, - 0xea, 0x4d, 0xd7, 0x5a, 0x8b, 0xb3, 0xb1, 0xfd, 0x3f, 0xb6, 0xf1, 0x7e, 0x9e, 0x6c, 0x0d, 0x8d, - 0xcd, 0x16, 0x34, 0x1f, 0x3f, 0x74, 0xce, 0xe0, 0xef, 0x05, 0x80, 0xee, 0xc2, 0xa7, 0x21, 0x37, - 0x12, 0x7e, 0x8d, 0x0e, 0xa1, 0x92, 0xc4, 0x34, 0x0a, 0x49, 0x40, 0xd3, 0xbe, 0x70, 0x6e, 0x0b, - 0xdf, 0x92, 0xc4, 0xf1, 0x3b, 0x16, 0x79, 0x59, 0x2f, 0xb9, 0x8d, 0x4e, 0x40, 0x0f, 0x29, 0x9f, - 0x46, 0x94, 0xa4, 0xfc, 0xb3, 0x84, 0xcb, 0x46, 0x84, 0x70, 0xeb, 0x21, 0xe5, 0x98, 0x12, 0x39, - 0x02, 0x96, 0x70, 0xf4, 0x12, 0x76, 0x44, 0xec, 0xbb, 0xc8, 0xe7, 0x34, 0x0f, 0x2e, 0x66, 0x2a, - 0xde, 0x0e, 0x29, 0x7f, 0x2d, 0x3c, 0xab, 0xe8, 0x16, 0x54, 0x3d, 0x1a, 0x73, 0x3f, 0x94, 0x0d, - 0x48, 0xfd, 0x68, 0x78, 0x1d, 0x42, 0x47, 0xa0, 0xb9, 0xb2, 0x83, 0xa9, 0xef, 0x35, 0x36, 0xd3, - 0x43, 0xa7, 0x40, 0xcf, 0x43, 0x07, 0xb0, 0xf9, 0xc6, 0x5f, 0x70, 0x1a, 0x35, 0xca, 0xd2, 0x93, - 0x59, 0x8f, 0xa9, 0xa0, 0xf2, 0x98, 0x0a, 0xcc, 0x43, 0x68, 0x3c, 0xec, 0x2c, 0x57, 0xe5, 0x11, - 0x3c, 0xfb, 0x57, 0x27, 0x39, 0xb3, 0x04, 0x54, 0xc3, 0x9d, 0xa3, 0xe7, 0x00, 0x34, 0x8a, 0x58, - 0x34, 0x75, 0x99, 0x47, 0xf3, 0xcb, 0xac, 0x49, 0xac, 0xcb, 0x3c, 0x8a, 0x5e, 0xc0, 0x56, 0x1a, - 0x10, 0xd0, 0x38, 0x26, 0x57, 0x54, 0x72, 0xab, 0xe1, 0x9a, 0x04, 0x2f, 0x52, 0xcc, 0xdc, 0x03, - 0x74, 0x97, 0x25, 0x2f, 0x41, 0x41, 0xcb, 0x66, 0xe7, 0xce, 0x1f, 0x12, 0xa5, 0x3c, 0x41, 0x54, - 0xe1, 0x01, 0x51, 0xcf, 0xa0, 0x32, 0x23, 0xdc, 0xbd, 0x16, 0x3e, 0x55, 0x32, 0x51, 0x96, 0x76, - 0xcf, 0x6b, 0x7f, 0x0f, 0xea, 0x38, 0x99, 0x7d, 0x68, 0x81, 0xff, 0x98, 0x44, 0xfb, 0x07, 0x28, - 0x4d, 0xc2, 0xf8, 0xe3, 0xe5, 0xff, 0x5b, 0x01, 0xf5, 0x8c, 0xf2, 0x0f, 0x4d, 0xff, 0x09, 0xc0, - 0x1b, 0x2a, 0xf8, 0x89, 0xfd, 0xf7, 0xe9, 0xdb, 0x5a, 0xc2, 0x9a, 0x44, 0xc6, 0xfe, 0x7b, 0x71, - 0x39, 0xca, 0xeb, 0x52, 0x56, 0xed, 0x0d, 0xbc, 0x02, 0xd0, 0x1e, 0x14, 0x93, 0xd0, 0xe7, 0x52, - 0xbb, 0x42, 0xe3, 0xd2, 0x42, 0x47, 0x50, 0x21, 0x09, 0x67, 0x53, 0xe2, 0xce, 0xa5, 0x6a, 0x2b, - 0x76, 0x01, 0x97, 0x05, 0x62, 0xb8, 0x73, 0xf1, 0x04, 0x3e, 0x14, 0x5b, 0x1d, 0x6a, 0x62, 0x5f, - 0x6e, 0x23, 0xd0, 0x57, 0xfb, 0x73, 0x41, 0x18, 0x50, 0xc9, 0x14, 0x13, 0xdf, 0x1b, 0xa8, 0x72, - 0x6f, 0xa0, 0xe2, 0x26, 0x67, 0x62, 0x13, 0xaf, 0x92, 0x2a, 0x6e, 0xf2, 0xca, 0x6e, 0xff, 0x08, - 0xc5, 0xd3, 0x24, 0x58, 0xa2, 0x06, 0x94, 0xdf, 0xb2, 0x24, 0x0a, 0xc9, 0x22, 0xa3, 0x6a, 0x65, - 0xca, 0x77, 0x80, 0xc5, 0x3e, 0x5f, 0x7d, 0x7c, 0x54, 0x9c, 0xdb, 0xa8, 0x09, 0xda, 0xdd, 0x85, - 0x52, 0x33, 0x22, 0xee, 0x20, 0x73, 0x17, 0x76, 0x72, 0x23, 0x3f, 0xf5, 0x5b, 0xa8, 0xa7, 0x32, - 0xc6, 0x6c, 0xb1, 0x98, 0x91, 0x8f, 0xa9, 0xe5, 0x93, 0x09, 0x54, 0xd7, 0x5e, 0x48, 0xf4, 0x1c, - 0x8e, 0xba, 0xc3, 0x8b, 0x11, 0xb6, 0xc6, 0xe3, 0xde, 0x70, 0x20, 0x96, 0x86, 0xd3, 0x33, 0xfb, - 0xd6, 0x08, 0x0f, 0x9d, 0xe1, 0x2b, 0x7d, 0x03, 0x55, 0xa0, 0x38, 0x18, 0x0e, 0x2c, 0x5d, 0x11, - 0xab, 0xcb, 0x7e, 0xcf, 0xd4, 0x0b, 0x62, 0x75, 0x76, 0xd9, 0x1b, 0xe9, 0x2a, 0x2a, 0x83, 0xda, - 0xbf, 0xfc, 0x5a, 0x2f, 0x9e, 0xfc, 0xa5, 0x00, 0xdc, 0x7d, 0x46, 0x45, 0xda, 0x91, 0xd1, 0x3d, - 0x37, 0xce, 0x2c, 0xe7, 0xdb, 0x91, 0xf5, 0x48, 0xda, 0x2d, 0xd0, 0x6c, 0x63, 0x70, 0x3a, 0xb6, - 0x8d, 0x73, 0x91, 0xbb, 0x01, 0x7b, 0xdd, 0x7e, 0xcf, 0x1a, 0x38, 0xc6, 0xc4, 0xb1, 0xad, 0x81, - 0xd3, 0xeb, 0x1a, 0x4e, 0x6f, 0x38, 0xd0, 0x0b, 0xa2, 0x82, 0xd1, 0x3d, 0xd7, 0x55, 0xa4, 0x43, - 0x6d, 0x3c, 0x31, 0xc7, 0x5d, 0xdc, 0x1b, 0x49, 0x57, 0x11, 0x21, 0xa8, 0x4f, 0x06, 0xf7, 0xb0, - 0x92, 0x08, 0x3f, 0xb3, 0x1c, 0x7d, 0x13, 0xd5, 0xa0, 0x72, 0x61, 0x8d, 0xc7, 0xc6, 0x99, 0x35, - 0xd6, 0xcb, 0xa2, 0x5c, 0x96, 0xbf, 0x7b, 0xae, 0x57, 0x84, 0x73, 0x6c, 0x4f, 0x9c, 0xd3, 0xe1, - 0xeb, 0x81, 0xae, 0x89, 0x76, 0x4e, 0x27, 0x17, 0x23, 0x1d, 0xe4, 0xa9, 0x2c, 0x03, 0x3b, 0xa6, - 0x65, 0x38, 0x7a, 0x55, 0x14, 0x48, 0x77, 0xe1, 0x61, 0xbf, 0x6f, 0x8a, 0xad, 0x35, 0xd3, 0xf8, - 0xf5, 0xb6, 0xa9, 0xfc, 0x76, 0xdb, 0x54, 0xfe, 0xb8, 0x6d, 0x2a, 0x3f, 0xff, 0xd9, 0xdc, 0x80, - 0x27, 0x7f, 0x6e, 0xcc, 0x6a, 0xfa, 0x4f, 0x24, 0xe9, 0xb1, 0x95, 0xd9, 0xa6, 0x74, 0x7c, 0xf1, - 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x97, 0x69, 0xe7, 0x75, 0x2b, 0x09, 0x00, 0x00, + // 1048 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xdf, 0x6e, 0xe2, 0xc6, + 0x17, 0xc6, 0x18, 0x02, 0x3e, 0x10, 0xe2, 0x4c, 0xfe, 0x88, 0x4d, 0xf4, 0x63, 0x11, 0xab, 0x9f, + 0x1a, 0x45, 0x5b, 0x2e, 0xb6, 0x17, 0xbd, 0xad, 0x4d, 0xdc, 0x18, 0x85, 0x00, 0x1d, 0x8c, 0x56, + 0x4d, 0xab, 0xa2, 0xc1, 0x9e, 0x4d, 0xbc, 0x80, 0x87, 0xda, 0xe3, 0xae, 0xb2, 0x4f, 0xd1, 0x87, + 0xe9, 0x43, 0xf4, 0x72, 0xef, 0xda, 0xcb, 0x2a, 0x91, 0x2a, 0xf5, 0x2d, 0xaa, 0x19, 0x1b, 0x87, + 0xa4, 0xa9, 0xa2, 0x6a, 0xb5, 0x77, 0x73, 0xbe, 0x73, 0xe6, 0x9c, 0x39, 0xdf, 0xf9, 0x66, 0x6c, + 0xd8, 0xe9, 0x90, 0x80, 0xcc, 0x87, 0x21, 0xe3, 0xcc, 0x65, 0xf3, 0xf6, 0x52, 0x2c, 0x50, 0xd3, + 0x65, 0x8b, 0x36, 0x99, 0xfb, 0x53, 0x32, 0x25, 0x6d, 0xc6, 0x39, 0x0d, 0xdb, 0xae, 0x08, 0x4b, + 0xdc, 0x2e, 0x9b, 0xb7, 0x7e, 0xc9, 0xc3, 0xc6, 0x90, 0xb8, 0x33, 0xca, 0xd1, 0x0b, 0xa8, 0x2e, + 0xc8, 0xa5, 0xef, 0x4e, 0x82, 0x78, 0x31, 0xa5, 0x61, 0x5d, 0x69, 0x2a, 0x47, 0x45, 0x3b, 0x87, + 0x2b, 0x12, 0xed, 0x4b, 0x10, 0x1d, 0x40, 0xe9, 0x27, 0x1a, 0x46, 0x3e, 0x0b, 0xea, 0x79, 0xe9, + 0x57, 0xf0, 0x0a, 0x40, 0x5f, 0x41, 0x81, 0x5f, 0x2f, 0x69, 0x5d, 0x6d, 0x2a, 0x47, 0xb5, 0x57, + 0x2f, 0xdb, 0x4f, 0x15, 0x6f, 0x27, 0x85, 0x9d, 0xeb, 0x25, 0xc5, 0x72, 0x27, 0xfa, 0x06, 0x2a, + 0x2e, 0x5b, 0x2c, 0x43, 0x1a, 0xc9, 0x0a, 0x05, 0x99, 0xe8, 0xf3, 0xa7, 0x13, 0x75, 0xee, 0x36, + 0xd9, 0x79, 0xbc, 0x9e, 0x03, 0x21, 0x28, 0x4c, 0x99, 0x77, 0x5d, 0x2f, 0x36, 0x95, 0xa3, 0x2a, + 0x96, 0x6b, 0x73, 0x1f, 0x76, 0xd7, 0x3b, 0x9d, 0x88, 0x60, 0x1a, 0x70, 0x73, 0x1b, 0xb6, 0xd2, + 0x5e, 0x32, 0x68, 0x0f, 0x76, 0xd6, 0xb2, 0xad, 0xe0, 0xd6, 0x77, 0xa0, 0xd9, 0x94, 0x84, 0xdc, + 0xa4, 0x84, 0xa3, 0xff, 0x43, 0x2d, 0xa2, 0x81, 0x37, 0xe1, 0xfe, 0x82, 0x46, 0x9c, 0x2c, 0x96, + 0x92, 0x3a, 0x15, 0x6f, 0x0a, 0xd4, 0x59, 0x81, 0xe8, 0x33, 0xd8, 0x8a, 0x38, 0x09, 0xf9, 0x5a, + 0x5c, 0x5e, 0xc6, 0xd5, 0x24, 0x9c, 0x05, 0xb6, 0x6e, 0x14, 0xd0, 0x6c, 0x12, 0x78, 0xd1, 0x15, + 0x99, 0x51, 0xf4, 0x25, 0xec, 0xbb, 0x6c, 0xb1, 0x88, 0x03, 0xdf, 0x25, 0x5c, 0x9c, 0x81, 0x06, + 0x2e, 0xf3, 0xfc, 0xe0, 0x52, 0x56, 0xd1, 0xec, 0x1c, 0xde, 0xbb, 0xe7, 0xb7, 0x52, 0x37, 0xda, + 0x85, 0x62, 0x44, 0xa9, 0x17, 0xc9, 0x2a, 0x55, 0x9c, 0x18, 0xc8, 0x83, 0xfd, 0x28, 0x5e, 0x2e, + 0x59, 0xc8, 0xa9, 0x37, 0x59, 0x6b, 0x2d, 0x4a, 0xc7, 0xf6, 0xdf, 0xd8, 0xc6, 0x7b, 0x59, 0xb2, + 0x35, 0x34, 0x32, 0x9b, 0xd0, 0x78, 0xfc, 0xd0, 0x19, 0x83, 0xbf, 0xe5, 0x01, 0x3a, 0x73, 0x9f, + 0x06, 0xdc, 0x88, 0xf9, 0x15, 0x3a, 0x80, 0x72, 0x1c, 0xd1, 0x30, 0x20, 0x0b, 0x9a, 0xf4, 0x85, + 0x33, 0x5b, 0xf8, 0x96, 0x24, 0x8a, 0xde, 0xb1, 0xd0, 0x4b, 0x7b, 0xc9, 0x6c, 0x74, 0x0c, 0x7a, + 0x40, 0xf9, 0x24, 0xa4, 0x24, 0xe1, 0x9f, 0xc5, 0x5c, 0x36, 0x22, 0x84, 0x5b, 0x0b, 0x28, 0xc7, + 0x94, 0xc8, 0x11, 0xb0, 0x98, 0xa3, 0x97, 0xb0, 0x2d, 0x62, 0xdf, 0x85, 0x3e, 0xa7, 0x59, 0x70, + 0x21, 0x55, 0xf1, 0x56, 0x40, 0xf9, 0x6b, 0xe1, 0x59, 0x45, 0x37, 0xa1, 0xe2, 0xd1, 0x88, 0xfb, + 0x81, 0x6c, 0x40, 0xea, 0x47, 0xc3, 0xeb, 0x10, 0x3a, 0x04, 0xcd, 0x95, 0x1d, 0x4c, 0x7c, 0xaf, + 0xbe, 0x91, 0x1c, 0x3a, 0x01, 0xba, 0x1e, 0xda, 0x87, 0x8d, 0x37, 0xfe, 0x9c, 0xd3, 0xb0, 0x5e, + 0x92, 0x9e, 0xd4, 0x7a, 0x4c, 0x05, 0xe5, 0xc7, 0x54, 0x60, 0x1e, 0x40, 0xfd, 0x61, 0x67, 0x99, + 0x2a, 0x0f, 0xe1, 0xd9, 0x3f, 0x3a, 0xc9, 0x98, 0x25, 0xa0, 0x1a, 0xee, 0x0c, 0x3d, 0x07, 0xa0, + 0x61, 0xc8, 0xc2, 0x89, 0xcb, 0x3c, 0x9a, 0x5d, 0x66, 0x4d, 0x62, 0x1d, 0xe6, 0x51, 0xf4, 0x02, + 0x36, 0x93, 0x80, 0x05, 0x8d, 0x22, 0x72, 0x49, 0x25, 0xb7, 0x1a, 0xae, 0x4a, 0xf0, 0x3c, 0xc1, + 0xcc, 0x5d, 0x40, 0x77, 0x59, 0xb2, 0x12, 0x14, 0xb4, 0x74, 0x76, 0xee, 0xec, 0x21, 0x51, 0xca, + 0x13, 0x44, 0xe5, 0x1f, 0x10, 0xf5, 0x0c, 0xca, 0x53, 0xc2, 0xdd, 0x2b, 0xe1, 0x53, 0x25, 0x13, + 0x25, 0x69, 0x77, 0xbd, 0xd6, 0xf7, 0xa0, 0x8e, 0xe2, 0xe9, 0xc7, 0x16, 0xf8, 0x97, 0x49, 0xb4, + 0x7e, 0x80, 0xe2, 0x38, 0x88, 0x3e, 0x5d, 0xfe, 0xbf, 0x14, 0x50, 0x4f, 0x29, 0xff, 0xd8, 0xf4, + 0xff, 0x03, 0x78, 0x43, 0x05, 0x3f, 0x91, 0xff, 0x3e, 0x79, 0x5b, 0x8b, 0x58, 0x93, 0xc8, 0xc8, + 0x7f, 0x2f, 0x2e, 0x47, 0x69, 0x5d, 0xca, 0xaa, 0x9d, 0xc3, 0x2b, 0x00, 0xed, 0x42, 0x21, 0x0e, + 0x7c, 0x2e, 0xb5, 0x2b, 0x34, 0x2e, 0x2d, 0x74, 0x08, 0x65, 0x12, 0x73, 0x36, 0x21, 0xee, 0x4c, + 0xaa, 0xb6, 0x6c, 0xe7, 0x71, 0x49, 0x20, 0x86, 0x3b, 0x13, 0x4f, 0xe0, 0x43, 0xb1, 0xd5, 0xa0, + 0x2a, 0xf6, 0x65, 0x36, 0x02, 0x7d, 0xb5, 0x3f, 0x13, 0x84, 0x01, 0xe5, 0x54, 0x31, 0xd1, 0xbd, + 0x81, 0x2a, 0xf7, 0x06, 0x2a, 0x6e, 0x72, 0x2a, 0x36, 0xf1, 0x2a, 0xa9, 0xe2, 0x26, 0xaf, 0xec, + 0xd6, 0x8f, 0x50, 0x38, 0x89, 0x17, 0x4b, 0x54, 0x87, 0xd2, 0x5b, 0x16, 0x87, 0x01, 0x99, 0xa7, + 0x54, 0xad, 0x4c, 0xf9, 0x0e, 0xb0, 0xc8, 0xe7, 0xab, 0x8f, 0x8f, 0x8a, 0x33, 0x1b, 0x35, 0x40, + 0xbb, 0xbb, 0x50, 0x6a, 0x4a, 0xc4, 0x1d, 0x64, 0xee, 0xc0, 0x76, 0x66, 0x64, 0xa7, 0x7e, 0x0b, + 0xb5, 0x44, 0xc6, 0x98, 0xcd, 0xe7, 0x53, 0xf2, 0x29, 0xb5, 0x7c, 0x3c, 0x86, 0xca, 0xda, 0x0b, + 0x89, 0x9e, 0xc3, 0x61, 0x67, 0x70, 0x3e, 0xc4, 0xd6, 0x68, 0xd4, 0x1d, 0xf4, 0xc5, 0xd2, 0x70, + 0xba, 0x66, 0xcf, 0x1a, 0xe2, 0x81, 0x33, 0x78, 0xa5, 0xe7, 0x50, 0x19, 0x0a, 0xfd, 0x41, 0xdf, + 0xd2, 0x15, 0xb1, 0xba, 0xe8, 0x75, 0x4d, 0x3d, 0x2f, 0x56, 0xa7, 0x17, 0xdd, 0xa1, 0xae, 0xa2, + 0x12, 0xa8, 0xbd, 0x8b, 0xaf, 0xf5, 0xc2, 0xf1, 0x9f, 0x0a, 0xc0, 0xdd, 0x67, 0x54, 0xa4, 0x1d, + 0x1a, 0x9d, 0x33, 0xe3, 0xd4, 0x72, 0xbe, 0x1d, 0x5a, 0x8f, 0xa4, 0xdd, 0x04, 0xcd, 0x36, 0xfa, + 0x27, 0x23, 0xdb, 0x38, 0x13, 0xb9, 0xeb, 0xb0, 0xdb, 0xe9, 0x75, 0xad, 0xbe, 0x63, 0x8c, 0x1d, + 0xdb, 0xea, 0x3b, 0xdd, 0x8e, 0xe1, 0x74, 0x07, 0x7d, 0x3d, 0x2f, 0x2a, 0x18, 0x9d, 0x33, 0x5d, + 0x45, 0x3a, 0x54, 0x47, 0x63, 0x73, 0xd4, 0xc1, 0xdd, 0xa1, 0x74, 0x15, 0x10, 0x82, 0xda, 0xb8, + 0x7f, 0x0f, 0x2b, 0x8a, 0xf0, 0x53, 0xcb, 0xd1, 0x37, 0x50, 0x15, 0xca, 0xe7, 0xd6, 0x68, 0x64, + 0x9c, 0x5a, 0x23, 0xbd, 0x24, 0xca, 0xa5, 0xf9, 0x3b, 0x67, 0x7a, 0x59, 0x38, 0x47, 0xf6, 0xd8, + 0x39, 0x19, 0xbc, 0xee, 0xeb, 0x9a, 0x68, 0xe7, 0x64, 0x7c, 0x3e, 0xd4, 0x41, 0x9e, 0xca, 0x32, + 0xb0, 0x63, 0x5a, 0x86, 0xa3, 0x57, 0x44, 0x81, 0x64, 0x17, 0x1e, 0xf4, 0x7a, 0xa6, 0xd8, 0x5a, + 0x35, 0xbb, 0xbf, 0xde, 0x34, 0x94, 0x0f, 0x37, 0x0d, 0xe5, 0x8f, 0x9b, 0x86, 0xf2, 0xf3, 0x6d, + 0x23, 0xf7, 0xe1, 0xb6, 0x91, 0xfb, 0xfd, 0xb6, 0x91, 0x83, 0x27, 0x7f, 0x72, 0xcc, 0x4a, 0xf2, + 0x6f, 0x24, 0x69, 0xb2, 0x95, 0xe9, 0x86, 0x74, 0x7c, 0xf1, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xa4, 0x4a, 0x77, 0x25, 0x33, 0x09, 0x00, 0x00, } func (m *Packet) Marshal() (dAtA []byte, err error) { @@ -1323,10 +1288,6 @@ func (m *Packet) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Body) > 0 { i -= len(m.Body) copy(dAtA[i:], m.Body) @@ -1425,10 +1386,6 @@ func (m *HeartBeat) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.StartTimestamp != 0 { i = encodeVarintCanalProtocol(dAtA, i, uint64(m.StartTimestamp)) i-- @@ -1462,10 +1419,6 @@ func (m *Handshake) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.SupportedCompressions != 0 { i = encodeVarintCanalProtocol(dAtA, i, uint64(m.SupportedCompressions)) i-- @@ -1524,10 +1477,6 @@ func (m *ClientAuth) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.StartTimestamp != 0 { i = encodeVarintCanalProtocol(dAtA, i, uint64(m.StartTimestamp)) i-- @@ -1633,10 +1582,6 @@ func (m *Ack) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.ErrorMessage) > 0 { i -= len(m.ErrorMessage) copy(dAtA[i:], m.ErrorMessage) @@ -1688,10 +1633,6 @@ func (m *ClientAck) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.BatchId != 0 { i = encodeVarintCanalProtocol(dAtA, i, uint64(m.BatchId)) i-- @@ -1734,10 +1675,6 @@ func (m *Sub) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Filter) > 0 { i -= len(m.Filter) copy(dAtA[i:], m.Filter) @@ -1782,10 +1719,6 @@ func (m *Unsub) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Filter) > 0 { i -= len(m.Filter) copy(dAtA[i:], m.Filter) @@ -1830,10 +1763,6 @@ func (m *Get) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.AutoAckPresent != nil { { size := m.AutoAckPresent.Size() @@ -1944,10 +1873,6 @@ func (m *Messages) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Messages) > 0 { for iNdEx := len(m.Messages) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Messages[iNdEx]) @@ -1985,10 +1910,6 @@ func (m *Dump) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.TimestampPresent != nil { { size := m.TimestampPresent.Size() @@ -2045,10 +1966,6 @@ func (m *ClientRollback) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.BatchId != 0 { i = encodeVarintCanalProtocol(dAtA, i, uint64(m.BatchId)) i-- @@ -2104,9 +2021,6 @@ func (m *Packet) Size() (n int) { if l > 0 { n += 1 + l + sovCanalProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2149,9 +2063,6 @@ func (m *HeartBeat) Size() (n int) { if m.StartTimestamp != 0 { n += 1 + sovCanalProtocol(uint64(m.StartTimestamp)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2171,9 +2082,6 @@ func (m *Handshake) Size() (n int) { if m.SupportedCompressions != 0 { n += 1 + sovCanalProtocol(uint64(m.SupportedCompressions)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2222,9 +2130,6 @@ func (m *ClientAuth) Size() (n int) { if m.StartTimestamp != 0 { n += 1 + sovCanalProtocol(uint64(m.StartTimestamp)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2259,9 +2164,6 @@ func (m *Ack) Size() (n int) { if l > 0 { n += 1 + l + sovCanalProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2291,9 +2193,6 @@ func (m *ClientAck) Size() (n int) { if m.BatchId != 0 { n += 1 + sovCanalProtocol(uint64(m.BatchId)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2315,9 +2214,6 @@ func (m *Sub) Size() (n int) { if l > 0 { n += 1 + l + sovCanalProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2339,9 +2235,6 @@ func (m *Unsub) Size() (n int) { if l > 0 { n += 1 + l + sovCanalProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2371,9 +2264,6 @@ func (m *Get) Size() (n int) { if m.AutoAckPresent != nil { n += m.AutoAckPresent.Size() } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2419,9 +2309,6 @@ func (m *Messages) Size() (n int) { n += 1 + l + sovCanalProtocol(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2441,9 +2328,6 @@ func (m *Dump) Size() (n int) { if m.TimestampPresent != nil { n += m.TimestampPresent.Size() } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2473,9 +2357,6 @@ func (m *ClientRollback) Size() (n int) { if m.BatchId != 0 { n += 1 + sovCanalProtocol(uint64(m.BatchId)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2639,7 +2520,6 @@ func (m *Packet) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2728,7 +2608,6 @@ func (m *HeartBeat) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2864,7 +2743,6 @@ func (m *Handshake) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3136,7 +3014,6 @@ func (m *ClientAuth) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3239,7 +3116,6 @@ func (m *Ack) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3373,7 +3249,6 @@ func (m *ClientAck) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3520,7 +3395,6 @@ func (m *Sub) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3667,7 +3541,6 @@ func (m *Unsub) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3862,7 +3735,6 @@ func (m *Get) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3964,7 +3836,6 @@ func (m *Messages) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4086,7 +3957,6 @@ func (m *Dump) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -4220,7 +4090,6 @@ func (m *ClientRollback) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } diff --git a/proto/canal/EntryProtocol.pb.go b/proto/canal/EntryProtocol.pb.go index 8d408d3e8d4..cf947639d74 100644 --- a/proto/canal/EntryProtocol.pb.go +++ b/proto/canal/EntryProtocol.pb.go @@ -5,7 +5,7 @@ package com_alibaba_otter_canal_protocol import ( fmt "fmt" - proto "github.com/golang/protobuf/proto" + proto "github.com/gogo/protobuf/proto" io "io" math "math" math_bits "math/bits" @@ -20,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.ProtoPackageIsVersion3 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package //*打散后的事件类型，主要用于标识事务的开始，变更数据，结束* type EntryType int32 @@ -177,10 +177,7 @@ type Entry struct { // *Entry_EntryType EntryTypePresent isEntry_EntryTypePresent `protobuf_oneof:"entryType_present"` //*传输的二进制数组* - StoreValue []byte `protobuf:"bytes,3,opt,name=storeValue,proto3" json:"storeValue,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + StoreValue []byte `protobuf:"bytes,3,opt,name=storeValue,proto3" json:"storeValue,omitempty"` } func (m *Entry) Reset() { *m = Entry{} } @@ -299,10 +296,7 @@ type Header struct { //*预留扩展* Props []*Pair `protobuf:"bytes,12,rep,name=props,proto3" json:"props,omitempty"` //*当前事务的gitd* - Gtid string `protobuf:"bytes,13,opt,name=gtid,proto3" json:"gtid,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Gtid string `protobuf:"bytes,13,opt,name=gtid,proto3" json:"gtid,omitempty"` } func (m *Header) Reset() { *m = Header{} } @@ -511,10 +505,7 @@ type Column struct { //* 对应数据对象原始长度 * Length int32 `protobuf:"varint,9,opt,name=length,proto3" json:"length,omitempty"` //*字段mysql类型* - MysqlType string `protobuf:"bytes,10,opt,name=mysqlType,proto3" json:"mysqlType,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + MysqlType string `protobuf:"bytes,10,opt,name=mysqlType,proto3" json:"mysqlType,omitempty"` } func (m *Column) Reset() { *m = Column{} } @@ -652,10 +643,7 @@ type RowData struct { //* 字段信息，增量数据(修改后,新增后) * AfterColumns []*Column `protobuf:"bytes,2,rep,name=afterColumns,proto3" json:"afterColumns,omitempty"` //*预留扩展* - Props []*Pair `protobuf:"bytes,3,rep,name=props,proto3" json:"props,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Props []*Pair `protobuf:"bytes,3,rep,name=props,proto3" json:"props,omitempty"` } func (m *RowData) Reset() { *m = RowData{} } @@ -733,10 +721,7 @@ type RowChange struct { //*预留扩展* Props []*Pair `protobuf:"bytes,13,rep,name=props,proto3" json:"props,omitempty"` //* ddl/query的schemaName，会存在跨库ddl，需要保留执行ddl的当前schemaName * - DdlSchemaName string `protobuf:"bytes,14,opt,name=ddlSchemaName,proto3" json:"ddlSchemaName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + DdlSchemaName string `protobuf:"bytes,14,opt,name=ddlSchemaName,proto3" json:"ddlSchemaName,omitempty"` } func (m *RowChange) Reset() { *m = RowChange{} } @@ -872,10 +857,7 @@ type TransactionBegin struct { //*预留扩展* Props []*Pair `protobuf:"bytes,3,rep,name=props,proto3" json:"props,omitempty"` //*执行的thread Id* - ThreadId int64 `protobuf:"varint,4,opt,name=threadId,proto3" json:"threadId,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ThreadId int64 `protobuf:"varint,4,opt,name=threadId,proto3" json:"threadId,omitempty"` } func (m *TransactionBegin) Reset() { *m = TransactionBegin{} } @@ -946,10 +928,7 @@ type TransactionEnd struct { //*事务号* TransactionId string `protobuf:"bytes,2,opt,name=transactionId,proto3" json:"transactionId,omitempty"` //*预留扩展* - Props []*Pair `protobuf:"bytes,3,rep,name=props,proto3" json:"props,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Props []*Pair `protobuf:"bytes,3,rep,name=props,proto3" json:"props,omitempty"` } func (m *TransactionEnd) Reset() { *m = TransactionEnd{} } @@ -1008,11 +987,8 @@ func (m *TransactionEnd) GetProps() []*Pair { //*预留扩展* type Pair struct { - Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` - Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Key string `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"` + Value string `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"` } func (m *Pair) Reset() { *m = Pair{} } @@ -1079,74 +1055,75 @@ func init() { func init() { proto.RegisterFile("EntryProtocol.proto", fileDescriptor_237ce6ff565bd62b) } var fileDescriptor_237ce6ff565bd62b = []byte{ - // 1071 bytes of a gzipped FileDescriptorProto + // 1081 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xdb, 0x46, - 0x10, 0x16, 0xf5, 0xcf, 0xd1, 0x8f, 0x37, 0x1b, 0x23, 0x60, 0x83, 0xd6, 0x10, 0x04, 0xa3, 0x70, - 0x5d, 0x40, 0x07, 0xf7, 0xda, 0x43, 0x48, 0x6a, 0x61, 0x09, 0x96, 0x28, 0x65, 0xbd, 0x4e, 0xed, - 0x53, 0x41, 0x8b, 0x6b, 0x5b, 0x28, 0x45, 0x2a, 0x24, 0xe5, 0xc4, 0xd7, 0x3e, 0x44, 0xd1, 0xe7, - 0x28, 0xfa, 0x10, 0x05, 0x7a, 0xe9, 0xa5, 0xf7, 0xc2, 0x45, 0x8e, 0x7d, 0x87, 0x62, 0x97, 0x7f, - 0x52, 0xdb, 0x40, 0x8e, 0x7b, 0xc9, 0x6d, 0x66, 0xb4, 0xdf, 0xf0, 0x9b, 0x99, 0x6f, 0x76, 0x05, - 0x4f, 0x89, 0x17, 0x05, 0x77, 0xd3, 0xc0, 0x8f, 0xfc, 0x99, 0xef, 0xf6, 0x96, 0xc2, 0xc0, 0x9d, - 0x99, 0xbf, 0xe8, 0xd9, 0xee, 0xfc, 0xd2, 0xbe, 0xb4, 0x7b, 0x7e, 0x14, 0xf1, 0xa0, 0x37, 0xb3, - 0x3d, 0x3b, 0xf9, 0x79, 0xe6, 0xbb, 0xdd, 0x5f, 0x15, 0xa8, 0x48, 0x24, 0x7e, 0x01, 0xd5, 0x1b, - 0x6e, 0x3b, 0x3c, 0xd0, 0x94, 0x8e, 0x72, 0xd0, 0x38, 0x3a, 0xe8, 0x6d, 0x03, 0xf7, 0x06, 0xf2, - 0x3c, 0x4d, 0x70, 0xf8, 0x04, 0x54, 0x2e, 0x52, 0xb1, 0xbb, 0x25, 0xd7, 0x8a, 0x1d, 0xe5, 0xa0, - 0x7d, 0xf4, 0xe5, 0xf6, 0x24, 0x24, 0x85, 0x0c, 0x0a, 0x34, 0xc7, 0xe3, 0x3d, 0x80, 0x30, 0xf2, - 0x03, 0xfe, 0xca, 0x76, 0x57, 0x5c, 0x2b, 0x75, 0x94, 0x83, 0x26, 0x5d, 0x8b, 0x18, 0x4f, 0xe1, - 0x49, 0x76, 0xf8, 0xdb, 0x65, 0xc0, 0x43, 0xee, 0x45, 0xdd, 0xdf, 0xcb, 0x50, 0x8d, 0x49, 0xe1, - 0xe7, 0x50, 0xbb, 0xe5, 0x41, 0x38, 0xf7, 0x3d, 0x59, 0x4f, 0x65, 0x50, 0xa0, 0x69, 0x00, 0x77, - 0xa0, 0xe1, 0xfa, 0xd7, 0x57, 0x73, 0x97, 0x5b, 0xf6, 0x22, 0xa6, 0xaa, 0xd2, 0xf5, 0x10, 0xde, - 0x87, 0x56, 0xe2, 0x4e, 0xae, 0xae, 0x42, 0x1e, 0x49, 0x02, 0x25, 0xba, 0x19, 0xc4, 0xcf, 0xa1, - 0x1e, 0xf2, 0xe0, 0x96, 0x07, 0x43, 0x47, 0x2b, 0xcb, 0x03, 0x99, 0x8f, 0xbb, 0xd0, 0x8c, 0x6d, - 0xee, 0x99, 0xbe, 0xc3, 0xb5, 0x8a, 0xfc, 0xc8, 0x46, 0x4c, 0xf0, 0xe0, 0x6f, 0xf9, 0x6c, 0x15, - 0x71, 0x36, 0x5f, 0x70, 0xad, 0x2a, 0x53, 0xac, 0x87, 0xf0, 0x00, 0x20, 0xf4, 0x57, 0xc1, 0x8c, - 0xcb, 0x9e, 0xd6, 0x64, 0x4f, 0x3f, 0xdf, 0xde, 0x53, 0xd9, 0x4e, 0x85, 0xae, 0x61, 0x65, 0x3f, - 0x67, 0x37, 0x7c, 0x61, 0xcb, 0x92, 0xeb, 0x92, 0xcd, 0x5a, 0x04, 0x7f, 0x0a, 0x6a, 0x64, 0x5f, - 0x26, 0x1d, 0x51, 0xe5, 0xcf, 0x79, 0x40, 0x32, 0xbd, 0xe5, 0x5e, 0x34, 0xe2, 0xde, 0x75, 0x74, - 0xa3, 0x41, 0xc2, 0x34, 0x0f, 0xc9, 0xe1, 0x0b, 0x57, 0x12, 0x6d, 0x3c, 0x78, 0xf8, 0x29, 0x64, - 0x50, 0xa4, 0x39, 0x1e, 0x7f, 0x0d, 0x95, 0x65, 0xe0, 0x2f, 0x43, 0xad, 0xd9, 0x29, 0x1d, 0x34, - 0x1e, 0x52, 0xf1, 0xd4, 0x9e, 0x07, 0x34, 0x06, 0x61, 0x0c, 0xe5, 0xeb, 0x68, 0xee, 0x68, 0x2d, - 0x59, 0x85, 0xb4, 0x8d, 0x27, 0xb0, 0x93, 0x4c, 0x3f, 0x15, 0x8b, 0xb1, 0x0b, 0x38, 0xef, 0x4f, - 0x16, 0x15, 0xba, 0x4a, 0x79, 0x64, 0xba, 0xfa, 0xa9, 0x08, 0x55, 0xd3, 0x77, 0x57, 0x0b, 0x0f, - 0xef, 0x42, 0x65, 0xee, 0x39, 0xfc, 0x6d, 0xac, 0x2a, 0x1a, 0x3b, 0x58, 0x83, 0x5a, 0xf8, 0xda, - 0xcd, 0x84, 0x5f, 0xa1, 0xa9, 0x2b, 0xc8, 0x78, 0xa2, 0xa5, 0xa5, 0x98, 0x8c, 0xb0, 0x65, 0x8e, - 0xf0, 0x84, 0xdf, 0x49, 0xd1, 0xd4, 0x69, 0xec, 0x88, 0x1c, 0xab, 0xa5, 0x63, 0x47, 0xdc, 0x91, - 0x62, 0xa9, 0xd3, 0xd4, 0xc5, 0x1a, 0x54, 0xe7, 0xa1, 0xb5, 0x72, 0x5d, 0x29, 0x91, 0xfa, 0xa0, - 0x40, 0x13, 0x3f, 0x6f, 0x54, 0xed, 0x31, 0x8d, 0xda, 0x85, 0xca, 0xad, 0x5c, 0xaf, 0x58, 0x0e, - 0xb1, 0x83, 0x9f, 0x41, 0xd5, 0x8d, 0xc7, 0xac, 0xca, 0x52, 0x12, 0x4f, 0x28, 0x64, 0x71, 0x97, - 0x56, 0x09, 0xb1, 0x42, 0xb2, 0x80, 0x81, 0xa0, 0x1d, 0x73, 0xca, 0x9a, 0xf6, 0x4e, 0x81, 0x1a, - 0xf5, 0xdf, 0xf4, 0xed, 0xc8, 0xc6, 0x16, 0xb4, 0x2e, 0xf9, 0x95, 0x1f, 0xf0, 0xb8, 0x8b, 0xa1, - 0xa6, 0x48, 0xbe, 0x0f, 0xb8, 0x63, 0x62, 0x00, 0xdd, 0x84, 0xe3, 0x11, 0x34, 0xed, 0xab, 0x88, - 0x07, 0x69, 0xba, 0xe2, 0x07, 0xa6, 0xdb, 0x40, 0xe7, 0x5d, 0x2c, 0x3d, 0xa2, 0x8b, 0xdd, 0xbf, - 0x8a, 0xa0, 0x52, 0xff, 0x8d, 0x79, 0x63, 0x7b, 0xd7, 0x5c, 0x4c, 0x51, 0xae, 0xcd, 0xd0, 0x91, - 0x0a, 0x29, 0xd1, 0xd4, 0xdd, 0xdc, 0x90, 0xe2, 0x87, 0x6f, 0x48, 0x61, 0x7d, 0x43, 0x9e, 0x09, - 0x09, 0xf5, 0x1d, 0x57, 0x0e, 0xa2, 0x3e, 0x50, 0x68, 0xec, 0x62, 0x04, 0xa5, 0xf0, 0xb5, 0x2b, - 0x17, 0x50, 0xa5, 0xc2, 0xc4, 0x04, 0xea, 0x41, 0x3c, 0x85, 0x74, 0x9d, 0xbe, 0xd8, 0xfe, 0xd5, - 0x64, 0x6e, 0x34, 0x83, 0xe6, 0x3d, 0x6a, 0x3d, 0x46, 0x69, 0xfb, 0xd0, 0x72, 0x1c, 0xf7, 0x34, - 0xbf, 0x80, 0xda, 0x92, 0xe0, 0x66, 0xf0, 0x3f, 0x77, 0xcf, 0xd8, 0x81, 0x96, 0x2c, 0x2d, 0xd3, - 0xd5, 0xcf, 0x0a, 0x20, 0x16, 0xd8, 0x5e, 0x68, 0xcf, 0xa2, 0xb9, 0xef, 0x19, 0xfc, 0x7a, 0xee, - 0xfd, 0xf3, 0x2a, 0x55, 0xfe, 0x7d, 0x95, 0xee, 0x43, 0x2b, 0xca, 0x51, 0x43, 0x27, 0xb9, 0xf6, - 0x37, 0x83, 0xff, 0x4f, 0x0a, 0xe2, 0x41, 0x88, 0x6e, 0x02, 0x6e, 0x3b, 0xf9, 0x83, 0x90, 0xfa, - 0xdd, 0x1f, 0x14, 0x68, 0xaf, 0xd1, 0x26, 0x9e, 0xf3, 0x71, 0x90, 0xee, 0xf6, 0xa0, 0x2c, 0x5c, - 0x21, 0x9d, 0xef, 0xf8, 0x9d, 0x64, 0xa1, 0x52, 0x61, 0xe6, 0xf7, 0x43, 0x71, 0xed, 0x7e, 0x38, - 0xfc, 0x5e, 0x01, 0x35, 0x7b, 0xb4, 0xf1, 0x67, 0xf0, 0x09, 0xb1, 0x18, 0xbd, 0x60, 0x17, 0x53, - 0x62, 0x4e, 0xc6, 0x53, 0x9d, 0x0d, 0x8d, 0x11, 0x99, 0xd2, 0x09, 0x9b, 0x1c, 0xa1, 0x02, 0xde, - 0x05, 0xc4, 0xa8, 0x6e, 0x9d, 0xea, 0x26, 0x1b, 0x4e, 0x2c, 0x83, 0x1c, 0x0f, 0x2d, 0xa4, 0xe0, - 0x06, 0xd4, 0xe8, 0xe4, 0x9b, 0xbe, 0xce, 0x74, 0x54, 0xc4, 0x18, 0xda, 0x6b, 0x47, 0x88, 0xd5, - 0x47, 0x25, 0x11, 0x93, 0x59, 0x07, 0x44, 0xa7, 0xcc, 0x20, 0x3a, 0x43, 0x65, 0x01, 0x3a, 0x66, - 0xc3, 0xfe, 0x68, 0x72, 0x8c, 0x2a, 0x87, 0xef, 0x04, 0x89, 0x6c, 0x1b, 0x04, 0x89, 0x57, 0xc4, - 0x62, 0xef, 0x21, 0x01, 0x50, 0x1d, 0x5a, 0xa7, 0x84, 0x32, 0xa4, 0x08, 0xfb, 0x6c, 0xda, 0xd7, - 0x19, 0x41, 0x45, 0x61, 0xf7, 0xc9, 0x88, 0x30, 0x82, 0x4a, 0xc2, 0x36, 0x29, 0x11, 0xf1, 0x32, - 0x56, 0xa1, 0xa2, 0x8f, 0x18, 0xa1, 0xa8, 0x22, 0x4c, 0x42, 0xf5, 0x53, 0x82, 0xaa, 0xc2, 0x7c, - 0x79, 0x46, 0xe8, 0x05, 0xaa, 0xe1, 0x26, 0xd4, 0x19, 0x3d, 0xb3, 0x4c, 0x71, 0xbc, 0x2e, 0xa0, - 0x94, 0x58, 0xfa, 0x98, 0x20, 0x55, 0xa6, 0x19, 0x5a, 0x7d, 0x72, 0x8e, 0x40, 0xa6, 0x8f, 0xed, - 0x06, 0xae, 0x43, 0x59, 0x90, 0x47, 0x4d, 0x81, 0x3d, 0xd7, 0xcd, 0xc9, 0x78, 0x3c, 0x64, 0xa8, - 0x85, 0xdb, 0x00, 0xe7, 0x3a, 0x9d, 0x8c, 0x46, 0x86, 0x6e, 0x9e, 0xa0, 0xb6, 0xf0, 0xc7, 0x79, - 0xd1, 0x3b, 0x87, 0x06, 0x94, 0x65, 0x85, 0x1a, 0xec, 0xbe, 0xbf, 0xb8, 0x09, 0xd5, 0xcd, 0x11, - 0x41, 0x8a, 0xa0, 0x38, 0xbe, 0x38, 0x7d, 0x39, 0x42, 0x45, 0x61, 0x4e, 0x8f, 0x85, 0x59, 0x32, - 0x5e, 0xfc, 0x72, 0xbf, 0xa7, 0xfc, 0x76, 0xbf, 0xa7, 0xfc, 0x71, 0xbf, 0xa7, 0xfc, 0xf8, 0xe7, - 0x5e, 0x01, 0xb6, 0xfe, 0x2f, 0x34, 0xc0, 0x14, 0xbe, 0x1c, 0xf3, 0x40, 0xb9, 0xac, 0xca, 0xf8, - 0x57, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x73, 0xa7, 0xa0, 0xc6, 0x65, 0x0a, 0x00, 0x00, + 0x10, 0x16, 0xf5, 0xcf, 0xd1, 0x8f, 0x37, 0x1b, 0x23, 0x60, 0x83, 0x56, 0x10, 0x04, 0xa3, 0x70, + 0x5d, 0x40, 0x07, 0xf7, 0xda, 0x43, 0x49, 0x6a, 0x61, 0x09, 0x96, 0x28, 0x65, 0xbd, 0x4e, 0xed, + 0x53, 0x41, 0x8b, 0x6b, 0x5b, 0x28, 0x45, 0x2a, 0x24, 0xe5, 0xc4, 0xd7, 0x3e, 0x41, 0x4f, 0x7d, + 0x90, 0xa2, 0x0f, 0x51, 0xa0, 0x97, 0x5c, 0x0a, 0xf4, 0x58, 0xd8, 0xc8, 0xb1, 0xef, 0x50, 0xec, + 0x52, 0x24, 0xa5, 0xb6, 0x81, 0x1c, 0xf7, 0x92, 0xdb, 0xcc, 0x68, 0xbf, 0xe1, 0x37, 0x33, 0xdf, + 0xec, 0x0a, 0x9e, 0x12, 0x2f, 0x0a, 0x6e, 0x27, 0x81, 0x1f, 0xf9, 0x53, 0xdf, 0xed, 0x2e, 0x84, + 0x81, 0xdb, 0x53, 0x7f, 0xde, 0xb5, 0xdd, 0xd9, 0x85, 0x7d, 0x61, 0x77, 0xfd, 0x28, 0xe2, 0x41, + 0x77, 0x6a, 0x7b, 0xf6, 0xea, 0xe7, 0xa9, 0xef, 0x76, 0x7e, 0x53, 0xa0, 0x24, 0x91, 0xf8, 0x1b, + 0x28, 0x5f, 0x73, 0xdb, 0xe1, 0x81, 0xa6, 0xb4, 0x95, 0xfd, 0xda, 0xe1, 0x7e, 0x77, 0x1b, 0xb8, + 0xdb, 0x97, 0xe7, 0xe9, 0x0a, 0x87, 0x8f, 0x41, 0xe5, 0x22, 0x15, 0xbb, 0x5d, 0x70, 0x2d, 0xdf, + 0x56, 0xf6, 0x9b, 0x87, 0x5f, 0x6e, 0x4f, 0x42, 0x12, 0x48, 0x3f, 0x47, 0x33, 0x3c, 0x6e, 0x01, + 0x84, 0x91, 0x1f, 0xf0, 0x97, 0xb6, 0xbb, 0xe4, 0x5a, 0xa1, 0xad, 0xec, 0xd7, 0xe9, 0x5a, 0xc4, + 0x78, 0x0a, 0x4f, 0xd2, 0xc3, 0xdf, 0x2d, 0x02, 0x1e, 0x72, 0x2f, 0xea, 0xfc, 0x5e, 0x84, 0x72, + 0x4c, 0x0a, 0x3f, 0x87, 0xca, 0x0d, 0x0f, 0xc2, 0x99, 0xef, 0xc9, 0x7a, 0x4a, 0xfd, 0x1c, 0x4d, + 0x02, 0xb8, 0x0d, 0x35, 0xd7, 0xbf, 0xba, 0x9c, 0xb9, 0xdc, 0xb2, 0xe7, 0x31, 0x55, 0x95, 0xae, + 0x87, 0xf0, 0x1e, 0x34, 0x56, 0xee, 0xf8, 0xf2, 0x32, 0xe4, 0x91, 0x24, 0x50, 0xa0, 0x9b, 0x41, + 0xfc, 0x1c, 0xaa, 0x21, 0x0f, 0x6e, 0x78, 0x30, 0x70, 0xb4, 0xa2, 0x3c, 0x90, 0xfa, 0xb8, 0x03, + 0xf5, 0xd8, 0xe6, 0x9e, 0xe9, 0x3b, 0x5c, 0x2b, 0xc9, 0x8f, 0x6c, 0xc4, 0x04, 0x0f, 0xfe, 0x86, + 0x4f, 0x97, 0x11, 0x67, 0xb3, 0x39, 0xd7, 0xca, 0x32, 0xc5, 0x7a, 0x08, 0xf7, 0x01, 0x42, 0x7f, + 0x19, 0x4c, 0xb9, 0xec, 0x69, 0x45, 0xf6, 0xf4, 0xf3, 0xed, 0x3d, 0x95, 0xed, 0x54, 0xe8, 0x1a, + 0x56, 0xf6, 0x73, 0x7a, 0xcd, 0xe7, 0xb6, 0x2c, 0xb9, 0x2a, 0xd9, 0xac, 0x45, 0xf0, 0xa7, 0xa0, + 0x46, 0xf6, 0xc5, 0xaa, 0x23, 0xaa, 0xfc, 0x39, 0x0b, 0x48, 0xa6, 0x37, 0xdc, 0x8b, 0x86, 0xdc, + 0xbb, 0x8a, 0xae, 0x35, 0x58, 0x31, 0xcd, 0x42, 0x72, 0xf8, 0xc2, 0x95, 0x44, 0x6b, 0x0f, 0x1e, + 0x7e, 0x02, 0xe9, 0xe7, 0x69, 0x86, 0xc7, 0x5f, 0x43, 0x69, 0x11, 0xf8, 0x8b, 0x50, 0xab, 0xb7, + 0x0b, 0xfb, 0xb5, 0x87, 0x54, 0x3c, 0xb1, 0x67, 0x01, 0x8d, 0x41, 0x18, 0x43, 0xf1, 0x2a, 0x9a, + 0x39, 0x5a, 0x43, 0x56, 0x21, 0x6d, 0xe3, 0x09, 0xec, 0xac, 0xa6, 0x9f, 0x88, 0xc5, 0xd8, 0x05, + 0x9c, 0xf5, 0x27, 0x8d, 0x0a, 0x5d, 0x25, 0x3c, 0x52, 0x5d, 0xfd, 0x9c, 0x87, 0xb2, 0xe9, 0xbb, + 0xcb, 0xb9, 0x87, 0x77, 0xa1, 0x34, 0xf3, 0x1c, 0xfe, 0x26, 0x56, 0x15, 0x8d, 0x1d, 0xac, 0x41, + 0x25, 0x7c, 0xe5, 0xa6, 0xc2, 0x2f, 0xd1, 0xc4, 0x15, 0x64, 0x3c, 0xd1, 0xd2, 0x42, 0x4c, 0x46, + 0xd8, 0x32, 0x47, 0x78, 0xcc, 0x6f, 0xa5, 0x68, 0xaa, 0x34, 0x76, 0x44, 0x8e, 0xe5, 0xc2, 0xb1, + 0x23, 0xee, 0x48, 0xb1, 0x54, 0x69, 0xe2, 0x62, 0x0d, 0xca, 0xb3, 0xd0, 0x5a, 0xba, 0xae, 0x94, + 0x48, 0xb5, 0x9f, 0xa3, 0x2b, 0x3f, 0x6b, 0x54, 0xe5, 0x31, 0x8d, 0xda, 0x85, 0xd2, 0x8d, 0x5c, + 0xaf, 0x58, 0x0e, 0xb1, 0x83, 0x9f, 0x41, 0xd9, 0x8d, 0xc7, 0xac, 0xca, 0x52, 0x56, 0x9e, 0x50, + 0xc8, 0xfc, 0x36, 0xa9, 0x12, 0x62, 0x85, 0xa4, 0x01, 0x03, 0x41, 0x33, 0xe6, 0x94, 0x36, 0xed, + 0x9d, 0x02, 0x15, 0xea, 0xbf, 0xee, 0xd9, 0x91, 0x8d, 0x2d, 0x68, 0x5c, 0xf0, 0x4b, 0x3f, 0xe0, + 0x71, 0x17, 0x43, 0x4d, 0x91, 0x7c, 0x1f, 0x70, 0xc7, 0xc4, 0x00, 0xba, 0x09, 0xc7, 0x43, 0xa8, + 0xdb, 0x97, 0x11, 0x0f, 0x92, 0x74, 0xf9, 0x0f, 0x4c, 0xb7, 0x81, 0xce, 0xba, 0x58, 0x78, 0x44, + 0x17, 0x3b, 0x7f, 0xe5, 0x41, 0xa5, 0xfe, 0x6b, 0xf3, 0xda, 0xf6, 0xae, 0xb8, 0x98, 0xa2, 0x5c, + 0x9b, 0x81, 0x23, 0x15, 0x52, 0xa0, 0x89, 0xbb, 0xb9, 0x21, 0xf9, 0x0f, 0xdf, 0x90, 0xdc, 0xfa, + 0x86, 0x3c, 0x13, 0x12, 0xea, 0x39, 0xae, 0x1c, 0x44, 0xb5, 0xaf, 0xd0, 0xd8, 0xc5, 0x08, 0x0a, + 0xe1, 0x2b, 0x57, 0x2e, 0xa0, 0x4a, 0x85, 0x89, 0x09, 0x54, 0x83, 0x78, 0x0a, 0xc9, 0x3a, 0x7d, + 0xb1, 0xfd, 0xab, 0xab, 0xb9, 0xd1, 0x14, 0x9a, 0xf5, 0xa8, 0xf1, 0x18, 0xa5, 0xed, 0x41, 0xc3, + 0x71, 0xdc, 0x93, 0xec, 0x02, 0x6a, 0x4a, 0x82, 0x9b, 0xc1, 0xff, 0xdc, 0x3d, 0x63, 0x07, 0x1a, + 0xb2, 0xb4, 0x54, 0x57, 0xbf, 0x28, 0x80, 0x58, 0x60, 0x7b, 0xa1, 0x3d, 0x8d, 0x66, 0xbe, 0x67, + 0xf0, 0xab, 0x99, 0xf7, 0xcf, 0xab, 0x54, 0xf9, 0xf7, 0x55, 0xba, 0x07, 0x8d, 0x28, 0x43, 0x0d, + 0x9c, 0xd5, 0xb5, 0xbf, 0x19, 0xfc, 0x7f, 0x52, 0x10, 0x0f, 0x42, 0x74, 0x1d, 0x70, 0xdb, 0xc9, + 0x1e, 0x84, 0xc4, 0xef, 0xfc, 0xa4, 0x40, 0x73, 0x8d, 0x36, 0xf1, 0x9c, 0x8f, 0x83, 0x74, 0xa7, + 0x0b, 0x45, 0xe1, 0x0a, 0xe9, 0x7c, 0xcf, 0x6f, 0x25, 0x0b, 0x95, 0x0a, 0x33, 0xbb, 0x1f, 0xf2, + 0x6b, 0xf7, 0xc3, 0xc1, 0x0f, 0x0a, 0xa8, 0xe9, 0xa3, 0x8d, 0x3f, 0x83, 0x4f, 0x88, 0xc5, 0xe8, + 0x39, 0x3b, 0x9f, 0x10, 0x73, 0x3c, 0x9a, 0xe8, 0x6c, 0x60, 0x0c, 0xc9, 0x84, 0x8e, 0xd9, 0xf8, + 0x10, 0xe5, 0xf0, 0x2e, 0x20, 0x46, 0x75, 0xeb, 0x44, 0x37, 0xd9, 0x60, 0x6c, 0x19, 0xe4, 0x68, + 0x60, 0x21, 0x05, 0xd7, 0xa0, 0x42, 0xc7, 0xdf, 0xf6, 0x74, 0xa6, 0xa3, 0x3c, 0xc6, 0xd0, 0x5c, + 0x3b, 0x42, 0xac, 0x1e, 0x2a, 0x88, 0x98, 0xcc, 0xda, 0x27, 0x3a, 0x65, 0x06, 0xd1, 0x19, 0x2a, + 0x0a, 0xd0, 0x11, 0x1b, 0xf4, 0x86, 0xe3, 0x23, 0x54, 0x3a, 0x78, 0x27, 0x48, 0xa4, 0xdb, 0x20, + 0x48, 0xbc, 0x24, 0x16, 0x7b, 0x0f, 0x09, 0x80, 0xf2, 0xc0, 0x3a, 0x21, 0x94, 0x21, 0x45, 0xd8, + 0xa7, 0x93, 0x9e, 0xce, 0x08, 0xca, 0x0b, 0xbb, 0x47, 0x86, 0x84, 0x11, 0x54, 0x10, 0xb6, 0x49, + 0x89, 0x88, 0x17, 0xb1, 0x0a, 0x25, 0x7d, 0xc8, 0x08, 0x45, 0x25, 0x61, 0x12, 0xaa, 0x9f, 0x10, + 0x54, 0x16, 0xe6, 0x8b, 0x53, 0x42, 0xcf, 0x51, 0x05, 0xd7, 0xa1, 0xca, 0xe8, 0xa9, 0x65, 0x8a, + 0xe3, 0x55, 0x01, 0xa5, 0xc4, 0xd2, 0x47, 0x04, 0xa9, 0x32, 0xcd, 0xc0, 0xea, 0x91, 0x33, 0x04, + 0x32, 0x7d, 0x6c, 0xd7, 0x70, 0x15, 0x8a, 0x82, 0x3c, 0xaa, 0x0b, 0xec, 0x99, 0x6e, 0x8e, 0x47, + 0xa3, 0x01, 0x43, 0x0d, 0xdc, 0x04, 0x38, 0xd3, 0xe9, 0x78, 0x38, 0x34, 0x74, 0xf3, 0x18, 0x35, + 0x85, 0x3f, 0xca, 0x8a, 0xde, 0x39, 0x30, 0xa0, 0x28, 0x2b, 0xd4, 0x60, 0xf7, 0xfd, 0xc5, 0x8d, + 0xa9, 0x6e, 0x0e, 0x09, 0x52, 0x04, 0xc5, 0xd1, 0xf9, 0xc9, 0x8b, 0x21, 0xca, 0x0b, 0x73, 0x72, + 0x24, 0xcc, 0x82, 0xd1, 0xff, 0xf5, 0xae, 0xa5, 0xbc, 0xbd, 0x6b, 0x29, 0x7f, 0xde, 0xb5, 0x94, + 0x1f, 0xef, 0x5b, 0xb9, 0xb7, 0xf7, 0xad, 0xdc, 0x1f, 0xf7, 0xad, 0x1c, 0x6c, 0xfd, 0x7f, 0x68, + 0x80, 0x29, 0x7c, 0x39, 0xee, 0xbe, 0x72, 0x51, 0x96, 0xf1, 0xaf, 0xfe, 0x0e, 0x00, 0x00, 0xff, + 0xff, 0x89, 0x37, 0xf8, 0x04, 0x6d, 0x0a, 0x00, 0x00, } func (m *Entry) Marshal() (dAtA []byte, err error) { @@ -1169,10 +1146,6 @@ func (m *Entry) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.StoreValue) > 0 { i -= len(m.StoreValue) copy(dAtA[i:], m.StoreValue) @@ -1236,10 +1209,6 @@ func (m *Header) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Gtid) > 0 { i -= len(m.Gtid) copy(dAtA[i:], m.Gtid) @@ -1395,10 +1364,6 @@ func (m *Column) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.MysqlType) > 0 { i -= len(m.MysqlType) copy(dAtA[i:], m.MysqlType) @@ -1518,10 +1483,6 @@ func (m *RowData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Props) > 0 { for iNdEx := len(m.Props) - 1; iNdEx >= 0; iNdEx-- { { @@ -1587,10 +1548,6 @@ func (m *RowChange) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.DdlSchemaName) > 0 { i -= len(m.DdlSchemaName) copy(dAtA[i:], m.DdlSchemaName) @@ -1708,10 +1665,6 @@ func (m *TransactionBegin) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.ThreadId != 0 { i = encodeVarintEntryProtocol(dAtA, i, uint64(m.ThreadId)) i-- @@ -1766,10 +1719,6 @@ func (m *TransactionEnd) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Props) > 0 { for iNdEx := len(m.Props) - 1; iNdEx >= 0; iNdEx-- { { @@ -1819,10 +1768,6 @@ func (m *Pair) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Value) > 0 { i -= len(m.Value) copy(dAtA[i:], m.Value) @@ -1868,9 +1813,6 @@ func (m *Entry) Size() (n int) { if l > 0 { n += 1 + l + sovEntryProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1936,9 +1878,6 @@ func (m *Header) Size() (n int) { if l > 0 { n += 1 + l + sovEntryProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2011,9 +1950,6 @@ func (m *Column) Size() (n int) { if l > 0 { n += 1 + l + sovEntryProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2050,9 +1986,6 @@ func (m *RowData) Size() (n int) { n += 1 + l + sovEntryProtocol(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2091,9 +2024,6 @@ func (m *RowChange) Size() (n int) { if l > 0 { n += 1 + l + sovEntryProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2137,9 +2067,6 @@ func (m *TransactionBegin) Size() (n int) { if m.ThreadId != 0 { n += 1 + sovEntryProtocol(uint64(m.ThreadId)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2162,9 +2089,6 @@ func (m *TransactionEnd) Size() (n int) { n += 1 + l + sovEntryProtocol(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2182,9 +2106,6 @@ func (m *Pair) Size() (n int) { if l > 0 { n += 1 + l + sovEntryProtocol(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -2325,7 +2246,6 @@ func (m *Entry) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -2706,7 +2626,6 @@ func (m *Header) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3005,7 +2924,6 @@ func (m *Column) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3158,7 +3076,6 @@ func (m *RowData) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3401,7 +3318,6 @@ func (m *RowChange) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3556,7 +3472,6 @@ func (m *TransactionBegin) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3692,7 +3607,6 @@ func (m *TransactionEnd) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -3807,7 +3721,6 @@ func (m *Pair) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } diff --git a/proto/generate-proto.sh b/proto/generate-proto.sh deleted file mode 100755 index d7bc9d8b2df..00000000000 --- a/proto/generate-proto.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -echo "generate canal & craft benchmark protocol code..." - -[ ! -d ./canal ] && mkdir ./canal -[ ! -d ./benchmark ] && mkdir ./benchmark - -protoc --gofast_out=./canal EntryProtocol.proto -protoc --gofast_out=./canal CanalProtocol.proto -protoc --gofast_out=./benchmark CraftBenchmark.proto -protoc --gofast_out=plugins=grpc:./p2p CDCPeerToPeer.proto diff --git a/proto/p2p/CDCPeerToPeer.pb.go b/proto/p2p/CDCPeerToPeer.pb.go index f33e0245405..3f63b9d0e77 100644 --- a/proto/p2p/CDCPeerToPeer.pb.go +++ b/proto/p2p/CDCPeerToPeer.pb.go @@ -75,10 +75,7 @@ type MessageEntry struct { // using the peer-to-peer mechanism. Content []byte `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` // monotonically increase. - Sequence int64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Sequence int64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"` } func (m *MessageEntry) Reset() { *m = MessageEntry{} } @@ -144,10 +141,7 @@ type StreamMeta struct { // fields required for compatibility check ClientVersion string `protobuf:"bytes,50,opt,name=client_version,json=clientVersion,proto3" json:"client_version,omitempty"` // fields for metrics, logging, debugging, etc. - SenderAdvertisedAddr string `protobuf:"bytes,100,opt,name=sender_advertised_addr,json=senderAdvertisedAddr,proto3" json:"sender_advertised_addr,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + SenderAdvertisedAddr string `protobuf:"bytes,100,opt,name=sender_advertised_addr,json=senderAdvertisedAddr,proto3" json:"sender_advertised_addr,omitempty"` } func (m *StreamMeta) Reset() { *m = StreamMeta{} } @@ -221,10 +215,7 @@ func (m *StreamMeta) GetSenderAdvertisedAddr() string { type MessagePacket struct { Meta *StreamMeta `protobuf:"bytes,1,opt,name=meta,proto3" json:"meta,omitempty"` // multiple messages can be batched. - Entries []*MessageEntry `protobuf:"bytes,2,rep,name=entries,proto3" json:"entries,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Entries []*MessageEntry `protobuf:"bytes,2,rep,name=entries,proto3" json:"entries,omitempty"` } func (m *MessagePacket) Reset() { *m = MessagePacket{} } @@ -278,10 +269,7 @@ type Ack struct { Topic string `protobuf:"bytes,1,opt,name=topic,proto3" json:"topic,omitempty"` // the sequence of an already processed message. // Must be monotonically increasing for a given topic and two given node processes. - LastSeq int64 `protobuf:"varint,2,opt,name=last_seq,json=lastSeq,proto3" json:"last_seq,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + LastSeq int64 `protobuf:"varint,2,opt,name=last_seq,json=lastSeq,proto3" json:"last_seq,omitempty"` } func (m *Ack) Reset() { *m = Ack{} } @@ -332,12 +320,9 @@ func (m *Ack) GetLastSeq() int64 { } type SendMessageResponse struct { - Ack []*Ack `protobuf:"bytes,1,rep,name=ack,proto3" json:"ack,omitempty"` - ExitReason ExitReason `protobuf:"varint,2,opt,name=exit_reason,json=exitReason,proto3,enum=p2p.ExitReason" json:"exit_reason,omitempty"` - ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Ack []*Ack `protobuf:"bytes,1,rep,name=ack,proto3" json:"ack,omitempty"` + ExitReason ExitReason `protobuf:"varint,2,opt,name=exit_reason,json=exitReason,proto3,enum=p2p.ExitReason" json:"exit_reason,omitempty"` + ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"` } func (m *SendMessageResponse) Reset() { *m = SendMessageResponse{} } @@ -406,43 +391,44 @@ func init() { func init() { proto.RegisterFile("CDCPeerToPeer.proto", fileDescriptor_6560df28dddfd2cc) } var fileDescriptor_6560df28dddfd2cc = []byte{ - // 563 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xd1, 0x6e, 0xd3, 0x30, - 0x14, 0xc5, 0xcd, 0xb6, 0xb6, 0xb7, 0xed, 0x16, 0xdc, 0x0a, 0x42, 0x91, 0x46, 0xd5, 0x09, 0xa9, - 0x02, 0x69, 0x4c, 0x05, 0xf1, 0x8a, 0x42, 0x1a, 0x41, 0xb4, 0x35, 0xad, 0x92, 0x14, 0x24, 0x5e, - 0xa2, 0x10, 0x5f, 0x8d, 0xa8, 0x5b, 0x9c, 0xd9, 0x66, 0x1a, 0x7f, 0xc0, 0x13, 0x7f, 0xc4, 0x3b, - 0x8f, 0x7c, 0x02, 0xda, 0x97, 0xa0, 0x3a, 0xe9, 0xd6, 0x09, 0xf1, 0x62, 0xf9, 0x9c, 0x73, 0x7d, - 0x8f, 0x7d, 0xae, 0x0c, 0x5d, 0x67, 0xe2, 0xcc, 0x11, 0x45, 0xc4, 0x57, 0xeb, 0x61, 0x21, 0xb8, - 0xe2, 0xd4, 0x28, 0xc6, 0x45, 0xbf, 0x77, 0xca, 0x4f, 0xb9, 0xc6, 0x2f, 0x56, 0xbb, 0x52, 0x1a, - 0x7e, 0x82, 0xf6, 0x14, 0xa5, 0x4c, 0x4e, 0xd1, 0xcd, 0x95, 0xf8, 0x46, 0x7b, 0xb0, 0xad, 0x78, - 0x91, 0xa5, 0x16, 0x19, 0x90, 0x51, 0x33, 0x28, 0x01, 0xb5, 0xa0, 0x9e, 0xf2, 0x5c, 0x61, 0xae, - 0xac, 0xda, 0x80, 0x8c, 0xda, 0xc1, 0x1a, 0xd2, 0x3e, 0x34, 0x24, 0x5e, 0x7c, 0xc5, 0x3c, 0x45, - 0xcb, 0x18, 0x90, 0x91, 0x11, 0xdc, 0xe0, 0xe1, 0x4f, 0x02, 0x10, 0x2a, 0x81, 0xc9, 0xf9, 0x14, - 0x55, 0x42, 0x1f, 0x43, 0x53, 0x62, 0xce, 0x50, 0xc4, 0x19, 0xab, 0xda, 0x37, 0x4a, 0xc2, 0x63, - 0xf4, 0x09, 0xb4, 0x04, 0xa6, 0x98, 0x5d, 0x96, 0x72, 0x4d, 0xcb, 0xb0, 0xa6, 0x3c, 0xb6, 0xba, - 0x18, 0x16, 0x3c, 0xfd, 0x52, 0xb9, 0x94, 0x80, 0x3e, 0x85, 0xdd, 0xf4, 0x2c, 0xc3, 0x5c, 0xc5, - 0x97, 0x28, 0x64, 0xc6, 0x73, 0x6b, 0xac, 0x4f, 0x76, 0x4a, 0xf6, 0x43, 0x49, 0xd2, 0x57, 0xf0, - 0xa0, 0xb2, 0x4e, 0xd8, 0x25, 0x0a, 0x95, 0x49, 0x64, 0x71, 0xc2, 0x98, 0xb0, 0x98, 0x2e, 0xef, - 0x95, 0xaa, 0x7d, 0x23, 0xda, 0x8c, 0x89, 0x61, 0x02, 0x9d, 0x2a, 0x9b, 0x79, 0x92, 0x2e, 0x51, - 0xd1, 0x03, 0xd8, 0x3a, 0x47, 0x95, 0xe8, 0xcb, 0xb7, 0xc6, 0x7b, 0x87, 0xc5, 0xb8, 0x38, 0xbc, - 0x7d, 0x60, 0xa0, 0x45, 0xfa, 0x1c, 0xea, 0x98, 0x2b, 0x91, 0xa1, 0xb4, 0x6a, 0x03, 0x63, 0xd4, - 0x1a, 0xdf, 0xd7, 0x75, 0x9b, 0x29, 0x07, 0xeb, 0x8a, 0xe1, 0x6b, 0x30, 0xec, 0x74, 0xf9, 0x9f, - 0xd4, 0x1f, 0x41, 0xe3, 0x2c, 0x91, 0x2a, 0x96, 0x78, 0xa1, 0x03, 0x31, 0x82, 0xfa, 0x0a, 0x87, - 0x78, 0x31, 0xfc, 0x4e, 0xa0, 0x1b, 0x62, 0xce, 0xaa, 0xae, 0x01, 0xca, 0x82, 0xe7, 0x12, 0x69, - 0x1f, 0x8c, 0x24, 0x5d, 0x5a, 0x44, 0x1b, 0x37, 0xb4, 0xb1, 0x9d, 0x2e, 0x83, 0x15, 0x49, 0x8f, - 0xa0, 0x85, 0x57, 0x99, 0x8a, 0x05, 0x26, 0x92, 0xe7, 0xba, 0xe3, 0x6e, 0xf5, 0x08, 0xf7, 0x2a, - 0x53, 0x81, 0xa6, 0x03, 0xc0, 0x9b, 0x3d, 0x3d, 0x80, 0x0e, 0x0a, 0xc1, 0x45, 0x7c, 0x5e, 0xda, - 0xe8, 0xec, 0x9b, 0x41, 0x5b, 0x93, 0x95, 0xf5, 0xb3, 0x1f, 0x04, 0xe0, 0xf6, 0x3c, 0x6d, 0x41, - 0x7d, 0xe1, 0x1f, 0xfb, 0xb3, 0x8f, 0xbe, 0x79, 0x8f, 0xee, 0x40, 0x6d, 0x76, 0x6c, 0x12, 0xda, - 0x81, 0xa6, 0x33, 0xf3, 0xdf, 0xb9, 0x61, 0xe4, 0x4e, 0xcc, 0x1a, 0xed, 0xc2, 0x9e, 0x63, 0xcf, - 0xa3, 0x45, 0xe0, 0xc6, 0xe1, 0xc2, 0x73, 0xbc, 0x89, 0x6b, 0x1a, 0xb4, 0x07, 0x66, 0x18, 0xd9, - 0x27, 0x6e, 0xec, 0xcc, 0x7c, 0xdf, 0x75, 0x22, 0x6f, 0xe6, 0x9b, 0x5b, 0xd4, 0x82, 0xde, 0x64, - 0x31, 0x3f, 0xf1, 0x1c, 0x3b, 0xba, 0xa3, 0x6c, 0xd3, 0x87, 0xd0, 0x5d, 0x37, 0xf1, 0x26, 0xf1, - 0xd4, 0x0b, 0xa7, 0x76, 0xe4, 0xbc, 0x37, 0x77, 0xc6, 0x73, 0xe8, 0xdc, 0xf9, 0x04, 0xf4, 0x0d, - 0xb4, 0x36, 0xb2, 0xa2, 0x74, 0x73, 0x1e, 0xe5, 0x64, 0xfb, 0x56, 0x39, 0xcb, 0x7f, 0x13, 0x1d, - 0x91, 0x23, 0xf2, 0xb6, 0xfd, 0xeb, 0x7a, 0x9f, 0xfc, 0xbe, 0xde, 0x27, 0x7f, 0xae, 0xf7, 0xc9, - 0xe7, 0x1d, 0xfd, 0x73, 0x5e, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xf4, 0xf4, 0xd3, 0xf5, 0x6b, - 0x03, 0x00, 0x00, + // 578 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0x41, 0x6f, 0xd3, 0x30, + 0x14, 0xae, 0x9b, 0x6d, 0x6d, 0x5f, 0xd7, 0x2d, 0xb8, 0x15, 0x84, 0x22, 0x95, 0xaa, 0x13, 0x52, + 0x05, 0xd2, 0x98, 0x0a, 0xe2, 0x8a, 0x42, 0x1a, 0x41, 0xb4, 0x35, 0xad, 0x92, 0x14, 0x24, 0x2e, + 0x51, 0x48, 0x9e, 0x46, 0xd4, 0x2d, 0xce, 0x6c, 0x33, 0x8d, 0x7f, 0xc0, 0x09, 0xf1, 0x87, 0xb8, + 0x73, 0xdc, 0x91, 0x23, 0xda, 0xfe, 0x08, 0xaa, 0x93, 0x6e, 0x9d, 0x10, 0x17, 0xcb, 0xdf, 0xf7, + 0x3d, 0xbf, 0xcf, 0xfe, 0x9e, 0x0c, 0x6d, 0x6b, 0x6c, 0xcd, 0x10, 0x79, 0xc0, 0x96, 0xeb, 0x7e, + 0xce, 0x99, 0x64, 0x54, 0xcb, 0x47, 0x79, 0xb7, 0x73, 0xcc, 0x8e, 0x99, 0xc2, 0xcf, 0x97, 0xbb, + 0x42, 0x1a, 0x7c, 0x84, 0xed, 0x09, 0x0a, 0x11, 0x1d, 0xa3, 0x9d, 0x49, 0xfe, 0x95, 0x76, 0x60, + 0x53, 0xb2, 0x3c, 0x8d, 0x0d, 0xd2, 0x27, 0xc3, 0x86, 0x57, 0x00, 0x6a, 0x40, 0x2d, 0x66, 0x99, + 0xc4, 0x4c, 0x1a, 0xd5, 0x3e, 0x19, 0x6e, 0x7b, 0x2b, 0x48, 0xbb, 0x50, 0x17, 0x78, 0xf6, 0x05, + 0xb3, 0x18, 0x0d, 0xad, 0x4f, 0x86, 0x9a, 0x77, 0x83, 0x07, 0x3f, 0x09, 0x80, 0x2f, 0x39, 0x46, + 0xa7, 0x13, 0x94, 0x11, 0x7d, 0x04, 0x0d, 0x81, 0x59, 0x82, 0x3c, 0x4c, 0x93, 0xb2, 0x7d, 0xbd, + 0x20, 0x9c, 0x84, 0x3e, 0x86, 0x26, 0xc7, 0x18, 0xd3, 0xf3, 0x42, 0xae, 0x2a, 0x19, 0x56, 0x94, + 0x93, 0x2c, 0x2f, 0x86, 0x39, 0x8b, 0x3f, 0x97, 0x2e, 0x05, 0xa0, 0x4f, 0x60, 0x27, 0x3e, 0x49, + 0x31, 0x93, 0xe1, 0x39, 0x72, 0x91, 0xb2, 0xcc, 0x18, 0xa9, 0x93, 0xad, 0x82, 0x7d, 0x5f, 0x90, + 0xf4, 0x25, 0xdc, 0x2f, 0xad, 0xa3, 0xe4, 0x1c, 0xb9, 0x4c, 0x05, 0x26, 0x61, 0x94, 0x24, 0xdc, + 0x48, 0x54, 0x79, 0xa7, 0x50, 0xcd, 0x1b, 0xd1, 0x4c, 0x12, 0x3e, 0x88, 0xa0, 0x55, 0x66, 0x33, + 0x8b, 0xe2, 0x05, 0x4a, 0xba, 0x07, 0x1b, 0xa7, 0x28, 0x23, 0x75, 0xf9, 0xe6, 0x68, 0x77, 0x3f, + 0x1f, 0xe5, 0xfb, 0xb7, 0x0f, 0xf4, 0x94, 0x48, 0x9f, 0x41, 0x0d, 0x33, 0xc9, 0x53, 0x14, 0x46, + 0xb5, 0xaf, 0x0d, 0x9b, 0xa3, 0x7b, 0xaa, 0x6e, 0x3d, 0x65, 0x6f, 0x55, 0x31, 0x78, 0x05, 0x9a, + 0x19, 0x2f, 0xfe, 0x93, 0xfa, 0x43, 0xa8, 0x9f, 0x44, 0x42, 0x86, 0x02, 0xcf, 0x54, 0x20, 0x9a, + 0x57, 0x5b, 0x62, 0x1f, 0xcf, 0x06, 0xdf, 0x08, 0xb4, 0x7d, 0xcc, 0x92, 0xb2, 0xab, 0x87, 0x22, + 0x67, 0x99, 0x40, 0xda, 0x05, 0x2d, 0x8a, 0x17, 0x06, 0x51, 0xc6, 0x75, 0x65, 0x6c, 0xc6, 0x0b, + 0x6f, 0x49, 0xd2, 0x03, 0x68, 0xe2, 0x45, 0x2a, 0x43, 0x8e, 0x91, 0x60, 0x99, 0xea, 0xb8, 0x53, + 0x3e, 0xc2, 0xbe, 0x48, 0xa5, 0xa7, 0x68, 0x0f, 0xf0, 0x66, 0x4f, 0xf7, 0xa0, 0x85, 0x9c, 0x33, + 0x1e, 0x9e, 0x16, 0x36, 0x2a, 0xfb, 0x86, 0xb7, 0xad, 0xc8, 0xd2, 0xfa, 0xe9, 0x77, 0x02, 0x70, + 0x7b, 0x9e, 0x36, 0xa1, 0x36, 0x77, 0x0f, 0xdd, 0xe9, 0x07, 0x57, 0xaf, 0xd0, 0x2d, 0xa8, 0x4e, + 0x0f, 0x75, 0x42, 0x5b, 0xd0, 0xb0, 0xa6, 0xee, 0x5b, 0xdb, 0x0f, 0xec, 0xb1, 0x5e, 0xa5, 0x6d, + 0xd8, 0xb5, 0xcc, 0x59, 0x30, 0xf7, 0xec, 0xd0, 0x9f, 0x3b, 0x96, 0x33, 0xb6, 0x75, 0x8d, 0x76, + 0x40, 0xf7, 0x03, 0xf3, 0xc8, 0x0e, 0xad, 0xa9, 0xeb, 0xda, 0x56, 0xe0, 0x4c, 0x5d, 0x7d, 0x83, + 0x1a, 0xd0, 0x19, 0xcf, 0x67, 0x47, 0x8e, 0x65, 0x06, 0x77, 0x94, 0x4d, 0xfa, 0x00, 0xda, 0xab, + 0x26, 0xce, 0x38, 0x9c, 0x38, 0xfe, 0xc4, 0x0c, 0xac, 0x77, 0xfa, 0xd6, 0x68, 0x06, 0xad, 0x3b, + 0x9f, 0x80, 0xbe, 0x86, 0xe6, 0x5a, 0x56, 0x94, 0xae, 0xcf, 0xa3, 0x98, 0x6c, 0xd7, 0x28, 0x66, + 0xf9, 0x6f, 0xa2, 0x43, 0x72, 0x40, 0xde, 0x18, 0xbf, 0xae, 0x7a, 0xe4, 0xf2, 0xaa, 0x47, 0xfe, + 0x5c, 0xf5, 0xc8, 0x8f, 0xeb, 0x5e, 0xe5, 0xf2, 0xba, 0x57, 0xf9, 0x7d, 0xdd, 0xab, 0x7c, 0xda, + 0x52, 0xbf, 0xe8, 0xc5, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x85, 0x98, 0x36, 0x77, 0x03, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -583,10 +569,6 @@ func (m *MessageEntry) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.Sequence != 0 { i = encodeVarintCDCPeerToPeer(dAtA, i, uint64(m.Sequence)) i-- @@ -629,10 +611,6 @@ func (m *StreamMeta) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.SenderAdvertisedAddr) > 0 { i -= len(m.SenderAdvertisedAddr) copy(dAtA[i:], m.SenderAdvertisedAddr) @@ -693,10 +671,6 @@ func (m *MessagePacket) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.Entries) > 0 { for iNdEx := len(m.Entries) - 1; iNdEx >= 0; iNdEx-- { { @@ -746,10 +720,6 @@ func (m *Ack) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if m.LastSeq != 0 { i = encodeVarintCDCPeerToPeer(dAtA, i, uint64(m.LastSeq)) i-- @@ -785,10 +755,6 @@ func (m *SendMessageResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.XXX_unrecognized != nil { - i -= len(m.XXX_unrecognized) - copy(dAtA[i:], m.XXX_unrecognized) - } if len(m.ErrorMessage) > 0 { i -= len(m.ErrorMessage) copy(dAtA[i:], m.ErrorMessage) @@ -846,9 +812,6 @@ func (m *MessageEntry) Size() (n int) { if m.Sequence != 0 { n += 1 + sovCDCPeerToPeer(uint64(m.Sequence)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -877,9 +840,6 @@ func (m *StreamMeta) Size() (n int) { if l > 0 { n += 2 + l + sovCDCPeerToPeer(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -899,9 +859,6 @@ func (m *MessagePacket) Size() (n int) { n += 1 + l + sovCDCPeerToPeer(uint64(l)) } } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -918,9 +875,6 @@ func (m *Ack) Size() (n int) { if m.LastSeq != 0 { n += 1 + sovCDCPeerToPeer(uint64(m.LastSeq)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -943,9 +897,6 @@ func (m *SendMessageResponse) Size() (n int) { if l > 0 { n += 1 + l + sovCDCPeerToPeer(uint64(l)) } - if m.XXX_unrecognized != nil { - n += len(m.XXX_unrecognized) - } return n } @@ -1081,7 +1032,6 @@ func (m *MessageEntry) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1279,7 +1229,6 @@ func (m *StreamMeta) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1400,7 +1349,6 @@ func (m *MessagePacket) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1502,7 +1450,6 @@ func (m *Ack) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } @@ -1638,7 +1585,6 @@ func (m *SendMessageResponse) Unmarshal(dAtA []byte) error { if (iNdEx + skippy) > l { return io.ErrUnexpectedEOF } - m.XXX_unrecognized = append(m.XXX_unrecognized, dAtA[iNdEx:iNdEx+skippy]...) iNdEx += skippy } } diff --git a/scripts/download-protoc.sh b/scripts/download-protoc.sh new file mode 100755 index 00000000000..387d444360e --- /dev/null +++ b/scripts/download-protoc.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash +# Copyright 2022 PingCAP, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eu + +TOOLS_BIN_DIR=tools/bin +TOOLS_INCLUDE_DIR=tools/include +GOGO_VERSION=1.3.2 +PROTOC_VERSION=3.20.1 +OS="$(uname)" + +case $OS in +'Linux') + PROTOC_URL=https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-linux-x86_64.zip + ;; +'Darwin') + if [[ $(uname -m) == 'x86_64' ]]; then + PROTOC_URL=https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-osx-x86_64.zip + else + PROTOC_URL=https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOC_VERSION/protoc-$PROTOC_VERSION-osx-aarch_64.zip + fi + ;; +*) + echo "only supports Linux and macOS" + exit 1 + ;; +esac + +echo "download gogo.proto..." +[ ! -d $TOOLS_INCLUDE_DIR/gogoproto ] && mkdir -p $TOOLS_INCLUDE_DIR/gogoproto +[ ! -f $TOOLS_INCLUDE_DIR/gogoproto/gogo.proto ] && + curl -sL https://raw.githubusercontent.com/gogo/protobuf/v$GOGO_VERSION/gogoproto/gogo.proto \ + -o $TOOLS_INCLUDE_DIR/gogoproto/gogo.proto + +echo "download protoc..." +[ ! -d $TOOLS_BIN_DIR ] && mkdir -p $TOOLS_BIN_DIR +[ ! -f $TOOLS_BIN_DIR/protoc ] && + mkdir -p /tmp/cdc/protoc && + curl -sL $PROTOC_URL -o /tmp/cdc/protoc/protoc-$PROTOC_VERSION-linux-x86_64.zip && + unzip -q -o -d /tmp/cdc/protoc /tmp/cdc/protoc/protoc-$PROTOC_VERSION-linux-x86_64.zip && + mv /tmp/cdc/protoc/include/google $TOOLS_INCLUDE_DIR && + mv /tmp/cdc/protoc/bin/protoc $TOOLS_BIN_DIR/protoc diff --git a/scripts/generate-protobuf.sh b/scripts/generate-protobuf.sh new file mode 100755 index 00000000000..88140e8f842 --- /dev/null +++ b/scripts/generate-protobuf.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash +# Copyright 2022 PingCAP, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# See the License for the specific language governing permissions and +# limitations under the License. + +set -eu + +TOOLS_BIN_DIR=tools/bin +TOOLS_INCLUDE_DIR=tools/include + +if [ ! -f "$TOOLS_BIN_DIR/protoc" ]; then + echo "$TOOLS_BIN_DIR/protoc does not exist, please run 'make tools/bin/protoc' first" + exit 1 +fi + +# use `protoc-gen-gogofaster` rather than `protoc-gen-go`. +echo "check gogo..." +GOGO_FASTER=$TOOLS_BIN_DIR/protoc-gen-gogofaster +if [ ! -f "$GOGO_FASTER" ]; then + echo "${GOGO_FASTER} does not exist, please run 'make tools/bin/protoc-gen-gogofaster' first" + exit 1 +fi + +echo "generate canal..." +[ ! -d ./proto/canal ] && mkdir ./proto/canal +$TOOLS_BIN_DIR/protoc -I"./proto" -I"$TOOLS_INCLUDE_DIR" \ + --plugin=protoc-gen-gogofaster="$GOGO_FASTER" \ + --gogofaster_out=./proto/canal ./proto/EntryProtocol.proto +$TOOLS_BIN_DIR/protoc -I"./proto" -I"$TOOLS_INCLUDE_DIR" \ + --plugin=protoc-gen-gogofaster="$GOGO_FASTER" \ + --gogofaster_out=./proto/canal ./proto/CanalProtocol.proto + +echo "generate craft benchmark protocol..." +[ ! -d ./proto/benchmark ] && mkdir ./proto/benchmark +$TOOLS_BIN_DIR/protoc -I"./proto" -I"$TOOLS_INCLUDE_DIR" \ + --plugin=protoc-gen-gogofaster="$GOGO_FASTER" \ + --gogofaster_out=./proto/benchmark ./proto/CraftBenchmark.proto + +echo "generate p2p..." +[ ! -d ./proto/p2p ] && mkdir ./proto/p2p +$TOOLS_BIN_DIR/protoc -I"./proto" -I"$TOOLS_INCLUDE_DIR" \ + --plugin=protoc-gen-gogofaster="$GOGO_FASTER" \ + --gogofaster_out=plugins=grpc:./proto/p2p ./proto/CDCPeerToPeer.proto