From cf74a806a0c71d6480d08cb5a358b6666bb39bb6 Mon Sep 17 00:00:00 2001 From: Yourim Cha <81357083+chacha912@users.noreply.github.com> Date: Fri, 18 Aug 2023 17:44:12 +0900 Subject: [PATCH] Cleanup proto (#614) * Remove unused client id(key) from API response * Change clientID type from bytes to string in the API --- api/yorkie/v1/resources.pb.go | 346 +++++++++++---------- api/yorkie/v1/resources.proto | 2 +- api/yorkie/v1/yorkie.pb.go | 561 +++++++--------------------------- api/yorkie/v1/yorkie.proto | 30 +- client/client.go | 18 +- client/client_test.go | 4 +- server/rpc/server_test.go | 13 +- server/rpc/yorkie_server.go | 37 +-- 8 files changed, 331 insertions(+), 680 deletions(-) diff --git a/api/yorkie/v1/resources.pb.go b/api/yorkie/v1/resources.pb.go index 86d88e3d4..511ff2cbd 100644 --- a/api/yorkie/v1/resources.pb.go +++ b/api/yorkie/v1/resources.pb.go @@ -3260,7 +3260,7 @@ func (m *TimeTicket) GetActorId() []byte { type DocEvent struct { Type DocEventType `protobuf:"varint,1,opt,name=type,proto3,enum=yorkie.v1.DocEventType" json:"type,omitempty"` - Publisher []byte `protobuf:"bytes,2,opt,name=publisher,proto3" json:"publisher,omitempty"` + Publisher string `protobuf:"bytes,2,opt,name=publisher,proto3" json:"publisher,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -3306,11 +3306,11 @@ func (m *DocEvent) GetType() DocEventType { return DocEventType_DOC_EVENT_TYPE_DOCUMENT_CHANGED } -func (m *DocEvent) GetPublisher() []byte { +func (m *DocEvent) GetPublisher() string { if m != nil { return m.Publisher } - return nil + return "" } func init() { @@ -3374,169 +3374,169 @@ func init() { func init() { proto.RegisterFile("yorkie/v1/resources.proto", fileDescriptor_36361b2f5d0f0896) } var fileDescriptor_36361b2f5d0f0896 = []byte{ - // 2587 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xdd, 0x6f, 0x1b, 0x59, - 0x15, 0xcf, 0x8c, 0xc7, 0x1f, 0x73, 0x92, 0x26, 0xee, 0x4d, 0x3f, 0x5c, 0xb7, 0xcd, 0xa6, 0x2e, - 0xbb, 0xa4, 0x2d, 0x38, 0x1f, 0xb4, 0xcb, 0xd2, 0x52, 0xc0, 0xb1, 0xa7, 0x4d, 0xba, 0xa9, 0x13, - 0xc6, 0x4e, 0x97, 0xae, 0x40, 0xa3, 0xc9, 0xcc, 0x4d, 0x32, 0x1b, 0x7b, 0xc6, 0x3b, 0x33, 0xf6, - 0xd6, 0x12, 0x12, 0x12, 0x02, 0x89, 0x57, 0xde, 0xe0, 0x4f, 0xe0, 0x4f, 0xd8, 0x47, 0x78, 0x40, - 0x48, 0x08, 0xb1, 0x12, 0x2b, 0xf1, 0xca, 0x96, 0x07, 0x04, 0x6f, 0x08, 0x09, 0x9e, 0x90, 0xd0, - 0xfd, 0x98, 0xf1, 0xd8, 0x1e, 0xbb, 0xae, 0x09, 0xab, 0x56, 0xbc, 0xcd, 0xbd, 0xf7, 0x77, 0xee, - 0x3d, 0xe7, 0x9e, 0xdf, 0x3d, 0xf7, 0xdc, 0xb9, 0x17, 0x2e, 0x75, 0x1d, 0xf7, 0xc4, 0xc2, 0xab, - 0x9d, 0xf5, 0x55, 0x17, 0x7b, 0x4e, 0xdb, 0x35, 0xb0, 0x57, 0x6c, 0xb9, 0x8e, 0xef, 0x20, 0x99, - 0x35, 0x15, 0x3b, 0xeb, 0xf9, 0x37, 0x8e, 0x1c, 0xe7, 0xa8, 0x81, 0x57, 0x69, 0xc3, 0x41, 0xfb, - 0x70, 0xd5, 0xb7, 0x9a, 0xd8, 0xf3, 0xf5, 0x66, 0x8b, 0x61, 0xf3, 0x4b, 0x83, 0x80, 0x8f, 0x5c, - 0xbd, 0xd5, 0xc2, 0x2e, 0xef, 0xab, 0xf0, 0x5b, 0x01, 0x32, 0x35, 0x5b, 0x6f, 0x79, 0xc7, 0x8e, - 0x8f, 0x6e, 0x82, 0xe4, 0x3a, 0x8e, 0x9f, 0x13, 0x96, 0x85, 0x95, 0xd9, 0x8d, 0x0b, 0xc5, 0x70, - 0x9c, 0xe2, 0xa3, 0xda, 0x6e, 0x55, 0x69, 0xe0, 0x26, 0xb6, 0x7d, 0x95, 0x62, 0xd0, 0xb7, 0x40, - 0x6e, 0xb9, 0xd8, 0xc3, 0xb6, 0x81, 0xbd, 0x9c, 0xb8, 0x9c, 0x58, 0x99, 0xdd, 0x28, 0x44, 0x04, - 0x82, 0x3e, 0x8b, 0x7b, 0x01, 0x48, 0xb1, 0x7d, 0xb7, 0xab, 0xf6, 0x84, 0xf2, 0xdf, 0x86, 0xf9, - 0xfe, 0x46, 0x94, 0x85, 0xc4, 0x09, 0xee, 0xd2, 0xe1, 0x65, 0x95, 0x7c, 0xa2, 0x1b, 0x90, 0xec, - 0xe8, 0x8d, 0x36, 0xce, 0x89, 0x54, 0xa5, 0xc5, 0xc8, 0x08, 0x81, 0xac, 0xca, 0x10, 0x77, 0xc5, - 0x77, 0x84, 0xc2, 0x4f, 0x45, 0x80, 0xf2, 0xb1, 0x6e, 0x1f, 0xe1, 0x3d, 0xdd, 0x38, 0x41, 0xd7, - 0x60, 0xce, 0x74, 0x8c, 0x36, 0xd1, 0x5a, 0xeb, 0x75, 0x3c, 0x1b, 0xd4, 0xbd, 0x8b, 0xbb, 0xe8, - 0x0e, 0x80, 0x71, 0x8c, 0x8d, 0x93, 0x96, 0x63, 0xd9, 0x3e, 0x1f, 0xe5, 0x7c, 0x64, 0x94, 0x72, - 0xd8, 0xa8, 0x46, 0x80, 0x28, 0x0f, 0x19, 0x8f, 0x5b, 0x98, 0x4b, 0x2c, 0x0b, 0x2b, 0x73, 0x6a, - 0x58, 0x46, 0xb7, 0x20, 0x6d, 0x50, 0x1d, 0xbc, 0x9c, 0x44, 0xe7, 0xe5, 0x6c, 0x5f, 0x7f, 0xa4, - 0x45, 0x0d, 0x10, 0xa8, 0x04, 0x67, 0x9b, 0x96, 0xad, 0x79, 0x5d, 0xdb, 0xc0, 0xa6, 0xe6, 0x5b, - 0xc6, 0x09, 0xf6, 0x73, 0xc9, 0x21, 0x35, 0xea, 0x56, 0x13, 0xd7, 0x69, 0xa3, 0xba, 0xd0, 0xb4, - 0xec, 0x1a, 0x85, 0xb3, 0x0a, 0x74, 0x15, 0xc0, 0xf2, 0x34, 0x17, 0x37, 0x9d, 0x0e, 0x36, 0x73, - 0xa9, 0x65, 0x61, 0x25, 0xa3, 0xca, 0x96, 0xa7, 0xb2, 0x8a, 0xc2, 0x2f, 0x05, 0x48, 0xb1, 0x51, - 0xd1, 0x75, 0x10, 0x2d, 0x93, 0x7b, 0x77, 0x71, 0x48, 0xa9, 0xed, 0x8a, 0x2a, 0x5a, 0x26, 0xca, - 0x41, 0xba, 0x89, 0x3d, 0x4f, 0x3f, 0x62, 0x93, 0x2e, 0xab, 0x41, 0x11, 0xdd, 0x06, 0x70, 0x5a, - 0xd8, 0xd5, 0x7d, 0xcb, 0xb1, 0xbd, 0x5c, 0x82, 0xda, 0x76, 0x2e, 0xd2, 0xcd, 0x6e, 0xd0, 0xa8, - 0x46, 0x70, 0x68, 0x13, 0x16, 0x02, 0x9f, 0x6b, 0xcc, 0xea, 0x9c, 0x44, 0x35, 0xb8, 0x14, 0xe3, - 0x4c, 0x3e, 0x3d, 0xf3, 0xad, 0xbe, 0x72, 0xe1, 0xc7, 0x02, 0x64, 0x02, 0x25, 0x89, 0xbd, 0x46, - 0xc3, 0x22, 0x3e, 0xf5, 0xf0, 0x87, 0xd4, 0x9a, 0x33, 0xaa, 0xcc, 0x6a, 0x6a, 0xf8, 0x43, 0x74, - 0x0d, 0xc0, 0xc3, 0x6e, 0x07, 0xbb, 0xb4, 0x99, 0x98, 0x90, 0xd8, 0x14, 0xd7, 0x04, 0x55, 0x66, - 0xb5, 0x04, 0x72, 0x05, 0xd2, 0x0d, 0xbd, 0xd9, 0x72, 0x5c, 0xe6, 0x3c, 0xd6, 0x1e, 0x54, 0xa1, - 0x4b, 0x90, 0xd1, 0x0d, 0xdf, 0x71, 0x35, 0xcb, 0xa4, 0x9a, 0xce, 0xa9, 0x69, 0x5a, 0xde, 0x36, - 0x0b, 0x3f, 0xbf, 0x02, 0x72, 0x68, 0x25, 0xfa, 0x12, 0x24, 0x3c, 0x1c, 0xac, 0x96, 0x5c, 0xdc, - 0x44, 0x14, 0x6b, 0xd8, 0xdf, 0x9a, 0x51, 0x09, 0x8c, 0xa0, 0x75, 0xd3, 0xe4, 0x14, 0x8b, 0x47, - 0x97, 0x4c, 0x93, 0xa0, 0x75, 0xd3, 0x44, 0xab, 0x20, 0x11, 0xf7, 0x51, 0xfd, 0xfa, 0xa7, 0xaa, - 0x07, 0x7f, 0xec, 0x74, 0xf0, 0xd6, 0x8c, 0x4a, 0x81, 0xe8, 0x0e, 0xa4, 0x18, 0x05, 0xf8, 0xec, - 0x5e, 0x8e, 0x15, 0x61, 0xa4, 0xd8, 0x9a, 0x51, 0x39, 0x98, 0x8c, 0x83, 0x4d, 0x2b, 0xa0, 0x5c, - 0xfc, 0x38, 0x8a, 0x69, 0x11, 0x2b, 0x28, 0x90, 0x8c, 0xe3, 0xe1, 0x06, 0x36, 0x7c, 0xca, 0xb4, - 0x51, 0xe3, 0xd4, 0x28, 0x84, 0x8c, 0xc3, 0xc0, 0x68, 0x03, 0x92, 0x9e, 0xdf, 0x6d, 0xe0, 0x5c, - 0x9a, 0x4a, 0xe5, 0xe3, 0xa5, 0x08, 0x62, 0x6b, 0x46, 0x65, 0x50, 0x74, 0x0f, 0x32, 0x96, 0x6d, - 0xb8, 0x58, 0xf7, 0x70, 0x2e, 0x43, 0xc5, 0xae, 0xc6, 0x8a, 0x6d, 0x73, 0xd0, 0xd6, 0x8c, 0x1a, - 0x0a, 0xa0, 0xaf, 0x83, 0xec, 0xbb, 0x18, 0x6b, 0xd4, 0x3a, 0x79, 0x8c, 0x74, 0xdd, 0xc5, 0x98, - 0x5b, 0x98, 0xf1, 0xf9, 0x37, 0xfa, 0x26, 0x00, 0x95, 0x66, 0x3a, 0x03, 0x15, 0x5f, 0x1a, 0x29, - 0x1e, 0xe8, 0x4d, 0x47, 0xa4, 0x85, 0xfc, 0xaf, 0x05, 0x48, 0xd4, 0xb0, 0x4f, 0xd6, 0x77, 0x4b, - 0x77, 0x09, 0x59, 0x89, 0x5e, 0x3e, 0x36, 0x35, 0x3d, 0x60, 0xcc, 0xa8, 0xf5, 0xcd, 0xf0, 0x65, - 0x06, 0x2f, 0xf9, 0x41, 0x54, 0x14, 0x7b, 0x51, 0x71, 0x23, 0x88, 0x8a, 0x8c, 0x1d, 0x57, 0xe2, - 0x03, 0x75, 0xcd, 0x6a, 0xb6, 0x1a, 0x41, 0x78, 0x44, 0x6f, 0xc3, 0x2c, 0x7e, 0x86, 0x8d, 0x36, - 0x57, 0x41, 0x1a, 0xa7, 0x02, 0x04, 0xc8, 0x92, 0x9f, 0xff, 0x87, 0x00, 0x89, 0x92, 0x69, 0x9e, - 0x86, 0x21, 0xf7, 0x69, 0x24, 0xe8, 0x44, 0x3b, 0x10, 0xc7, 0x75, 0x70, 0x86, 0xa0, 0x7b, 0xe2, - 0x9f, 0xa7, 0xd5, 0xff, 0x14, 0x40, 0x22, 0xcb, 0xeb, 0x15, 0x30, 0xfb, 0x36, 0x40, 0x44, 0x32, - 0x31, 0x4e, 0x52, 0x36, 0x42, 0xa9, 0x69, 0x0d, 0xff, 0x58, 0x80, 0x14, 0x0b, 0x12, 0xa7, 0x61, - 0x7a, 0xbf, 0xee, 0xe2, 0x74, 0xba, 0x27, 0x26, 0xd5, 0xfd, 0x57, 0x12, 0x48, 0x74, 0xf5, 0x9e, - 0x82, 0xe6, 0x37, 0x41, 0x3a, 0x74, 0x9d, 0x26, 0xd7, 0x39, 0x9a, 0x0a, 0xd5, 0xf1, 0x33, 0xbf, - 0xea, 0x98, 0x78, 0xcf, 0xf1, 0x54, 0x8a, 0x41, 0x6f, 0x81, 0xe8, 0x3b, 0x5c, 0xcd, 0x51, 0x48, - 0xd1, 0x77, 0xd0, 0x31, 0x5c, 0xec, 0xe9, 0xa3, 0x35, 0xf5, 0x96, 0x76, 0xd0, 0xd5, 0xe8, 0xd6, - 0xc2, 0x13, 0x85, 0x8d, 0x91, 0xe1, 0xb7, 0x18, 0x6a, 0xf6, 0x58, 0x6f, 0x6d, 0x76, 0x4b, 0x44, - 0x88, 0x25, 0x54, 0x8b, 0xc6, 0x70, 0x0b, 0xd9, 0xc3, 0x0d, 0xc7, 0xf6, 0xb1, 0xcd, 0x02, 0xbb, - 0xac, 0x06, 0xc5, 0xc1, 0xb9, 0x4d, 0x4d, 0x38, 0xb7, 0x68, 0x1b, 0x40, 0xf7, 0x7d, 0xd7, 0x3a, - 0x68, 0xfb, 0xd8, 0xcb, 0xa5, 0xa9, 0xba, 0x37, 0x46, 0xab, 0x5b, 0x0a, 0xb1, 0x4c, 0xcb, 0x88, - 0x70, 0xfe, 0x7b, 0x90, 0x1b, 0x65, 0x4d, 0x4c, 0x06, 0x78, 0xab, 0x3f, 0x03, 0x1c, 0xa1, 0x6a, - 0x2f, 0x07, 0xcc, 0xdf, 0x87, 0x85, 0x81, 0xd1, 0x63, 0x7a, 0x3d, 0x17, 0xed, 0x55, 0x8e, 0x8a, - 0xff, 0x51, 0x80, 0x14, 0xdb, 0xbd, 0x5e, 0x55, 0x1a, 0x4d, 0xbb, 0xb4, 0x3f, 0x13, 0x21, 0x49, - 0x37, 0xa7, 0x57, 0xd5, 0xb0, 0x47, 0x7d, 0x1c, 0x63, 0x4b, 0xe2, 0xe6, 0xe8, 0x44, 0x61, 0x1c, - 0xc9, 0x06, 0x27, 0x29, 0x39, 0xe9, 0x24, 0xfd, 0x97, 0xec, 0xf9, 0x58, 0x80, 0x4c, 0x90, 0x8e, - 0x9c, 0xc6, 0x34, 0x6f, 0xf4, 0xb3, 0x7f, 0x9a, 0x3d, 0x6f, 0xe2, 0xf0, 0xf9, 0x49, 0x02, 0x32, - 0x41, 0x32, 0x74, 0x1a, 0xba, 0xbf, 0xd5, 0x47, 0x11, 0x14, 0x95, 0x72, 0x71, 0x84, 0x1e, 0x85, - 0x08, 0x3d, 0xe2, 0x50, 0x84, 0x1a, 0x8d, 0x17, 0x85, 0xce, 0xb7, 0xc7, 0xe6, 0x76, 0x2f, 0x19, - 0x3e, 0xd7, 0x20, 0xc3, 0xe3, 0xa5, 0x97, 0x4b, 0x0e, 0x1d, 0x73, 0x48, 0xa7, 0x84, 0xb6, 0x9e, - 0x1a, 0xa2, 0xa6, 0x0d, 0xab, 0xff, 0xeb, 0x58, 0xf8, 0x99, 0x08, 0x72, 0x98, 0xa0, 0xbe, 0x6a, - 0x3e, 0xad, 0xc6, 0x2c, 0xf7, 0xe2, 0xf8, 0x1c, 0xfb, 0x15, 0x5c, 0xf2, 0x9b, 0x29, 0x90, 0x0e, - 0x1c, 0xb3, 0x5b, 0xf8, 0xbb, 0x00, 0x67, 0x87, 0xd6, 0xe4, 0x40, 0x06, 0x24, 0x4c, 0x98, 0x01, - 0xad, 0x41, 0x86, 0x1e, 0xde, 0x5f, 0x98, 0x35, 0xa5, 0x29, 0x8c, 0x65, 0x5a, 0xfc, 0x0f, 0xc0, - 0x8b, 0xb3, 0x44, 0x0e, 0x2c, 0xf9, 0x68, 0x05, 0x24, 0xbf, 0xdb, 0x62, 0x47, 0xc6, 0xf9, 0x3e, - 0x92, 0x3f, 0x21, 0xf6, 0xd5, 0xbb, 0x2d, 0xac, 0x52, 0x44, 0xcf, 0xfe, 0x24, 0x3d, 0x11, 0xb3, - 0x42, 0xe1, 0x17, 0x67, 0x60, 0x36, 0x62, 0x33, 0xaa, 0xc0, 0xec, 0x07, 0x9e, 0x63, 0x6b, 0xce, - 0xc1, 0x07, 0xe4, 0x84, 0xc8, 0xcc, 0xbd, 0x16, 0x1f, 0xb4, 0xe8, 0xf7, 0x2e, 0x05, 0x6e, 0xcd, - 0xa8, 0x40, 0xe4, 0x58, 0x09, 0x95, 0x80, 0x96, 0x34, 0xdd, 0x75, 0xf5, 0x2e, 0xb7, 0x7f, 0x79, - 0x4c, 0x27, 0x25, 0x82, 0x23, 0xc7, 0x2f, 0x22, 0x45, 0x0b, 0xec, 0xef, 0x94, 0xd5, 0xb4, 0x7c, - 0x2b, 0x3c, 0x43, 0x8f, 0xea, 0x61, 0x2f, 0xc0, 0x91, 0x1e, 0x42, 0x21, 0xb4, 0x0e, 0x92, 0x8f, - 0x9f, 0x05, 0x34, 0xba, 0x3c, 0x42, 0x98, 0x6c, 0x61, 0xe4, 0x68, 0x4c, 0xa0, 0xe8, 0x2e, 0xc9, - 0xba, 0xda, 0xb6, 0x8f, 0x5d, 0x1e, 0x00, 0x96, 0x46, 0x48, 0x95, 0x19, 0x6a, 0x6b, 0x46, 0x0d, - 0x04, 0xe8, 0x70, 0x2e, 0x0e, 0x8e, 0xc7, 0x23, 0x87, 0x73, 0x31, 0x3d, 0xf1, 0x13, 0x68, 0xfe, - 0x53, 0x01, 0xa0, 0x37, 0x87, 0x68, 0x05, 0x92, 0x36, 0x89, 0x4a, 0x39, 0x81, 0xae, 0xa4, 0xe8, - 0xaa, 0x53, 0xb7, 0xea, 0x24, 0x60, 0xa9, 0x0c, 0x30, 0x65, 0x56, 0x1e, 0xe5, 0x64, 0x62, 0x0a, - 0x4e, 0x4a, 0x93, 0x71, 0x32, 0xff, 0x07, 0x01, 0xe4, 0xd0, 0xab, 0x63, 0xad, 0x7a, 0x58, 0x7a, - 0x7d, 0xac, 0xfa, 0xab, 0x00, 0x72, 0xc8, 0xb4, 0x70, 0xdd, 0x09, 0x93, 0xaf, 0x3b, 0x31, 0xb2, - 0xee, 0xa6, 0x3c, 0x13, 0x46, 0x6d, 0x95, 0xa6, 0xb0, 0x35, 0x39, 0xa1, 0xad, 0xbf, 0x17, 0x40, - 0x22, 0x0b, 0x03, 0xdd, 0xe8, 0x77, 0xde, 0x62, 0x4c, 0xee, 0xf7, 0x7a, 0x78, 0xef, 0x2f, 0x02, - 0xa4, 0xf9, 0xa2, 0xfd, 0x7f, 0xf0, 0x9d, 0x8b, 0xf1, 0x58, 0xdf, 0xf1, 0x04, 0xe8, 0xb5, 0xf0, - 0x5d, 0xb8, 0x3f, 0x3f, 0x86, 0x34, 0x8f, 0x83, 0x31, 0xdb, 0xfb, 0x1a, 0xa4, 0x31, 0x8b, 0xb1, - 0x31, 0x27, 0x9a, 0xe8, 0xe5, 0x47, 0x00, 0x2b, 0x18, 0x90, 0xe6, 0x01, 0x88, 0x24, 0x45, 0x36, - 0xd9, 0x2a, 0x84, 0xa1, 0x74, 0x27, 0x08, 0x51, 0xb4, 0x7d, 0x8a, 0x41, 0x9e, 0x40, 0x86, 0xc8, - 0x93, 0xf4, 0xa4, 0xc7, 0x26, 0x21, 0x92, 0x81, 0x90, 0x39, 0x69, 0xb7, 0xcc, 0xc9, 0xe6, 0x9e, - 0x03, 0x4b, 0x7e, 0xe1, 0x77, 0x22, 0x64, 0x82, 0x15, 0x88, 0xde, 0x8c, 0xdc, 0x0a, 0x9c, 0x8f, - 0x59, 0xa2, 0xfc, 0x5e, 0x20, 0x36, 0x03, 0x9a, 0x32, 0xef, 0xb8, 0x03, 0xb3, 0x96, 0xed, 0x69, - 0xf4, 0xb7, 0x18, 0xff, 0xcb, 0x3e, 0x72, 0x6c, 0xd9, 0xb2, 0xbd, 0x3d, 0x17, 0x77, 0xb6, 0x4d, - 0x54, 0xee, 0xcb, 0x18, 0x59, 0x66, 0x7e, 0x3d, 0x46, 0x6a, 0xec, 0xef, 0x07, 0x75, 0x92, 0x74, - 0x6f, 0xcc, 0xbd, 0x53, 0xe0, 0x90, 0xe8, 0xbd, 0xd3, 0xfb, 0x00, 0x3d, 0x8d, 0xa7, 0xcc, 0xf9, - 0x2e, 0x40, 0xca, 0x39, 0x3c, 0xf4, 0x30, 0xf3, 0x62, 0x52, 0xe5, 0xa5, 0xc2, 0xbf, 0x44, 0x76, - 0x2c, 0x1b, 0xef, 0x2b, 0x0e, 0xe0, 0xbe, 0x42, 0x3c, 0x46, 0x31, 0x57, 0x0d, 0x44, 0xa3, 0xc4, - 0x68, 0xff, 0x49, 0xd3, 0xf9, 0x2f, 0x39, 0x4e, 0x9f, 0x88, 0xff, 0xce, 0x41, 0xd2, 0xc4, 0x2d, - 0xff, 0x98, 0xa6, 0x47, 0x49, 0x95, 0x15, 0x06, 0xbc, 0x9a, 0x1e, 0xf6, 0x2a, 0xef, 0xeb, 0x73, - 0xf7, 0xea, 0x5d, 0x76, 0x78, 0xa2, 0x67, 0x3d, 0xf4, 0xe5, 0xde, 0x2f, 0xb5, 0x31, 0x11, 0x31, - 0xc0, 0x50, 0x46, 0x84, 0x73, 0x70, 0xca, 0x8c, 0xf8, 0x3e, 0xa4, 0xf9, 0x39, 0x0a, 0x6d, 0x80, - 0xcc, 0x8f, 0x74, 0x2f, 0xa2, 0x45, 0x86, 0xe1, 0xb6, 0x4d, 0x74, 0x1f, 0x16, 0x1a, 0xf8, 0xd0, - 0xd7, 0x3c, 0xeb, 0xa0, 0x61, 0xd9, 0x47, 0x44, 0x52, 0x1c, 0x27, 0x79, 0x86, 0xa0, 0x6b, 0x0c, - 0xbc, 0x6d, 0x16, 0x9a, 0x20, 0xed, 0x7b, 0xd8, 0x45, 0xf3, 0x21, 0x15, 0x65, 0xca, 0xb9, 0x3c, - 0x64, 0xda, 0x1e, 0x76, 0x6d, 0xbd, 0x19, 0xf0, 0x2e, 0x2c, 0xa3, 0xaf, 0xc5, 0xec, 0x79, 0xf9, - 0x22, 0xbb, 0x9a, 0x2e, 0x06, 0x57, 0xd3, 0x74, 0x16, 0xe8, 0xdd, 0x75, 0x64, 0x12, 0x0a, 0xff, - 0x16, 0x21, 0xbd, 0xe7, 0x3a, 0x34, 0xc5, 0x1d, 0x1c, 0x12, 0x81, 0x14, 0x19, 0x8e, 0x7e, 0xa3, - 0xab, 0x00, 0xad, 0xf6, 0x41, 0xc3, 0x32, 0xe8, 0x8d, 0x2f, 0xe3, 0xba, 0xcc, 0x6a, 0xde, 0xc5, - 0x5d, 0xd2, 0xec, 0x61, 0xc3, 0xc5, 0xec, 0x42, 0x58, 0x62, 0xcd, 0xac, 0x86, 0x34, 0xaf, 0x40, - 0x56, 0x6f, 0xfb, 0xc7, 0xda, 0x47, 0xf8, 0xe0, 0xd8, 0x71, 0x4e, 0xb4, 0xb6, 0xdb, 0xe0, 0x7f, - 0x50, 0xe7, 0x49, 0xfd, 0x7b, 0xac, 0x7a, 0xdf, 0x6d, 0xa0, 0x35, 0x38, 0xd7, 0x87, 0x6c, 0x62, - 0xff, 0xd8, 0x31, 0xbd, 0x5c, 0x6a, 0x39, 0xb1, 0x22, 0xab, 0x28, 0x82, 0x7e, 0xcc, 0x5a, 0xd0, - 0x37, 0xe0, 0x32, 0xbf, 0xb7, 0x34, 0xb1, 0x6e, 0xf8, 0x56, 0x47, 0xf7, 0xb1, 0xe6, 0x1f, 0xbb, - 0xd8, 0x3b, 0x76, 0x1a, 0x26, 0xcd, 0xfc, 0x65, 0xf5, 0x12, 0x83, 0x54, 0x42, 0x44, 0x3d, 0x00, - 0x0c, 0x4c, 0x62, 0xe6, 0x25, 0x26, 0x91, 0x88, 0x46, 0x76, 0x09, 0xf9, 0xc5, 0xa2, 0xbd, 0xad, - 0xe2, 0x27, 0x09, 0xb8, 0xb0, 0x4f, 0x4a, 0xfa, 0x41, 0x03, 0x73, 0x47, 0x3c, 0xb0, 0x70, 0xc3, - 0xf4, 0xd0, 0x1a, 0x9f, 0x7e, 0x81, 0xff, 0x9b, 0x1a, 0xec, 0xaf, 0xe6, 0xbb, 0x96, 0x7d, 0x44, - 0xb3, 0x22, 0xee, 0x9c, 0x07, 0x31, 0xd3, 0x2b, 0x4e, 0x20, 0x3d, 0x38, 0xf9, 0x87, 0x23, 0x26, - 0x9f, 0x31, 0xeb, 0x76, 0x84, 0xc7, 0xf1, 0xaa, 0x17, 0x4b, 0x43, 0xee, 0x89, 0x75, 0xd9, 0x77, - 0xc7, 0xbb, 0x4c, 0x9a, 0x40, 0xf5, 0xd1, 0x0e, 0xcd, 0x17, 0x01, 0x0d, 0xeb, 0xc1, 0xee, 0xdf, - 0x99, 0x39, 0x02, 0xe5, 0x52, 0x50, 0x2c, 0xfc, 0x50, 0x84, 0x85, 0x0a, 0x7f, 0xbb, 0x50, 0x6b, - 0x37, 0x9b, 0xba, 0xdb, 0x1d, 0x5a, 0x12, 0xc3, 0x97, 0x85, 0x83, 0x4f, 0x15, 0xe4, 0xc8, 0x53, - 0x85, 0x7e, 0x4a, 0x49, 0x2f, 0x43, 0xa9, 0x7b, 0x30, 0xab, 0x1b, 0x06, 0xf6, 0xbc, 0x68, 0x7e, - 0x39, 0x4e, 0x16, 0x02, 0xf8, 0x10, 0x1f, 0x53, 0x2f, 0xc3, 0xc7, 0xbf, 0x09, 0xbd, 0x67, 0x23, - 0xfc, 0x59, 0xc3, 0x3b, 0x7d, 0x19, 0xf9, 0x17, 0x46, 0x3e, 0x2b, 0xe0, 0xef, 0x1c, 0x22, 0x19, - 0xfa, 0x2a, 0x64, 0x82, 0x97, 0x06, 0xe3, 0x5e, 0x98, 0x84, 0xa0, 0x42, 0x33, 0x78, 0x5f, 0x42, - 0x3a, 0x41, 0x97, 0xe1, 0x62, 0x79, 0xab, 0x54, 0x7d, 0xa8, 0x68, 0xf5, 0xa7, 0x7b, 0x8a, 0xb6, - 0x5f, 0xad, 0xed, 0x29, 0xe5, 0xed, 0x07, 0xdb, 0x4a, 0x25, 0x3b, 0x83, 0x16, 0x61, 0x21, 0xda, - 0xb8, 0xb7, 0x5f, 0xcf, 0x0a, 0xe8, 0x02, 0xa0, 0x68, 0x65, 0x45, 0xd9, 0x51, 0xea, 0x4a, 0x56, - 0x44, 0xe7, 0xe1, 0x6c, 0xb4, 0xbe, 0xbc, 0xa3, 0x94, 0xd4, 0x6c, 0xa2, 0xd0, 0x81, 0x4c, 0xa0, - 0x04, 0x5a, 0x07, 0x89, 0x50, 0x99, 0xef, 0x3e, 0x57, 0x63, 0xf4, 0x2c, 0x56, 0x74, 0x5f, 0x67, - 0x5b, 0x23, 0x85, 0xe6, 0xbf, 0x0a, 0x72, 0x58, 0xf5, 0x32, 0xff, 0xb4, 0x0a, 0x55, 0x62, 0x66, - 0xf8, 0xd8, 0xa5, 0xff, 0x45, 0x85, 0x10, 0xf7, 0xa2, 0xa2, 0xff, 0x4d, 0x86, 0x38, 0xf0, 0x26, - 0xa3, 0xf0, 0x23, 0x01, 0x66, 0x23, 0x7f, 0xfb, 0x4f, 0x77, 0x3f, 0x44, 0x5f, 0x84, 0x05, 0x17, - 0x37, 0x74, 0x72, 0xb2, 0xd6, 0x38, 0x20, 0x41, 0x01, 0xf3, 0x41, 0xf5, 0x2e, 0xdb, 0x38, 0x0d, - 0x80, 0x5e, 0xcf, 0xd1, 0x57, 0x20, 0xc2, 0xf0, 0x2b, 0x90, 0x2b, 0x20, 0x9b, 0xb8, 0x41, 0x0e, - 0xec, 0xd8, 0x0d, 0x0c, 0x0a, 0x2b, 0xfa, 0xde, 0x88, 0x24, 0xfa, 0xdf, 0x88, 0xec, 0x43, 0xa6, - 0xe2, 0x18, 0x4a, 0x07, 0xdb, 0x3e, 0xba, 0xd5, 0xc7, 0xcc, 0x8b, 0x11, 0x0b, 0x03, 0x48, 0x84, - 0x8c, 0x57, 0x80, 0xed, 0x53, 0xde, 0x31, 0x1f, 0x71, 0x4e, 0xed, 0x55, 0xdc, 0xfc, 0x54, 0x04, - 0x39, 0x3c, 0x60, 0x12, 0x72, 0x3d, 0x29, 0xed, 0xec, 0x73, 0xba, 0x54, 0xf7, 0x77, 0x76, 0xb2, - 0x33, 0x84, 0x5c, 0x91, 0xca, 0xcd, 0xdd, 0xdd, 0x1d, 0xa5, 0x54, 0x65, 0xa4, 0x8b, 0xd4, 0x6f, - 0x57, 0xeb, 0xca, 0x43, 0x45, 0xcd, 0x8a, 0x03, 0x9d, 0xec, 0xec, 0x56, 0x1f, 0x66, 0x13, 0x84, - 0x89, 0x91, 0xca, 0xca, 0xee, 0xfe, 0xe6, 0x8e, 0x92, 0x95, 0x06, 0xaa, 0x6b, 0x75, 0x75, 0xbb, - 0xfa, 0x30, 0x9b, 0x44, 0xe7, 0x20, 0x1b, 0x1d, 0xf2, 0x69, 0x5d, 0xa9, 0x65, 0x53, 0x03, 0x1d, - 0x57, 0x4a, 0x75, 0x25, 0x9b, 0x46, 0x79, 0xb8, 0x10, 0xa9, 0x24, 0xc7, 0x1d, 0x6d, 0x77, 0xf3, - 0x91, 0x52, 0xae, 0x67, 0x33, 0xe8, 0x12, 0x9c, 0x1f, 0x6c, 0x2b, 0xa9, 0x6a, 0xe9, 0x69, 0x56, - 0x1e, 0xe8, 0xab, 0xae, 0x7c, 0xa7, 0x9e, 0x85, 0x81, 0xbe, 0xb8, 0x45, 0x5a, 0xb9, 0x5a, 0xcf, - 0xce, 0xa2, 0x8b, 0xb0, 0x38, 0x60, 0x15, 0x6d, 0x98, 0x1b, 0xec, 0x49, 0x55, 0x94, 0xec, 0x99, - 0x9b, 0x3f, 0x80, 0xb9, 0xa8, 0x2b, 0xd0, 0x75, 0x78, 0xa3, 0xb2, 0x5b, 0xd6, 0x94, 0x27, 0x4a, - 0xb5, 0x1e, 0x4c, 0x41, 0x79, 0xff, 0x31, 0x29, 0xb1, 0x05, 0x4a, 0x96, 0xf6, 0x18, 0xd0, 0x7b, - 0xa5, 0x7a, 0x79, 0x4b, 0xa9, 0x64, 0x05, 0xf4, 0x26, 0x5c, 0x1b, 0x05, 0xda, 0xaf, 0x06, 0x30, - 0x71, 0xf3, 0xd6, 0x6f, 0x9e, 0x2f, 0x09, 0x9f, 0x3c, 0x5f, 0x12, 0xfe, 0xf4, 0x7c, 0x49, 0xf8, - 0xd9, 0x9f, 0x97, 0x66, 0xe0, 0xac, 0x89, 0x3b, 0x01, 0x53, 0xf4, 0x96, 0x55, 0xec, 0xac, 0xef, - 0x09, 0xef, 0x4b, 0xc5, 0x7b, 0x9d, 0xf5, 0x83, 0x14, 0x8d, 0x8d, 0x5f, 0xf9, 0x4f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x2c, 0xaf, 0x2e, 0x02, 0x1d, 0x28, 0x00, 0x00, + // 2588 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0xcd, 0x8f, 0x1b, 0x49, + 0x15, 0x9f, 0x6e, 0xb7, 0x3f, 0xfa, 0x4d, 0x32, 0xe3, 0xd4, 0xe4, 0xc3, 0x71, 0x92, 0xd9, 0x89, + 0x97, 0x5d, 0x66, 0x13, 0xf0, 0x7c, 0xb0, 0xbb, 0x2c, 0xbb, 0x04, 0xf0, 0xd8, 0x9d, 0xcc, 0x64, + 0x27, 0x9e, 0xa1, 0xed, 0xc9, 0x92, 0x15, 0xa8, 0xd5, 0xd3, 0x5d, 0x33, 0xd3, 0x3b, 0xb6, 0xdb, + 0xdb, 0xdd, 0xf6, 0xc6, 0x12, 0x12, 0x12, 0x02, 0x89, 0x2b, 0x37, 0xf8, 0x13, 0xf8, 0x13, 0xf6, + 0x08, 0x07, 0x84, 0x84, 0x10, 0x2b, 0xb1, 0x12, 0x57, 0x36, 0x1c, 0x10, 0xdc, 0x10, 0x12, 0x9c, + 0x90, 0x50, 0x7d, 0x74, 0xbb, 0x6c, 0xb7, 0x1d, 0xc7, 0x0c, 0xab, 0x44, 0xdc, 0xba, 0xaa, 0x7e, + 0xaf, 0xea, 0xbd, 0x7a, 0xbf, 0x7a, 0xf5, 0xaa, 0xab, 0xe0, 0x6a, 0xcf, 0xf5, 0x4e, 0x1d, 0xbc, + 0xd6, 0xdd, 0x58, 0xf3, 0xb0, 0xef, 0x76, 0x3c, 0x0b, 0xfb, 0xc5, 0xb6, 0xe7, 0x06, 0x2e, 0x52, + 0x59, 0x53, 0xb1, 0xbb, 0x91, 0x7f, 0xe9, 0xd8, 0x75, 0x8f, 0x1b, 0x78, 0x8d, 0x36, 0x1c, 0x76, + 0x8e, 0xd6, 0x02, 0xa7, 0x89, 0xfd, 0xc0, 0x6c, 0xb6, 0x19, 0x36, 0xbf, 0x3c, 0x0c, 0xf8, 0xc8, + 0x33, 0xdb, 0x6d, 0xec, 0xf1, 0xbe, 0x0a, 0xbf, 0x95, 0x20, 0x53, 0x6b, 0x99, 0x6d, 0xff, 0xc4, + 0x0d, 0xd0, 0x2d, 0x50, 0x3c, 0xd7, 0x0d, 0x72, 0xd2, 0x8a, 0xb4, 0x3a, 0xbf, 0x79, 0xb9, 0x18, + 0x8d, 0x53, 0xbc, 0x5f, 0xdb, 0xab, 0x6a, 0x0d, 0xdc, 0xc4, 0xad, 0x40, 0xa7, 0x18, 0xf4, 0x2d, + 0x50, 0xdb, 0x1e, 0xf6, 0x71, 0xcb, 0xc2, 0x7e, 0x4e, 0x5e, 0x49, 0xac, 0xce, 0x6f, 0x16, 0x04, + 0x81, 0xb0, 0xcf, 0xe2, 0x7e, 0x08, 0xd2, 0x5a, 0x81, 0xd7, 0xd3, 0xfb, 0x42, 0xf9, 0x6f, 0xc3, + 0xc2, 0x60, 0x23, 0xca, 0x42, 0xe2, 0x14, 0xf7, 0xe8, 0xf0, 0xaa, 0x4e, 0x3e, 0xd1, 0x6b, 0x90, + 0xec, 0x9a, 0x8d, 0x0e, 0xce, 0xc9, 0x54, 0xa5, 0x25, 0x61, 0x84, 0x50, 0x56, 0x67, 0x88, 0xb7, + 0xe5, 0xb7, 0xa4, 0xc2, 0x4f, 0x65, 0x80, 0xf2, 0x89, 0xd9, 0x3a, 0xc6, 0xfb, 0xa6, 0x75, 0x8a, + 0x6e, 0xc2, 0x39, 0xdb, 0xb5, 0x3a, 0x44, 0x6b, 0xa3, 0xdf, 0xf1, 0x7c, 0x58, 0xf7, 0x2e, 0xee, + 0xa1, 0x37, 0x00, 0xac, 0x13, 0x6c, 0x9d, 0xb6, 0x5d, 0xa7, 0x15, 0xf0, 0x51, 0x2e, 0x09, 0xa3, + 0x94, 0xa3, 0x46, 0x5d, 0x00, 0xa2, 0x3c, 0x64, 0x7c, 0x6e, 0x61, 0x2e, 0xb1, 0x22, 0xad, 0x9e, + 0xd3, 0xa3, 0x32, 0xba, 0x0d, 0x69, 0x8b, 0xea, 0xe0, 0xe7, 0x14, 0x3a, 0x2f, 0x17, 0x06, 0xfa, + 0x23, 0x2d, 0x7a, 0x88, 0x40, 0x25, 0xb8, 0xd0, 0x74, 0x5a, 0x86, 0xdf, 0x6b, 0x59, 0xd8, 0x36, + 0x02, 0xc7, 0x3a, 0xc5, 0x41, 0x2e, 0x39, 0xa2, 0x46, 0xdd, 0x69, 0xe2, 0x3a, 0x6d, 0xd4, 0x17, + 0x9b, 0x4e, 0xab, 0x46, 0xe1, 0xac, 0x02, 0xdd, 0x00, 0x70, 0x7c, 0xc3, 0xc3, 0x4d, 0xb7, 0x8b, + 0xed, 0x5c, 0x6a, 0x45, 0x5a, 0xcd, 0xe8, 0xaa, 0xe3, 0xeb, 0xac, 0xa2, 0xf0, 0x4b, 0x09, 0x52, + 0x6c, 0x54, 0xf4, 0x32, 0xc8, 0x8e, 0xcd, 0xbd, 0xbb, 0x34, 0xa2, 0xd4, 0x4e, 0x45, 0x97, 0x1d, + 0x1b, 0xe5, 0x20, 0xdd, 0xc4, 0xbe, 0x6f, 0x1e, 0xb3, 0x49, 0x57, 0xf5, 0xb0, 0x88, 0x5e, 0x07, + 0x70, 0xdb, 0xd8, 0x33, 0x03, 0xc7, 0x6d, 0xf9, 0xb9, 0x04, 0xb5, 0xed, 0xa2, 0xd0, 0xcd, 0x5e, + 0xd8, 0xa8, 0x0b, 0x38, 0xb4, 0x05, 0x8b, 0xa1, 0xcf, 0x0d, 0x66, 0x75, 0x4e, 0xa1, 0x1a, 0x5c, + 0x8d, 0x71, 0x26, 0x9f, 0x9e, 0x85, 0xf6, 0x40, 0xb9, 0xf0, 0x63, 0x09, 0x32, 0xa1, 0x92, 0xc4, + 0x5e, 0xab, 0xe1, 0x10, 0x9f, 0xfa, 0xf8, 0x43, 0x6a, 0xcd, 0x79, 0x5d, 0x65, 0x35, 0x35, 0xfc, + 0x21, 0xba, 0x09, 0xe0, 0x63, 0xaf, 0x8b, 0x3d, 0xda, 0x4c, 0x4c, 0x48, 0x6c, 0xc9, 0xeb, 0x92, + 0xae, 0xb2, 0x5a, 0x02, 0xb9, 0x0e, 0xe9, 0x86, 0xd9, 0x6c, 0xbb, 0x1e, 0x73, 0x1e, 0x6b, 0x0f, + 0xab, 0xd0, 0x55, 0xc8, 0x98, 0x56, 0xe0, 0x7a, 0x86, 0x63, 0x53, 0x4d, 0xcf, 0xe9, 0x69, 0x5a, + 0xde, 0xb1, 0x0b, 0x3f, 0xbf, 0x0e, 0x6a, 0x64, 0x25, 0xfa, 0x12, 0x24, 0x7c, 0x1c, 0xae, 0x96, + 0x5c, 0xdc, 0x44, 0x14, 0x6b, 0x38, 0xd8, 0x9e, 0xd3, 0x09, 0x8c, 0xa0, 0x4d, 0xdb, 0xe6, 0x14, + 0x8b, 0x47, 0x97, 0x6c, 0x9b, 0xa0, 0x4d, 0xdb, 0x46, 0x6b, 0xa0, 0x10, 0xf7, 0x51, 0xfd, 0x06, + 0xa7, 0xaa, 0x0f, 0x7f, 0xe0, 0x76, 0xf1, 0xf6, 0x9c, 0x4e, 0x81, 0xe8, 0x0d, 0x48, 0x31, 0x0a, + 0xf0, 0xd9, 0xbd, 0x16, 0x2b, 0xc2, 0x48, 0xb1, 0x3d, 0xa7, 0x73, 0x30, 0x19, 0x07, 0xdb, 0x4e, + 0x48, 0xb9, 0xf8, 0x71, 0x34, 0xdb, 0x21, 0x56, 0x50, 0x20, 0x19, 0xc7, 0xc7, 0x0d, 0x6c, 0x05, + 0x94, 0x69, 0xe3, 0xc6, 0xa9, 0x51, 0x08, 0x19, 0x87, 0x81, 0xd1, 0x26, 0x24, 0xfd, 0xa0, 0xd7, + 0xc0, 0xb9, 0x34, 0x95, 0xca, 0xc7, 0x4b, 0x11, 0xc4, 0xf6, 0x9c, 0xce, 0xa0, 0xe8, 0x1d, 0xc8, + 0x38, 0x2d, 0xcb, 0xc3, 0xa6, 0x8f, 0x73, 0x19, 0x2a, 0x76, 0x23, 0x56, 0x6c, 0x87, 0x83, 0xb6, + 0xe7, 0xf4, 0x48, 0x00, 0x7d, 0x1d, 0xd4, 0xc0, 0xc3, 0xd8, 0xa0, 0xd6, 0xa9, 0x13, 0xa4, 0xeb, + 0x1e, 0xc6, 0xdc, 0xc2, 0x4c, 0xc0, 0xbf, 0xd1, 0x37, 0x01, 0xa8, 0x34, 0xd3, 0x19, 0xa8, 0xf8, + 0xf2, 0x58, 0xf1, 0x50, 0x6f, 0x3a, 0x22, 0x2d, 0xe4, 0x7f, 0x2d, 0x41, 0xa2, 0x86, 0x03, 0xb2, + 0xbe, 0xdb, 0xa6, 0x47, 0xc8, 0x4a, 0xf4, 0x0a, 0xb0, 0x6d, 0x98, 0x21, 0x63, 0xc6, 0xad, 0x6f, + 0x86, 0x2f, 0x33, 0x78, 0x29, 0x08, 0xa3, 0xa2, 0xdc, 0x8f, 0x8a, 0x9b, 0x61, 0x54, 0x64, 0xec, + 0xb8, 0x1e, 0x1f, 0xa8, 0x6b, 0x4e, 0xb3, 0xdd, 0x08, 0xc3, 0x23, 0x7a, 0x13, 0xe6, 0xf1, 0x63, + 0x6c, 0x75, 0xb8, 0x0a, 0xca, 0x24, 0x15, 0x20, 0x44, 0x96, 0x82, 0xfc, 0x3f, 0x24, 0x48, 0x94, + 0x6c, 0xfb, 0x2c, 0x0c, 0xb9, 0x43, 0x23, 0x41, 0x57, 0xec, 0x40, 0x9e, 0xd4, 0xc1, 0x79, 0x82, + 0xee, 0x8b, 0x7f, 0x9e, 0x56, 0xff, 0x53, 0x02, 0x85, 0x2c, 0xaf, 0xe7, 0xc0, 0xec, 0xd7, 0x01, + 0x04, 0xc9, 0xc4, 0x24, 0x49, 0xd5, 0x8a, 0xa4, 0x66, 0x35, 0xfc, 0x63, 0x09, 0x52, 0x2c, 0x48, + 0x9c, 0x85, 0xe9, 0x83, 0xba, 0xcb, 0xb3, 0xe9, 0x9e, 0x98, 0x56, 0xf7, 0x5f, 0x29, 0xa0, 0xd0, + 0xd5, 0x7b, 0x06, 0x9a, 0xdf, 0x02, 0xe5, 0xc8, 0x73, 0x9b, 0x5c, 0x67, 0x31, 0x15, 0xaa, 0xe3, + 0xc7, 0x41, 0xd5, 0xb5, 0xf1, 0xbe, 0xeb, 0xeb, 0x14, 0x83, 0x5e, 0x05, 0x39, 0x70, 0xb9, 0x9a, + 0xe3, 0x90, 0x72, 0xe0, 0xa2, 0x13, 0xb8, 0xd2, 0xd7, 0xc7, 0x68, 0x9a, 0x6d, 0xe3, 0xb0, 0x67, + 0xd0, 0xad, 0x85, 0x27, 0x0a, 0x9b, 0x63, 0xc3, 0x6f, 0x31, 0xd2, 0xec, 0x81, 0xd9, 0xde, 0xea, + 0x95, 0x88, 0x10, 0x4b, 0xa8, 0x96, 0xac, 0xd1, 0x16, 0xb2, 0x87, 0x5b, 0x6e, 0x2b, 0xc0, 0x2d, + 0x16, 0xd8, 0x55, 0x3d, 0x2c, 0x0e, 0xcf, 0x6d, 0x6a, 0xca, 0xb9, 0x45, 0x3b, 0x00, 0x66, 0x10, + 0x78, 0xce, 0x61, 0x27, 0xc0, 0x7e, 0x2e, 0x4d, 0xd5, 0x7d, 0x6d, 0xbc, 0xba, 0xa5, 0x08, 0xcb, + 0xb4, 0x14, 0x84, 0xf3, 0xdf, 0x83, 0xdc, 0x38, 0x6b, 0x62, 0x32, 0xc0, 0xdb, 0x83, 0x19, 0xe0, + 0x18, 0x55, 0xfb, 0x39, 0x60, 0xfe, 0x0e, 0x2c, 0x0e, 0x8d, 0x1e, 0xd3, 0xeb, 0x45, 0xb1, 0x57, + 0x55, 0x14, 0xff, 0xa3, 0x04, 0x29, 0xb6, 0x7b, 0x3d, 0xaf, 0x34, 0x9a, 0x75, 0x69, 0x7f, 0x26, + 0x43, 0x92, 0x6e, 0x4e, 0xcf, 0xab, 0x61, 0xf7, 0x07, 0x38, 0xc6, 0x96, 0xc4, 0xad, 0xf1, 0x89, + 0xc2, 0x24, 0x92, 0x0d, 0x4f, 0x52, 0x72, 0xda, 0x49, 0xfa, 0x2f, 0xd9, 0xf3, 0xb1, 0x04, 0x99, + 0x30, 0x1d, 0x39, 0x8b, 0x69, 0xde, 0x1c, 0x64, 0xff, 0x2c, 0x7b, 0xde, 0xd4, 0xe1, 0xf3, 0x93, + 0x04, 0x64, 0xc2, 0x64, 0xe8, 0x2c, 0x74, 0x7f, 0x75, 0x80, 0x22, 0x48, 0x94, 0xf2, 0xb0, 0x40, + 0x8f, 0x82, 0x40, 0x8f, 0x38, 0x14, 0xa1, 0x46, 0xe3, 0x69, 0xa1, 0xf3, 0xcd, 0x89, 0xb9, 0xdd, + 0x33, 0x86, 0xcf, 0x75, 0xc8, 0xf0, 0x78, 0xe9, 0xe7, 0x92, 0x23, 0xc7, 0x1c, 0xd2, 0x29, 0xa1, + 0xad, 0xaf, 0x47, 0xa8, 0x59, 0xc3, 0xea, 0xff, 0x3a, 0x16, 0x7e, 0x26, 0x83, 0x1a, 0x25, 0xa8, + 0xcf, 0x9b, 0x4f, 0xab, 0x31, 0xcb, 0xbd, 0x38, 0x39, 0xc7, 0x7e, 0x0e, 0x97, 0xfc, 0x56, 0x0a, + 0x94, 0x43, 0xd7, 0xee, 0x15, 0xfe, 0x2e, 0xc1, 0x85, 0x91, 0x35, 0x39, 0x94, 0x01, 0x49, 0x53, + 0x66, 0x40, 0xeb, 0x90, 0xa1, 0x87, 0xf7, 0xa7, 0x66, 0x4d, 0x69, 0x0a, 0x63, 0x99, 0x16, 0xff, + 0x03, 0xf0, 0xf4, 0x2c, 0x91, 0x03, 0x4b, 0x01, 0x5a, 0x05, 0x25, 0xe8, 0xb5, 0xd9, 0x91, 0x71, + 0x61, 0x80, 0xe4, 0x0f, 0x89, 0x7d, 0xf5, 0x5e, 0x1b, 0xeb, 0x14, 0xd1, 0xb7, 0x3f, 0x49, 0x4f, + 0xc4, 0xac, 0x50, 0xf8, 0xc5, 0x79, 0x98, 0x17, 0x6c, 0x46, 0x15, 0x98, 0xff, 0xc0, 0x77, 0x5b, + 0x86, 0x7b, 0xf8, 0x01, 0x39, 0x21, 0x32, 0x73, 0x6f, 0xc6, 0x07, 0x2d, 0xfa, 0xbd, 0x47, 0x81, + 0xdb, 0x73, 0x3a, 0x10, 0x39, 0x56, 0x42, 0x25, 0xa0, 0x25, 0xc3, 0xf4, 0x3c, 0xb3, 0xc7, 0xed, + 0x5f, 0x99, 0xd0, 0x49, 0x89, 0xe0, 0xc8, 0xf1, 0x8b, 0x48, 0xd1, 0x02, 0xfb, 0x3b, 0xe5, 0x34, + 0x9d, 0xc0, 0x89, 0xce, 0xd0, 0xe3, 0x7a, 0xd8, 0x0f, 0x71, 0xa4, 0x87, 0x48, 0x08, 0x6d, 0x80, + 0x12, 0xe0, 0xc7, 0x21, 0x8d, 0xae, 0x8d, 0x11, 0x26, 0x5b, 0x18, 0x39, 0x1a, 0x13, 0x28, 0x7a, + 0x9b, 0x64, 0x5d, 0x9d, 0x56, 0x80, 0x3d, 0x1e, 0x00, 0x96, 0xc7, 0x48, 0x95, 0x19, 0x6a, 0x7b, + 0x4e, 0x0f, 0x05, 0xe8, 0x70, 0x1e, 0x0e, 0x8f, 0xc7, 0x63, 0x87, 0xf3, 0x30, 0x3d, 0xf1, 0x13, + 0x68, 0xfe, 0x53, 0x09, 0xa0, 0x3f, 0x87, 0x68, 0x15, 0x92, 0x2d, 0x12, 0x95, 0x72, 0x12, 0x5d, + 0x49, 0xe2, 0xaa, 0xd3, 0xb7, 0xeb, 0x24, 0x60, 0xe9, 0x0c, 0x30, 0x63, 0x56, 0x2e, 0x72, 0x32, + 0x31, 0x03, 0x27, 0x95, 0xe9, 0x38, 0x99, 0xff, 0x83, 0x04, 0x6a, 0xe4, 0xd5, 0x89, 0x56, 0xdd, + 0x2b, 0xbd, 0x38, 0x56, 0xfd, 0x55, 0x02, 0x35, 0x62, 0x5a, 0xb4, 0xee, 0xa4, 0xe9, 0xd7, 0x9d, + 0x2c, 0xac, 0xbb, 0x19, 0xcf, 0x84, 0xa2, 0xad, 0xca, 0x0c, 0xb6, 0x26, 0xa7, 0xb4, 0xf5, 0xf7, + 0x12, 0x28, 0x64, 0x61, 0xa0, 0xd7, 0x06, 0x9d, 0xb7, 0x14, 0x93, 0xfb, 0xbd, 0x18, 0xde, 0xfb, + 0x8b, 0x04, 0x69, 0xbe, 0x68, 0xff, 0x1f, 0x7c, 0xe7, 0x61, 0x3c, 0xd1, 0x77, 0x3c, 0x01, 0x7a, + 0x21, 0x7c, 0x17, 0xed, 0xcf, 0x0f, 0x20, 0xcd, 0xe3, 0x60, 0xcc, 0xf6, 0xbe, 0x0e, 0x69, 0xcc, + 0x62, 0x6c, 0xcc, 0x89, 0x46, 0xbc, 0xfc, 0x08, 0x61, 0x05, 0x0b, 0xd2, 0x3c, 0x00, 0x91, 0xa4, + 0xa8, 0x45, 0xb6, 0x0a, 0x69, 0x24, 0xdd, 0x09, 0x43, 0x14, 0x6d, 0x9f, 0x61, 0x90, 0x87, 0x90, + 0x21, 0xf2, 0x24, 0x3d, 0xe9, 0xb3, 0x49, 0x12, 0x32, 0x10, 0x32, 0x27, 0x9d, 0xb6, 0x3d, 0xdd, + 0xdc, 0x73, 0x60, 0x29, 0x28, 0xfc, 0x4e, 0x86, 0x4c, 0xb8, 0x02, 0xd1, 0x2b, 0xc2, 0xad, 0xc0, + 0xa5, 0x98, 0x25, 0xca, 0xef, 0x05, 0x62, 0x33, 0xa0, 0x19, 0xf3, 0x8e, 0x37, 0x60, 0xde, 0x69, + 0xf9, 0x06, 0xfd, 0x2d, 0xc6, 0xff, 0xb2, 0x8f, 0x1d, 0x5b, 0x75, 0x5a, 0xfe, 0xbe, 0x87, 0xbb, + 0x3b, 0x36, 0x2a, 0x0f, 0x64, 0x8c, 0x2c, 0x33, 0x7f, 0x39, 0x46, 0x6a, 0xe2, 0xef, 0x07, 0x7d, + 0x9a, 0x74, 0x6f, 0xc2, 0xbd, 0x53, 0xe8, 0x10, 0xf1, 0xde, 0xe9, 0x7d, 0x80, 0xbe, 0xc6, 0x33, + 0xe6, 0x7c, 0x97, 0x21, 0xe5, 0x1e, 0x1d, 0xf9, 0x98, 0x79, 0x31, 0xa9, 0xf3, 0x52, 0xe1, 0x5f, + 0x32, 0x3b, 0x96, 0x4d, 0xf6, 0x15, 0x07, 0x70, 0x5f, 0x21, 0x1e, 0xa3, 0x98, 0xab, 0x86, 0xa2, + 0x51, 0x62, 0xbc, 0xff, 0x94, 0xd9, 0xfc, 0x97, 0x9c, 0xa4, 0x8f, 0xe0, 0xbf, 0x8b, 0x90, 0xb4, + 0x71, 0x3b, 0x38, 0xa1, 0xe9, 0x51, 0x52, 0x67, 0x85, 0x21, 0xaf, 0xa6, 0x47, 0xbd, 0xca, 0xfb, + 0xfa, 0xdc, 0xbd, 0xfa, 0x36, 0x3b, 0x3c, 0xd1, 0xb3, 0x1e, 0xfa, 0x72, 0xff, 0x97, 0xda, 0x84, + 0x88, 0x18, 0x62, 0x28, 0x23, 0xa2, 0x39, 0x38, 0x63, 0x46, 0x7c, 0x1f, 0xd2, 0xfc, 0x1c, 0x85, + 0x36, 0x41, 0xe5, 0x47, 0xba, 0xa7, 0xd1, 0x22, 0xc3, 0x70, 0x3b, 0x36, 0xba, 0x03, 0x8b, 0x0d, + 0x7c, 0x14, 0x18, 0xbe, 0x73, 0xd8, 0x70, 0x5a, 0xc7, 0x44, 0x52, 0x9e, 0x24, 0x79, 0x9e, 0xa0, + 0x6b, 0x0c, 0xbc, 0x63, 0x17, 0x9a, 0xa0, 0x1c, 0xf8, 0xd8, 0x43, 0x0b, 0x11, 0x15, 0x55, 0xca, + 0xb9, 0x3c, 0x64, 0x3a, 0x3e, 0xf6, 0x5a, 0x66, 0x33, 0xe4, 0x5d, 0x54, 0x46, 0x5f, 0x8b, 0xd9, + 0xf3, 0xf2, 0x45, 0x76, 0x35, 0x5d, 0x0c, 0xaf, 0xa6, 0xe9, 0x2c, 0xd0, 0xbb, 0x6b, 0x61, 0x12, + 0x0a, 0xff, 0x96, 0x21, 0xbd, 0xef, 0xb9, 0x34, 0xc5, 0x1d, 0x1e, 0x12, 0x81, 0x22, 0x0c, 0x47, + 0xbf, 0xd1, 0x0d, 0x80, 0x76, 0xe7, 0xb0, 0xe1, 0x58, 0xf4, 0xc6, 0x97, 0x71, 0x5d, 0x65, 0x35, + 0xef, 0xe2, 0x1e, 0x69, 0xf6, 0xb1, 0xe5, 0x61, 0x76, 0x21, 0xac, 0xb0, 0x66, 0x56, 0x43, 0x9a, + 0x57, 0x21, 0x6b, 0x76, 0x82, 0x13, 0xe3, 0x23, 0x7c, 0x78, 0xe2, 0xba, 0xa7, 0x46, 0xc7, 0x6b, + 0xf0, 0x3f, 0xa8, 0x0b, 0xa4, 0xfe, 0x3d, 0x56, 0x7d, 0xe0, 0x35, 0xd0, 0x3a, 0x5c, 0x1c, 0x40, + 0x36, 0x71, 0x70, 0xe2, 0xda, 0x7e, 0x2e, 0xb5, 0x92, 0x58, 0x55, 0x75, 0x24, 0xa0, 0x1f, 0xb0, + 0x16, 0xf4, 0x0d, 0xb8, 0xc6, 0xef, 0x2d, 0x6d, 0x6c, 0x5a, 0x81, 0xd3, 0x35, 0x03, 0x6c, 0x04, + 0x27, 0x1e, 0xf6, 0x4f, 0xdc, 0x86, 0x4d, 0x33, 0x7f, 0x55, 0xbf, 0xca, 0x20, 0x95, 0x08, 0x51, + 0x0f, 0x01, 0x43, 0x93, 0x98, 0x79, 0x86, 0x49, 0x24, 0xa2, 0xc2, 0x2e, 0xa1, 0x3e, 0x5d, 0xb4, + 0xbf, 0x55, 0xfc, 0x24, 0x01, 0x97, 0x0f, 0x48, 0xc9, 0x3c, 0x6c, 0x60, 0xee, 0x88, 0xbb, 0x0e, + 0x6e, 0xd8, 0x3e, 0x5a, 0xe7, 0xd3, 0x2f, 0xf1, 0x7f, 0x53, 0xc3, 0xfd, 0xd5, 0x02, 0xcf, 0x69, + 0x1d, 0xd3, 0xac, 0x88, 0x3b, 0xe7, 0x6e, 0xcc, 0xf4, 0xca, 0x53, 0x48, 0x0f, 0x4f, 0xfe, 0xd1, + 0x98, 0xc9, 0x67, 0xcc, 0x7a, 0x5d, 0xe0, 0x71, 0xbc, 0xea, 0xc5, 0xd2, 0x88, 0x7b, 0x62, 0x5d, + 0xf6, 0xdd, 0xc9, 0x2e, 0x53, 0xa6, 0x50, 0x7d, 0xbc, 0x43, 0xf3, 0x45, 0x40, 0xa3, 0x7a, 0xb0, + 0xfb, 0x77, 0x66, 0x8e, 0x44, 0xb9, 0x14, 0x16, 0x0b, 0x3f, 0x94, 0x61, 0xb1, 0xc2, 0xdf, 0x2e, + 0xd4, 0x3a, 0xcd, 0xa6, 0xe9, 0xf5, 0x46, 0x96, 0xc4, 0xe8, 0x65, 0xe1, 0xf0, 0x53, 0x05, 0x55, + 0x78, 0xaa, 0x30, 0x48, 0x29, 0xe5, 0x59, 0x28, 0xf5, 0x0e, 0xcc, 0x9b, 0x96, 0x85, 0x7d, 0x5f, + 0xcc, 0x2f, 0x27, 0xc9, 0x42, 0x08, 0x1f, 0xe1, 0x63, 0xea, 0x59, 0xf8, 0xf8, 0x37, 0xa9, 0xff, + 0x6c, 0x84, 0x3f, 0x6b, 0x78, 0x6b, 0x20, 0x23, 0xff, 0xc2, 0xd8, 0x67, 0x05, 0xfc, 0x9d, 0x83, + 0x90, 0xa1, 0xaf, 0x41, 0x26, 0x7c, 0x69, 0x30, 0xe9, 0x85, 0x49, 0x04, 0x2a, 0x34, 0xc3, 0xf7, + 0x25, 0xa4, 0x13, 0x74, 0x0d, 0xae, 0x94, 0xb7, 0x4b, 0xd5, 0x7b, 0x9a, 0x51, 0x7f, 0xb4, 0xaf, + 0x19, 0x07, 0xd5, 0xda, 0xbe, 0x56, 0xde, 0xb9, 0xbb, 0xa3, 0x55, 0xb2, 0x73, 0x68, 0x09, 0x16, + 0xc5, 0xc6, 0xfd, 0x83, 0x7a, 0x56, 0x42, 0x97, 0x01, 0x89, 0x95, 0x15, 0x6d, 0x57, 0xab, 0x6b, + 0x59, 0x19, 0x5d, 0x82, 0x0b, 0x62, 0x7d, 0x79, 0x57, 0x2b, 0xe9, 0xd9, 0x44, 0xa1, 0x0b, 0x99, + 0x50, 0x09, 0xb4, 0x01, 0x0a, 0xa1, 0x32, 0xdf, 0x7d, 0x6e, 0xc4, 0xe8, 0x59, 0xac, 0x98, 0x81, + 0xc9, 0xb6, 0x46, 0x0a, 0xcd, 0x7f, 0x15, 0xd4, 0xa8, 0xea, 0x59, 0xfe, 0x69, 0x15, 0xaa, 0xc4, + 0xcc, 0xe8, 0xb1, 0xcb, 0xe0, 0x8b, 0x0a, 0x29, 0xee, 0x45, 0xc5, 0xe0, 0x9b, 0x0c, 0x79, 0xe8, + 0x4d, 0x46, 0xe1, 0x47, 0x12, 0xcc, 0x0b, 0x7f, 0xfb, 0xcf, 0x76, 0x3f, 0x44, 0x5f, 0x84, 0x45, + 0x0f, 0x37, 0x4c, 0x72, 0xb2, 0x36, 0x38, 0x20, 0x41, 0x01, 0x0b, 0x61, 0xf5, 0x1e, 0xdb, 0x38, + 0x2d, 0x80, 0x7e, 0xcf, 0xe2, 0x2b, 0x10, 0x69, 0xf4, 0x15, 0xc8, 0x75, 0x50, 0x6d, 0xdc, 0x20, + 0x07, 0x76, 0xec, 0x85, 0x06, 0x45, 0x15, 0x03, 0x6f, 0x44, 0x12, 0x83, 0x6f, 0x44, 0x0e, 0x20, + 0x53, 0x71, 0x2d, 0xad, 0x8b, 0x5b, 0x01, 0xba, 0x3d, 0xc0, 0xcc, 0x2b, 0x82, 0x85, 0x21, 0x44, + 0x20, 0xe3, 0x75, 0x60, 0xfb, 0x94, 0x7f, 0xc2, 0x47, 0x0c, 0x37, 0x2e, 0x52, 0x71, 0xeb, 0x53, + 0x19, 0xd4, 0xe8, 0x80, 0x49, 0xc8, 0xf5, 0xb0, 0xb4, 0x7b, 0xc0, 0xe9, 0x52, 0x3d, 0xd8, 0xdd, + 0xcd, 0xce, 0x11, 0x72, 0x09, 0x95, 0x5b, 0x7b, 0x7b, 0xbb, 0x5a, 0xa9, 0xca, 0x48, 0x27, 0xd4, + 0xef, 0x54, 0xeb, 0xda, 0x3d, 0x4d, 0xcf, 0xca, 0x43, 0x9d, 0xec, 0xee, 0x55, 0xef, 0x65, 0x13, + 0x84, 0x89, 0x42, 0x65, 0x65, 0xef, 0x60, 0x6b, 0x57, 0xcb, 0x2a, 0x43, 0xd5, 0xb5, 0xba, 0xbe, + 0x53, 0xbd, 0x97, 0x4d, 0xa2, 0x8b, 0x90, 0x15, 0x87, 0x7c, 0x54, 0xd7, 0x6a, 0xd9, 0xd4, 0x50, + 0xc7, 0x95, 0x52, 0x5d, 0xcb, 0xa6, 0x51, 0x1e, 0x2e, 0x0b, 0x95, 0xe4, 0xb8, 0x63, 0xec, 0x6d, + 0xdd, 0xd7, 0xca, 0xf5, 0x6c, 0x06, 0x5d, 0x85, 0x4b, 0xc3, 0x6d, 0x25, 0x5d, 0x2f, 0x3d, 0xca, + 0xaa, 0x43, 0x7d, 0xd5, 0xb5, 0xef, 0xd4, 0xb3, 0x30, 0xd4, 0x17, 0xb7, 0xc8, 0x28, 0x57, 0xeb, + 0xd9, 0x79, 0x74, 0x05, 0x96, 0x86, 0xac, 0xa2, 0x0d, 0xe7, 0x86, 0x7b, 0xd2, 0x35, 0x2d, 0x7b, + 0xfe, 0xd6, 0x0f, 0xe0, 0x9c, 0xe8, 0x0a, 0xf4, 0x32, 0xbc, 0x54, 0xd9, 0x2b, 0x1b, 0xda, 0x43, + 0xad, 0x5a, 0x0f, 0xa7, 0xa0, 0x7c, 0xf0, 0x80, 0x94, 0xd8, 0x02, 0x25, 0x4b, 0x7b, 0x02, 0xe8, + 0xbd, 0x52, 0xbd, 0xbc, 0xad, 0x55, 0xb2, 0x12, 0x7a, 0x05, 0x6e, 0x8e, 0x03, 0x1d, 0x54, 0x43, + 0x98, 0xbc, 0x75, 0xfb, 0x37, 0x4f, 0x96, 0xa5, 0x4f, 0x9e, 0x2c, 0x4b, 0x7f, 0x7a, 0xb2, 0x2c, + 0xfd, 0xec, 0xcf, 0xcb, 0x73, 0x70, 0xc1, 0xc6, 0xdd, 0x90, 0x29, 0x66, 0xdb, 0x29, 0x76, 0x37, + 0xf6, 0xa5, 0xf7, 0x95, 0xe2, 0x3b, 0xdd, 0x8d, 0xc3, 0x14, 0x8d, 0x8d, 0x5f, 0xf9, 0x4f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x72, 0x52, 0x4b, 0x99, 0x1d, 0x28, 0x00, 0x00, } func (m *Snapshot) Marshal() (dAtA []byte, err error) { @@ -16763,7 +16763,7 @@ func (m *DocEvent) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Publisher", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowResources @@ -16773,25 +16773,23 @@ func (m *DocEvent) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthResources } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthResources } if postIndex > l { return io.ErrUnexpectedEOF } - m.Publisher = append(m.Publisher[:0], dAtA[iNdEx:postIndex]...) - if m.Publisher == nil { - m.Publisher = []byte{} - } + m.Publisher = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex diff --git a/api/yorkie/v1/resources.proto b/api/yorkie/v1/resources.proto index aa2636878..fd09dd601 100644 --- a/api/yorkie/v1/resources.proto +++ b/api/yorkie/v1/resources.proto @@ -360,5 +360,5 @@ enum DocEventType { message DocEvent { DocEventType type = 1; - bytes publisher = 2; + string publisher = 2; } diff --git a/api/yorkie/v1/yorkie.pb.go b/api/yorkie/v1/yorkie.pb.go index 0bd73bedd..8af66bd68 100644 --- a/api/yorkie/v1/yorkie.pb.go +++ b/api/yorkie/v1/yorkie.pb.go @@ -74,8 +74,7 @@ func (m *ActivateClientRequest) GetClientKey() string { } type ActivateClientResponse struct { - ClientKey string `protobuf:"bytes,1,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"` - ClientId []byte `protobuf:"bytes,2,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -114,22 +113,15 @@ func (m *ActivateClientResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ActivateClientResponse proto.InternalMessageInfo -func (m *ActivateClientResponse) GetClientKey() string { - if m != nil { - return m.ClientKey - } - return "" -} - -func (m *ActivateClientResponse) GetClientId() []byte { +func (m *ActivateClientResponse) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } type DeactivateClientRequest struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -168,15 +160,14 @@ func (m *DeactivateClientRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DeactivateClientRequest proto.InternalMessageInfo -func (m *DeactivateClientRequest) GetClientId() []byte { +func (m *DeactivateClientRequest) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } type DeactivateClientResponse struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -215,15 +206,8 @@ func (m *DeactivateClientResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DeactivateClientResponse proto.InternalMessageInfo -func (m *DeactivateClientResponse) GetClientId() []byte { - if m != nil { - return m.ClientId - } - return nil -} - type AttachDocumentRequest struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` ChangePack *ChangePack `protobuf:"bytes,2,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -263,11 +247,11 @@ func (m *AttachDocumentRequest) XXX_DiscardUnknown() { var xxx_messageInfo_AttachDocumentRequest proto.InternalMessageInfo -func (m *AttachDocumentRequest) GetClientId() []byte { +func (m *AttachDocumentRequest) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } func (m *AttachDocumentRequest) GetChangePack() *ChangePack { @@ -278,9 +262,8 @@ func (m *AttachDocumentRequest) GetChangePack() *ChangePack { } type AttachDocumentResponse struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - DocumentId string `protobuf:"bytes,2,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"` - ChangePack *ChangePack `protobuf:"bytes,3,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` + DocumentId string `protobuf:"bytes,1,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"` + ChangePack *ChangePack `protobuf:"bytes,2,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -319,13 +302,6 @@ func (m *AttachDocumentResponse) XXX_DiscardUnknown() { var xxx_messageInfo_AttachDocumentResponse proto.InternalMessageInfo -func (m *AttachDocumentResponse) GetClientId() []byte { - if m != nil { - return m.ClientId - } - return nil -} - func (m *AttachDocumentResponse) GetDocumentId() string { if m != nil { return m.DocumentId @@ -341,7 +317,7 @@ func (m *AttachDocumentResponse) GetChangePack() *ChangePack { } type DetachDocumentRequest struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` DocumentId string `protobuf:"bytes,2,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"` ChangePack *ChangePack `protobuf:"bytes,3,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` RemoveIfNotAttached bool `protobuf:"varint,4,opt,name=remove_if_not_attached,json=removeIfNotAttached,proto3" json:"remove_if_not_attached,omitempty"` @@ -383,11 +359,11 @@ func (m *DetachDocumentRequest) XXX_DiscardUnknown() { var xxx_messageInfo_DetachDocumentRequest proto.InternalMessageInfo -func (m *DetachDocumentRequest) GetClientId() []byte { +func (m *DetachDocumentRequest) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } func (m *DetachDocumentRequest) GetDocumentId() string { @@ -412,7 +388,6 @@ func (m *DetachDocumentRequest) GetRemoveIfNotAttached() bool { } type DetachDocumentResponse struct { - ClientKey string `protobuf:"bytes,1,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"` ChangePack *ChangePack `protobuf:"bytes,2,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -452,13 +427,6 @@ func (m *DetachDocumentResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DetachDocumentResponse proto.InternalMessageInfo -func (m *DetachDocumentResponse) GetClientKey() string { - if m != nil { - return m.ClientKey - } - return "" -} - func (m *DetachDocumentResponse) GetChangePack() *ChangePack { if m != nil { return m.ChangePack @@ -467,7 +435,7 @@ func (m *DetachDocumentResponse) GetChangePack() *ChangePack { } type WatchDocumentRequest struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` DocumentId string `protobuf:"bytes,2,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -507,11 +475,11 @@ func (m *WatchDocumentRequest) XXX_DiscardUnknown() { var xxx_messageInfo_WatchDocumentRequest proto.InternalMessageInfo -func (m *WatchDocumentRequest) GetClientId() []byte { +func (m *WatchDocumentRequest) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } func (m *WatchDocumentRequest) GetDocumentId() string { @@ -610,7 +578,7 @@ func (*WatchDocumentResponse) XXX_OneofWrappers() []interface{} { } type WatchDocumentResponse_Initialization struct { - ClientIds [][]byte `protobuf:"bytes,1,rep,name=client_ids,json=clientIds,proto3" json:"client_ids,omitempty"` + ClientIds []string `protobuf:"bytes,1,rep,name=client_ids,json=clientIds,proto3" json:"client_ids,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -649,7 +617,7 @@ func (m *WatchDocumentResponse_Initialization) XXX_DiscardUnknown() { var xxx_messageInfo_WatchDocumentResponse_Initialization proto.InternalMessageInfo -func (m *WatchDocumentResponse_Initialization) GetClientIds() [][]byte { +func (m *WatchDocumentResponse_Initialization) GetClientIds() []string { if m != nil { return m.ClientIds } @@ -657,7 +625,7 @@ func (m *WatchDocumentResponse_Initialization) GetClientIds() [][]byte { } type RemoveDocumentRequest struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` DocumentId string `protobuf:"bytes,2,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"` ChangePack *ChangePack `protobuf:"bytes,3,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -698,11 +666,11 @@ func (m *RemoveDocumentRequest) XXX_DiscardUnknown() { var xxx_messageInfo_RemoveDocumentRequest proto.InternalMessageInfo -func (m *RemoveDocumentRequest) GetClientId() []byte { +func (m *RemoveDocumentRequest) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } func (m *RemoveDocumentRequest) GetDocumentId() string { @@ -720,8 +688,7 @@ func (m *RemoveDocumentRequest) GetChangePack() *ChangePack { } type RemoveDocumentResponse struct { - ClientKey string `protobuf:"bytes,1,opt,name=client_key,json=clientKey,proto3" json:"client_key,omitempty"` - ChangePack *ChangePack `protobuf:"bytes,2,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` + ChangePack *ChangePack `protobuf:"bytes,1,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -760,13 +727,6 @@ func (m *RemoveDocumentResponse) XXX_DiscardUnknown() { var xxx_messageInfo_RemoveDocumentResponse proto.InternalMessageInfo -func (m *RemoveDocumentResponse) GetClientKey() string { - if m != nil { - return m.ClientKey - } - return "" -} - func (m *RemoveDocumentResponse) GetChangePack() *ChangePack { if m != nil { return m.ChangePack @@ -775,7 +735,7 @@ func (m *RemoveDocumentResponse) GetChangePack() *ChangePack { } type PushPullChangesRequest struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` + ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` DocumentId string `protobuf:"bytes,2,opt,name=document_id,json=documentId,proto3" json:"document_id,omitempty"` ChangePack *ChangePack `protobuf:"bytes,3,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` PushOnly bool `protobuf:"varint,4,opt,name=push_only,json=pushOnly,proto3" json:"push_only,omitempty"` @@ -817,11 +777,11 @@ func (m *PushPullChangesRequest) XXX_DiscardUnknown() { var xxx_messageInfo_PushPullChangesRequest proto.InternalMessageInfo -func (m *PushPullChangesRequest) GetClientId() []byte { +func (m *PushPullChangesRequest) GetClientId() string { if m != nil { return m.ClientId } - return nil + return "" } func (m *PushPullChangesRequest) GetDocumentId() string { @@ -846,8 +806,7 @@ func (m *PushPullChangesRequest) GetPushOnly() bool { } type PushPullChangesResponse struct { - ClientId []byte `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty"` - ChangePack *ChangePack `protobuf:"bytes,2,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` + ChangePack *ChangePack `protobuf:"bytes,1,opt,name=change_pack,json=changePack,proto3" json:"change_pack,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -886,13 +845,6 @@ func (m *PushPullChangesResponse) XXX_DiscardUnknown() { var xxx_messageInfo_PushPullChangesResponse proto.InternalMessageInfo -func (m *PushPullChangesResponse) GetClientId() []byte { - if m != nil { - return m.ClientId - } - return nil -} - func (m *PushPullChangesResponse) GetChangePack() *ChangePack { if m != nil { return m.ChangePack @@ -921,49 +873,48 @@ func init() { func init() { proto.RegisterFile("yorkie/v1/yorkie.proto", fileDescriptor_40070c858814ab24) } var fileDescriptor_40070c858814ab24 = []byte{ - // 661 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcd, 0x6e, 0xd3, 0x40, - 0x10, 0xce, 0xd2, 0x1f, 0x35, 0x93, 0xb6, 0xc0, 0x96, 0xa4, 0x21, 0x15, 0xa9, 0x59, 0x2e, 0x91, - 0x2a, 0x39, 0xa4, 0x95, 0xca, 0x81, 0x53, 0xdb, 0x20, 0x35, 0x42, 0x82, 0xc8, 0x54, 0x54, 0xad, - 0x84, 0x2c, 0xd7, 0xde, 0x92, 0x55, 0x5c, 0x6f, 0xb0, 0xd7, 0x96, 0xcc, 0x03, 0x70, 0x83, 0x33, - 0xef, 0xc0, 0x5b, 0x70, 0xe2, 0xc8, 0x91, 0x23, 0x2a, 0x2f, 0x82, 0x62, 0x3b, 0xc1, 0xeb, 0x9a, - 0x34, 0x54, 0x54, 0x70, 0xb3, 0x67, 0xe7, 0xfb, 0xfc, 0xcd, 0xec, 0xfc, 0x18, 0x2a, 0x21, 0x77, - 0xfb, 0x8c, 0x36, 0x83, 0x56, 0x33, 0x7e, 0x52, 0x07, 0x2e, 0x17, 0x1c, 0x17, 0x93, 0xb7, 0xa0, - 0x55, 0xbb, 0xfb, 0xcb, 0xc5, 0xa5, 0x1e, 0xf7, 0x5d, 0x93, 0x7a, 0xb1, 0x17, 0xd9, 0x86, 0xf2, - 0x8e, 0x29, 0x58, 0x60, 0x08, 0xba, 0x67, 0x33, 0xea, 0x08, 0x8d, 0xbe, 0xf1, 0xa9, 0x27, 0xf0, - 0x3d, 0x00, 0x33, 0x32, 0xe8, 0x7d, 0x1a, 0x56, 0x91, 0x82, 0x1a, 0x45, 0xad, 0x18, 0x5b, 0x9e, - 0xd2, 0x90, 0x1c, 0x40, 0x25, 0x8b, 0xf3, 0x06, 0xdc, 0xf1, 0xe8, 0x25, 0x40, 0xbc, 0x06, 0xc9, - 0x8b, 0xce, 0xac, 0xea, 0x0d, 0x05, 0x35, 0x16, 0xb5, 0x85, 0xd8, 0xd0, 0xb1, 0xc8, 0x36, 0xac, - 0xb6, 0xa9, 0x91, 0xab, 0x47, 0xc2, 0xa1, 0x0c, 0xee, 0x11, 0x54, 0x2f, 0xe2, 0x12, 0x3d, 0x13, - 0x81, 0x36, 0x94, 0x77, 0x84, 0x30, 0xcc, 0x5e, 0x9b, 0x9b, 0xfe, 0xd9, 0x94, 0x9f, 0xc3, 0xdb, - 0x50, 0x32, 0x7b, 0x86, 0xf3, 0x9a, 0xea, 0x03, 0xc3, 0xec, 0x47, 0x51, 0x94, 0x36, 0xcb, 0xea, - 0x38, 0xe1, 0xea, 0x5e, 0x74, 0xda, 0x35, 0xcc, 0xbe, 0x06, 0xe6, 0xf8, 0x99, 0x7c, 0x40, 0x50, - 0xc9, 0x7e, 0x6e, 0x0a, 0x95, 0x78, 0x1d, 0x4a, 0x56, 0x02, 0x18, 0x65, 0xad, 0xa8, 0xc1, 0xc8, - 0x74, 0x51, 0xd0, 0xcc, 0xb4, 0x82, 0x3e, 0x23, 0x28, 0xb7, 0xe9, 0x1f, 0xc7, 0x7f, 0x5d, 0x7a, - 0xf0, 0x16, 0x54, 0x5c, 0x7a, 0xc6, 0x03, 0xaa, 0xb3, 0x53, 0xdd, 0xe1, 0x42, 0x37, 0xa2, 0x6c, - 0x51, 0xab, 0x3a, 0xab, 0xa0, 0xc6, 0x82, 0xb6, 0x12, 0x9f, 0x76, 0x4e, 0x9f, 0x71, 0xb1, 0x93, - 0x1c, 0x11, 0x0e, 0x95, 0x6c, 0x0c, 0xd3, 0x95, 0xe2, 0x55, 0xaf, 0xf1, 0x00, 0xee, 0x1c, 0x1a, - 0xe2, 0x2f, 0xe7, 0x8c, 0x7c, 0x43, 0x50, 0xce, 0xd0, 0x26, 0x61, 0x1c, 0xc1, 0x32, 0x73, 0x98, - 0x60, 0x86, 0xcd, 0xde, 0x1a, 0x82, 0x71, 0x27, 0x22, 0x2f, 0x6d, 0x36, 0x53, 0x52, 0x73, 0x91, - 0x6a, 0x47, 0x82, 0xed, 0x17, 0xb4, 0x0c, 0x11, 0xde, 0x80, 0x39, 0x1a, 0x50, 0x47, 0x24, 0xc1, - 0xaf, 0xa4, 0x18, 0xdb, 0xdc, 0x7c, 0x32, 0x3c, 0xda, 0x2f, 0x68, 0xb1, 0x4f, 0xad, 0x09, 0xcb, - 0x32, 0x61, 0x2a, 0xc1, 0xcc, 0xf2, 0xaa, 0x48, 0x99, 0x69, 0x2c, 0x8e, 0x12, 0xdc, 0xb1, 0xbc, - 0xdd, 0x79, 0x98, 0x3d, 0xe1, 0x56, 0x48, 0xde, 0x23, 0x28, 0x6b, 0xd1, 0xcd, 0xfd, 0x17, 0x65, - 0x36, 0xac, 0x98, 0xac, 0x9c, 0xeb, 0xad, 0x98, 0x4f, 0x08, 0x2a, 0x5d, 0xdf, 0xeb, 0x75, 0x7d, - 0xdb, 0x8e, 0x5d, 0xbc, 0x7f, 0xdb, 0x68, 0x6b, 0x50, 0x1c, 0xf8, 0x5e, 0x4f, 0xe7, 0x8e, 0x1d, - 0x26, 0xbd, 0xb5, 0x30, 0x34, 0x3c, 0x77, 0xec, 0x90, 0x38, 0xb0, 0x7a, 0x41, 0xec, 0x34, 0x63, - 0xea, 0x8a, 0xd9, 0xd9, 0x7c, 0x37, 0x07, 0x4b, 0x47, 0x91, 0xd3, 0x0b, 0xea, 0x06, 0xcc, 0xa4, - 0xf8, 0x10, 0x96, 0xe5, 0xed, 0x82, 0x95, 0x14, 0x4d, 0xee, 0xc2, 0xaa, 0xdd, 0x9f, 0xe0, 0x11, - 0xab, 0x27, 0x05, 0xfc, 0x0a, 0x6e, 0x65, 0x17, 0x05, 0x26, 0xe9, 0xa2, 0xcf, 0xdf, 0x3e, 0xb5, - 0x07, 0x13, 0x7d, 0xc6, 0xf4, 0x43, 0xdd, 0xd2, 0x7c, 0x97, 0x75, 0xe7, 0x6d, 0x1a, 0x59, 0x77, - 0xee, 0x72, 0x88, 0x89, 0xe5, 0x19, 0x27, 0x11, 0xe7, 0x8e, 0x70, 0x89, 0x38, 0x7f, 0x40, 0xc6, - 0xc4, 0x72, 0x2b, 0x48, 0xc4, 0xb9, 0x4d, 0x2b, 0x11, 0xe7, 0xf7, 0x11, 0x29, 0xe0, 0x63, 0xb8, - 0x99, 0x29, 0x22, 0x9c, 0xc6, 0xe5, 0x77, 0x43, 0x8d, 0x4c, 0x72, 0x19, 0x73, 0xbf, 0x84, 0x25, - 0x69, 0xde, 0xe1, 0xf5, 0xdf, 0x4f, 0xc2, 0x98, 0x57, 0xb9, 0x6c, 0x54, 0x92, 0xc2, 0x43, 0xb4, - 0xbb, 0xf1, 0xe5, 0xbc, 0x8e, 0xbe, 0x9e, 0xd7, 0xd1, 0xf7, 0xf3, 0x3a, 0xfa, 0xf8, 0xa3, 0x5e, - 0x80, 0xdb, 0x16, 0x0d, 0x46, 0x50, 0x63, 0xc0, 0xd4, 0xa0, 0xd5, 0x45, 0xc7, 0xb3, 0xea, 0xe3, - 0xa0, 0x75, 0x32, 0x1f, 0xfd, 0x40, 0x6d, 0xfd, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x78, 0xaa, 0xfe, - 0x50, 0x80, 0x09, 0x00, 0x00, + // 650 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcf, 0x6e, 0xd3, 0x4e, + 0x10, 0xce, 0xf6, 0x9f, 0x9a, 0x89, 0xda, 0xdf, 0x8f, 0x2d, 0x49, 0x43, 0x2a, 0x52, 0xb3, 0x5c, + 0x2a, 0x55, 0x72, 0x48, 0x2b, 0x7a, 0xe1, 0xd4, 0x36, 0x48, 0x8d, 0x90, 0x20, 0x18, 0x44, 0xd5, + 0x4a, 0xc8, 0x72, 0xed, 0x2d, 0x59, 0xc5, 0xf5, 0xa6, 0xf6, 0xda, 0x92, 0x79, 0x00, 0x6e, 0xdc, + 0x79, 0x07, 0xde, 0x82, 0x13, 0x47, 0x8e, 0x1c, 0x51, 0x79, 0x11, 0x14, 0xdb, 0x4d, 0xbd, 0xee, + 0x92, 0x16, 0x8a, 0x04, 0xb7, 0xcd, 0xec, 0x37, 0xdf, 0x7c, 0x3b, 0x99, 0xf9, 0x64, 0xa8, 0xc5, + 0xdc, 0x1f, 0x30, 0xda, 0x8a, 0xda, 0xad, 0xf4, 0xa4, 0x0f, 0x7d, 0x2e, 0x38, 0x2e, 0x67, 0xbf, + 0xa2, 0x76, 0xe3, 0xce, 0x05, 0xc4, 0xa7, 0x01, 0x0f, 0x7d, 0x9b, 0x06, 0x29, 0x8a, 0x6c, 0x41, + 0x75, 0xdb, 0x16, 0x2c, 0xb2, 0x04, 0xdd, 0x75, 0x19, 0xf5, 0x84, 0x41, 0x4f, 0x43, 0x1a, 0x08, + 0x7c, 0x17, 0xc0, 0x4e, 0x02, 0xe6, 0x80, 0xc6, 0x75, 0xa4, 0xa1, 0xb5, 0xb2, 0x51, 0x4e, 0x23, + 0x4f, 0x68, 0x4c, 0x1e, 0x42, 0xad, 0x98, 0x17, 0x0c, 0xb9, 0x17, 0x50, 0xbc, 0x02, 0x19, 0xcc, + 0x64, 0x4e, 0x96, 0x37, 0x9f, 0x06, 0xba, 0x0e, 0xd9, 0x82, 0xe5, 0x0e, 0xb5, 0x94, 0x05, 0x27, + 0xe6, 0x35, 0xa0, 0x7e, 0x39, 0x2f, 0x2d, 0x48, 0x5c, 0xa8, 0x6e, 0x0b, 0x61, 0xd9, 0xfd, 0x0e, + 0xb7, 0xc3, 0x93, 0x6b, 0x32, 0xe2, 0x2d, 0xa8, 0xd8, 0x7d, 0xcb, 0x7b, 0x43, 0xcd, 0xa1, 0x65, + 0x0f, 0xea, 0x53, 0x1a, 0x5a, 0xab, 0x6c, 0x54, 0xf5, 0x71, 0xd3, 0xf4, 0xdd, 0xe4, 0xb6, 0x67, + 0xd9, 0x03, 0x03, 0xec, 0xf1, 0x99, 0x9c, 0x42, 0xad, 0x58, 0x2d, 0x7b, 0xf8, 0x2a, 0x54, 0x9c, + 0x2c, 0x76, 0x51, 0x10, 0xce, 0x43, 0x37, 0x28, 0xf9, 0x09, 0x41, 0xb5, 0x43, 0x7f, 0xf9, 0x85, + 0x05, 0x3d, 0x53, 0x57, 0xe9, 0x99, 0xbe, 0xa6, 0x1e, 0xbc, 0x09, 0x35, 0x9f, 0x9e, 0xf0, 0x88, + 0x9a, 0xec, 0xd8, 0xf4, 0xb8, 0x30, 0xad, 0xa4, 0x21, 0xd4, 0xa9, 0xcf, 0x68, 0x68, 0x6d, 0xde, + 0x58, 0x4a, 0x6f, 0xbb, 0xc7, 0x4f, 0xb9, 0xd8, 0xce, 0xae, 0x48, 0x0f, 0x6a, 0xc5, 0x37, 0x64, + 0x7d, 0xfb, 0xdd, 0xb6, 0xbc, 0x84, 0xdb, 0xfb, 0x96, 0xf8, 0xc3, 0x4d, 0x21, 0x5f, 0x11, 0x54, + 0x0b, 0xb4, 0x99, 0xce, 0x03, 0x58, 0x64, 0x1e, 0x13, 0xcc, 0x72, 0xd9, 0x5b, 0x4b, 0x30, 0xee, + 0x25, 0xe4, 0x95, 0x8d, 0x56, 0x4e, 0xaa, 0x32, 0x53, 0xef, 0x4a, 0x69, 0x7b, 0x25, 0xa3, 0x40, + 0x84, 0xd7, 0x61, 0x96, 0x46, 0xd4, 0x13, 0xd9, 0xe3, 0x97, 0x72, 0x8c, 0x1d, 0x6e, 0x3f, 0x1e, + 0x5d, 0xed, 0x95, 0x8c, 0x14, 0xd3, 0x68, 0xc1, 0xa2, 0x4c, 0x98, 0xdb, 0x55, 0xe6, 0x04, 0x75, + 0xa4, 0x4d, 0x5f, 0xec, 0x6a, 0xd7, 0x09, 0x76, 0xe6, 0x60, 0xe6, 0x88, 0x3b, 0x31, 0x79, 0x8f, + 0xa0, 0x6a, 0x24, 0x7f, 0xcd, 0x3f, 0x31, 0x47, 0xa3, 0x91, 0x28, 0xca, 0x51, 0x8f, 0x04, 0xba, + 0x2e, 0xe3, 0x47, 0x04, 0xb5, 0x5e, 0x18, 0xf4, 0x7b, 0xa1, 0xeb, 0xa6, 0x90, 0xe0, 0xef, 0xae, + 0xca, 0x0a, 0x94, 0x87, 0x61, 0xd0, 0x37, 0xb9, 0xe7, 0xc6, 0xd9, 0x76, 0xcc, 0x8f, 0x02, 0xcf, + 0x3c, 0x37, 0x26, 0xcf, 0x61, 0xf9, 0x92, 0xd8, 0x9b, 0x35, 0x60, 0xe3, 0xdd, 0x2c, 0x2c, 0x1c, + 0x24, 0xa0, 0x17, 0xd4, 0x8f, 0x98, 0x4d, 0xf1, 0x3e, 0x2c, 0xca, 0x46, 0x8d, 0xb5, 0x1c, 0x8d, + 0xd2, 0xfb, 0x1b, 0xf7, 0x26, 0x20, 0x32, 0xd3, 0x2d, 0xe1, 0xd7, 0xf0, 0x7f, 0xd1, 0x92, 0x31, + 0xc9, 0x0f, 0xae, 0xda, 0xe7, 0x1b, 0xf7, 0x27, 0x62, 0xc6, 0xf4, 0x23, 0xdd, 0x92, 0xcf, 0xca, + 0xba, 0x55, 0x86, 0x2f, 0xeb, 0x56, 0x9a, 0x74, 0x4a, 0x2c, 0x1b, 0x91, 0x44, 0xac, 0xf4, 0x59, + 0x89, 0x58, 0xed, 0x62, 0x29, 0xb1, 0x3c, 0xce, 0x12, 0xb1, 0x72, 0xf1, 0x24, 0x62, 0xf5, 0x2e, + 0x90, 0x12, 0x3e, 0x84, 0xff, 0x0a, 0x73, 0x82, 0xf3, 0x79, 0xea, 0x81, 0x6f, 0x90, 0x49, 0x90, + 0x31, 0xf7, 0x2b, 0x58, 0x90, 0x3c, 0x0b, 0xaf, 0xfe, 0xdc, 0xcd, 0x52, 0x5e, 0xed, 0x2a, 0xbb, + 0x23, 0xa5, 0x07, 0x68, 0x67, 0xfd, 0xf3, 0x59, 0x13, 0x7d, 0x39, 0x6b, 0xa2, 0x6f, 0x67, 0x4d, + 0xf4, 0xe1, 0x7b, 0xb3, 0x04, 0xb7, 0x1c, 0x1a, 0x9d, 0xa7, 0x5a, 0x43, 0xa6, 0x47, 0xed, 0x1e, + 0x3a, 0x9c, 0xd1, 0x1f, 0x45, 0xed, 0xa3, 0xb9, 0xe4, 0x5b, 0x64, 0xf3, 0x47, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x8c, 0xb9, 0x33, 0xc1, 0xcb, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1353,13 +1304,6 @@ func (m *ActivateClientResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) copy(dAtA[i:], m.ClientId) i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientId))) i-- - dAtA[i] = 0x12 - } - if len(m.ClientKey) > 0 { - i -= len(m.ClientKey) - copy(dAtA[i:], m.ClientKey) - i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientKey))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -1423,13 +1367,6 @@ func (m *DeactivateClientResponse) MarshalToSizedBuffer(dAtA []byte) (int, error i -= len(m.XXX_unrecognized) copy(dAtA[i:], m.XXX_unrecognized) } - if len(m.ClientId) > 0 { - i -= len(m.ClientId) - copy(dAtA[i:], m.ClientId) - i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientId))) - i-- - dAtA[i] = 0xa - } return len(dAtA) - i, nil } @@ -1513,20 +1450,13 @@ func (m *AttachDocumentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintYorkie(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } if len(m.DocumentId) > 0 { i -= len(m.DocumentId) copy(dAtA[i:], m.DocumentId) i = encodeVarintYorkie(dAtA, i, uint64(len(m.DocumentId))) i-- - dAtA[i] = 0x12 - } - if len(m.ClientId) > 0 { - i -= len(m.ClientId) - copy(dAtA[i:], m.ClientId) - i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientId))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -1631,13 +1561,6 @@ func (m *DetachDocumentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x12 } - if len(m.ClientKey) > 0 { - i -= len(m.ClientKey) - copy(dAtA[i:], m.ClientKey) - i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientKey))) - i-- - dAtA[i] = 0xa - } return len(dAtA) - i, nil } @@ -1883,13 +1806,6 @@ func (m *RemoveDocumentResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintYorkie(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 - } - if len(m.ClientKey) > 0 { - i -= len(m.ClientKey) - copy(dAtA[i:], m.ClientKey) - i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientKey))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -1992,13 +1908,6 @@ func (m *PushPullChangesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) i = encodeVarintYorkie(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 - } - if len(m.ClientId) > 0 { - i -= len(m.ClientId) - copy(dAtA[i:], m.ClientId) - i = encodeVarintYorkie(dAtA, i, uint64(len(m.ClientId))) - i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -2037,10 +1946,6 @@ func (m *ActivateClientResponse) Size() (n int) { } var l int _ = l - l = len(m.ClientKey) - if l > 0 { - n += 1 + l + sovYorkie(uint64(l)) - } l = len(m.ClientId) if l > 0 { n += 1 + l + sovYorkie(uint64(l)) @@ -2073,10 +1978,6 @@ func (m *DeactivateClientResponse) Size() (n int) { } var l int _ = l - l = len(m.ClientId) - if l > 0 { - n += 1 + l + sovYorkie(uint64(l)) - } if m.XXX_unrecognized != nil { n += len(m.XXX_unrecognized) } @@ -2109,10 +2010,6 @@ func (m *AttachDocumentResponse) Size() (n int) { } var l int _ = l - l = len(m.ClientId) - if l > 0 { - n += 1 + l + sovYorkie(uint64(l)) - } l = len(m.DocumentId) if l > 0 { n += 1 + l + sovYorkie(uint64(l)) @@ -2160,10 +2057,6 @@ func (m *DetachDocumentResponse) Size() (n int) { } var l int _ = l - l = len(m.ClientKey) - if l > 0 { - n += 1 + l + sovYorkie(uint64(l)) - } if m.ChangePack != nil { l = m.ChangePack.Size() n += 1 + l + sovYorkie(uint64(l)) @@ -2240,8 +2133,8 @@ func (m *WatchDocumentResponse_Initialization) Size() (n int) { var l int _ = l if len(m.ClientIds) > 0 { - for _, b := range m.ClientIds { - l = len(b) + for _, s := range m.ClientIds { + l = len(s) n += 1 + l + sovYorkie(uint64(l)) } } @@ -2281,10 +2174,6 @@ func (m *RemoveDocumentResponse) Size() (n int) { } var l int _ = l - l = len(m.ClientKey) - if l > 0 { - n += 1 + l + sovYorkie(uint64(l)) - } if m.ChangePack != nil { l = m.ChangePack.Size() n += 1 + l + sovYorkie(uint64(l)) @@ -2328,10 +2217,6 @@ func (m *PushPullChangesResponse) Size() (n int) { } var l int _ = l - l = len(m.ClientId) - if l > 0 { - n += 1 + l + sovYorkie(uint64(l)) - } if m.ChangePack != nil { l = m.ChangePack.Size() n += 1 + l + sovYorkie(uint64(l)) @@ -2462,7 +2347,7 @@ func (m *ActivateClientResponse) Unmarshal(dAtA []byte) error { switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2490,41 +2375,7 @@ func (m *ActivateClientResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowYorkie - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthYorkie - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthYorkie - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -2581,7 +2432,7 @@ func (m *DeactivateClientRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -2591,25 +2442,23 @@ func (m *DeactivateClientRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -2662,40 +2511,6 @@ func (m *DeactivateClientResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: DeactivateClientResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowYorkie - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthYorkie - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthYorkie - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipYorkie(dAtA[iNdEx:]) @@ -2751,7 +2566,7 @@ func (m *AttachDocumentRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -2761,25 +2576,23 @@ func (m *AttachDocumentRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -2869,40 +2682,6 @@ func (m *AttachDocumentResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowYorkie - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthYorkie - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthYorkie - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DocumentId", wireType) } @@ -2934,7 +2713,7 @@ func (m *AttachDocumentResponse) Unmarshal(dAtA []byte) error { } m.DocumentId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ChangePack", wireType) } @@ -3025,7 +2804,7 @@ func (m *DetachDocumentRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -3035,25 +2814,23 @@ func (m *DetachDocumentRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -3194,38 +2971,6 @@ func (m *DetachDocumentResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: DetachDocumentResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientKey", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowYorkie - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthYorkie - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthYorkie - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ChangePack", wireType) @@ -3317,7 +3062,7 @@ func (m *WatchDocumentRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -3327,25 +3072,23 @@ func (m *WatchDocumentRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -3555,7 +3298,7 @@ func (m *WatchDocumentResponse_Initialization) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientIds", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -3565,23 +3308,23 @@ func (m *WatchDocumentResponse_Initialization) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientIds = append(m.ClientIds, make([]byte, postIndex-iNdEx)) - copy(m.ClientIds[len(m.ClientIds)-1], dAtA[iNdEx:postIndex]) + m.ClientIds = append(m.ClientIds, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex @@ -3638,7 +3381,7 @@ func (m *RemoveDocumentRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -3648,25 +3391,23 @@ func (m *RemoveDocumentRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -3788,38 +3529,6 @@ func (m *RemoveDocumentResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientKey", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowYorkie - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthYorkie - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthYorkie - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientKey = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ChangePack", wireType) } @@ -3910,7 +3619,7 @@ func (m *PushPullChangesRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowYorkie @@ -3920,25 +3629,23 @@ func (m *PushPullChangesRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthYorkie } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthYorkie } if postIndex > l { return io.ErrUnexpectedEOF } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } + m.ClientId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { @@ -4080,40 +3787,6 @@ func (m *PushPullChangesResponse) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ClientId", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowYorkie - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthYorkie - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthYorkie - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ClientId = append(m.ClientId[:0], dAtA[iNdEx:postIndex]...) - if m.ClientId == nil { - m.ClientId = []byte{} - } - iNdEx = postIndex - case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ChangePack", wireType) } diff --git a/api/yorkie/v1/yorkie.proto b/api/yorkie/v1/yorkie.proto index b4f0eda6a..639ddd37d 100644 --- a/api/yorkie/v1/yorkie.proto +++ b/api/yorkie/v1/yorkie.proto @@ -42,49 +42,45 @@ message ActivateClientRequest { } message ActivateClientResponse { - string client_key = 1; - bytes client_id = 2; + string client_id = 1; } message DeactivateClientRequest { - bytes client_id = 1; + string client_id = 1; } message DeactivateClientResponse { - bytes client_id = 1; } message AttachDocumentRequest { - bytes client_id = 1; + string client_id = 1; ChangePack change_pack = 2; } message AttachDocumentResponse { - bytes client_id = 1; - string document_id = 2; - ChangePack change_pack = 3; + string document_id = 1; + ChangePack change_pack = 2; } message DetachDocumentRequest { - bytes client_id = 1; + string client_id = 1; string document_id = 2; ChangePack change_pack = 3; bool remove_if_not_attached = 4; } message DetachDocumentResponse { - string client_key = 1; ChangePack change_pack = 2; } message WatchDocumentRequest { - bytes client_id = 1; + string client_id = 1; string document_id = 2; } message WatchDocumentResponse { message Initialization { - repeated bytes client_ids = 1; + repeated string client_ids = 1; } oneof body { @@ -94,24 +90,22 @@ message WatchDocumentResponse { } message RemoveDocumentRequest { - bytes client_id = 1; + string client_id = 1; string document_id = 2; ChangePack change_pack = 3; } message RemoveDocumentResponse { - string client_key = 1; - ChangePack change_pack = 2; + ChangePack change_pack = 1; } message PushPullChangesRequest { - bytes client_id = 1; + string client_id = 1; string document_id = 2; ChangePack change_pack = 3; bool push_only = 4; } message PushPullChangesResponse { - bytes client_id = 1; - ChangePack change_pack = 2; + ChangePack change_pack = 1; } diff --git a/client/client.go b/client/client.go index 34254b4d3..453fccbb6 100644 --- a/client/client.go +++ b/client/client.go @@ -214,7 +214,7 @@ func (c *Client) Activate(ctx context.Context) error { return err } - clientID, err := time.ActorIDFromBytes(response.ClientId) + clientID, err := time.ActorIDFromHex(response.ClientId) if err != nil { return err } @@ -232,7 +232,7 @@ func (c *Client) Deactivate(ctx context.Context) error { } _, err := c.client.DeactivateClient(withShardKey(ctx, c.options.APIKey), &api.DeactivateClientRequest{ - ClientId: c.id.Bytes(), + ClientId: c.id.String(), }) if err != nil { return err @@ -276,7 +276,7 @@ func (c *Client) Attach(ctx context.Context, doc *document.Document, options ... res, err := c.client.AttachDocument( withShardKey(ctx, c.options.APIKey, doc.Key().String()), &api.AttachDocumentRequest{ - ClientId: c.id.Bytes(), + ClientId: c.id.String(), ChangePack: pbChangePack, }, ) @@ -349,7 +349,7 @@ func (c *Client) Detach(ctx context.Context, doc *document.Document, options ... res, err := c.client.DetachDocument( withShardKey(ctx, c.options.APIKey, doc.Key().String()), &api.DetachDocumentRequest{ - ClientId: c.id.Bytes(), + ClientId: c.id.String(), DocumentId: attachment.docID.String(), ChangePack: pbChangePack, RemoveIfNotAttached: opts.removeIfNotAttached, @@ -412,7 +412,7 @@ func (c *Client) Watch( stream, err := c.client.WatchDocument( withShardKey(ctx, c.options.APIKey, doc.Key().String()), &api.WatchDocumentRequest{ - ClientId: c.id.Bytes(), + ClientId: c.id.String(), DocumentId: attachment.docID.String(), }, ) @@ -425,7 +425,7 @@ func (c *Client) Watch( case *api.WatchDocumentResponse_Initialization_: var clientIDs []string for _, clientID := range resp.Initialization.ClientIds { - id, err := time.ActorIDFromBytes(clientID) + id, err := time.ActorIDFromHex(clientID) if err != nil { return nil, err } @@ -440,7 +440,7 @@ func (c *Client) Watch( return nil, err } - cli, err := time.ActorIDFromBytes(resp.Event.Publisher) + cli, err := time.ActorIDFromHex(resp.Event.Publisher) if err != nil { return nil, err } @@ -581,7 +581,7 @@ func (c *Client) pushPullChanges(ctx context.Context, opt SyncOptions) error { res, err := c.client.PushPullChanges( withShardKey(ctx, c.options.APIKey, opt.key.String()), &api.PushPullChangesRequest{ - ClientId: c.id.Bytes(), + ClientId: c.id.String(), DocumentId: attachment.docID.String(), ChangePack: pbChangePack, PushOnly: opt.mode == types.SyncModePushOnly, @@ -626,7 +626,7 @@ func (c *Client) Remove(ctx context.Context, doc *document.Document) error { res, err := c.client.RemoveDocument( withShardKey(ctx, c.options.APIKey, doc.Key().String()), &api.RemoveDocumentRequest{ - ClientId: c.id.Bytes(), + ClientId: c.id.String(), DocumentId: attachment.docID.String(), ChangePack: pbChangePack, }, diff --git a/client/client_test.go b/client/client_test.go index e7a32877b..cc780cc1f 100644 --- a/client/client_test.go +++ b/client/client_test.go @@ -86,8 +86,6 @@ func TestClient(t *testing.T) { t.Run("x-shard-key test", func(t *testing.T) { dummyID := types.ID("000000000000000000000000") - dummyActorID, err := dummyID.Bytes() - assert.NoError(t, err) testServer, addr := dialTestYorkieServer(t) defer testServer.Stop() @@ -113,7 +111,7 @@ func TestClient(t *testing.T) { assert.Equal(t, "dummy-api-key", data[types.ShardKey][0]) return &api.ActivateClientResponse{ - ClientId: dummyActorID, + ClientId: dummyID.String(), }, nil }, ) diff --git a/server/rpc/server_test.go b/server/rpc/server_test.go index 41eb63f75..faad247e8 100644 --- a/server/rpc/server_test.go +++ b/server/rpc/server_test.go @@ -48,9 +48,9 @@ var ( defaultProjectName = "default" invalidSlugName = "@#$%^&*()_+" - nilClientID, _ = hex.DecodeString("000000000000000000000000") - emptyClientID, _ = hex.DecodeString("") - invalidClientID, _ = hex.DecodeString("invalid") + nilClientID = "000000000000000000000000" + emptyClientID = "" + invalidClientID = "invalid" testRPCServer *rpc.Server testRPCAddr = fmt.Sprintf("localhost:%d", helper.RPCPort) @@ -387,6 +387,7 @@ func TestSDKRPCServerBackend(t *testing.T) { ) assert.NoError(t, err) + actorID, _ := hex.DecodeString(activateResp.ClientId) resPack, err := testClient.AttachDocument( context.Background(), &api.AttachDocumentRequest{ @@ -398,7 +399,7 @@ func TestSDKRPCServerBackend(t *testing.T) { Id: &api.ChangeID{ ClientSeq: 1, Lamport: 1, - ActorId: activateResp.ClientId, + ActorId: actorID, }, }}, }, @@ -418,7 +419,7 @@ func TestSDKRPCServerBackend(t *testing.T) { Id: &api.ChangeID{ ClientSeq: 2, Lamport: 2, - ActorId: activateResp.ClientId, + ActorId: actorID, }, }}, }, @@ -438,7 +439,7 @@ func TestSDKRPCServerBackend(t *testing.T) { Id: &api.ChangeID{ ClientSeq: 3, Lamport: 3, - ActorId: activateResp.ClientId, + ActorId: actorID, }, }}, }, diff --git a/server/rpc/yorkie_server.go b/server/rpc/yorkie_server.go index b80533bc2..c0c2aef09 100644 --- a/server/rpc/yorkie_server.go +++ b/server/rpc/yorkie_server.go @@ -69,14 +69,8 @@ func (s *yorkieServer) ActivateClient( return nil, err } - pbClientID, err := cli.ID.Bytes() - if err != nil { - return nil, err - } - return &api.ActivateClientResponse{ - ClientKey: cli.Key, - ClientId: pbClientID, + ClientId: cli.ID.String(), }, nil } @@ -85,7 +79,7 @@ func (s *yorkieServer) DeactivateClient( ctx context.Context, req *api.DeactivateClientRequest, ) (*api.DeactivateClientResponse, error) { - actorID, err := time.ActorIDFromBytes(req.ClientId) + actorID, err := time.ActorIDFromHex(req.ClientId) if err != nil { return nil, err } @@ -97,19 +91,12 @@ func (s *yorkieServer) DeactivateClient( } project := projects.From(ctx) - cli, err := clients.Deactivate(ctx, s.backend.DB, project.ID, types.IDFromActorID(actorID)) + _, err = clients.Deactivate(ctx, s.backend.DB, project.ID, types.IDFromActorID(actorID)) if err != nil { return nil, err } - pbClientID, err := cli.ID.Bytes() - if err != nil { - return nil, err - } - - return &api.DeactivateClientResponse{ - ClientId: pbClientID, - }, nil + return &api.DeactivateClientResponse{}, nil } // AttachDocument attaches the given document to the client. @@ -117,7 +104,7 @@ func (s *yorkieServer) AttachDocument( ctx context.Context, req *api.AttachDocumentRequest, ) (*api.AttachDocumentResponse, error) { - actorID, err := time.ActorIDFromBytes(req.ClientId) + actorID, err := time.ActorIDFromHex(req.ClientId) if err != nil { return nil, err } @@ -186,7 +173,7 @@ func (s *yorkieServer) DetachDocument( ctx context.Context, req *api.DetachDocumentRequest, ) (*api.DetachDocumentResponse, error) { - actorID, err := time.ActorIDFromBytes(req.ClientId) + actorID, err := time.ActorIDFromHex(req.ClientId) if err != nil { return nil, err } @@ -268,7 +255,7 @@ func (s *yorkieServer) PushPullChanges( ctx context.Context, req *api.PushPullChangesRequest, ) (*api.PushPullChangesResponse, error) { - actorID, err := time.ActorIDFromBytes(req.ClientId) + actorID, err := time.ActorIDFromHex(req.ClientId) if err != nil { return nil, err } @@ -348,7 +335,7 @@ func (s *yorkieServer) WatchDocument( req *api.WatchDocumentRequest, stream api.YorkieService_WatchDocumentServer, ) error { - clientID, err := time.ActorIDFromBytes(req.ClientId) + clientID, err := time.ActorIDFromHex(req.ClientId) if err != nil { return err } @@ -404,9 +391,9 @@ func (s *yorkieServer) WatchDocument( s.unwatchDoc(subscription, docID) }() - var pbClientIDs [][]byte + var pbClientIDs []string for _, id := range clientIDs { - pbClientIDs = append(pbClientIDs, id.Bytes()) + pbClientIDs = append(pbClientIDs, id.String()) } if err := stream.Send(&api.WatchDocumentResponse{ Body: &api.WatchDocumentResponse_Initialization_{ @@ -434,7 +421,7 @@ func (s *yorkieServer) WatchDocument( Body: &api.WatchDocumentResponse_Event{ Event: &api.DocEvent{ Type: eventType, - Publisher: event.Publisher.Bytes(), + Publisher: event.Publisher.String(), }, }, }); err != nil { @@ -449,7 +436,7 @@ func (s *yorkieServer) RemoveDocument( ctx context.Context, req *api.RemoveDocumentRequest, ) (*api.RemoveDocumentResponse, error) { - actorID, err := time.ActorIDFromBytes(req.ClientId) + actorID, err := time.ActorIDFromHex(req.ClientId) if err != nil { return nil, err }