diff --git a/api/converter/from_pb.go b/api/converter/from_pb.go index 1d15f8539..b8fb7bb11 100644 --- a/api/converter/from_pb.go +++ b/api/converter/from_pb.go @@ -491,6 +491,13 @@ func fromTreeEdit(pbTreeEdit *api.Operation_TreeEdit) (*operations.TreeEdit, err return nil, err } + createdAtMapByActor, err := fromCreatedAtMapByActor( + pbTreeEdit.CreatedAtMapByActor, + ) + if err != nil { + return nil, err + } + nodes, err := FromTreeNodesWhenEdit(pbTreeEdit.Contents) if err != nil { return nil, err @@ -500,6 +507,7 @@ func fromTreeEdit(pbTreeEdit *api.Operation_TreeEdit) (*operations.TreeEdit, err parentCreatedAt, from, to, + createdAtMapByActor, nodes, executedAt, ), nil diff --git a/api/converter/to_pb.go b/api/converter/to_pb.go index b4d22e570..5dcab6e96 100644 --- a/api/converter/to_pb.go +++ b/api/converter/to_pb.go @@ -381,11 +381,12 @@ func toIncrease(increase *operations.Increase) (*api.Operation_Increase_, error) func toTreeEdit(e *operations.TreeEdit) (*api.Operation_TreeEdit_, error) { return &api.Operation_TreeEdit_{ TreeEdit: &api.Operation_TreeEdit{ - ParentCreatedAt: ToTimeTicket(e.ParentCreatedAt()), - From: toTreePos(e.FromPos()), - To: toTreePos(e.ToPos()), - Contents: ToTreeNodesWhenEdit(e.Contents()), - ExecutedAt: ToTimeTicket(e.ExecutedAt()), + ParentCreatedAt: ToTimeTicket(e.ParentCreatedAt()), + From: toTreePos(e.FromPos()), + To: toTreePos(e.ToPos()), + CreatedAtMapByActor: toCreatedAtMapByActor(e.CreatedAtMapByActor()), + Contents: ToTreeNodesWhenEdit(e.Contents()), + ExecutedAt: ToTimeTicket(e.ExecutedAt()), }, }, nil } diff --git a/api/yorkie/v1/resources.pb.go b/api/yorkie/v1/resources.pb.go index e7668b660..f3ab7e29d 100644 --- a/api/yorkie/v1/resources.pb.go +++ b/api/yorkie/v1/resources.pb.go @@ -996,6 +996,10 @@ func (m *Operation_Edit) GetAttributes() map[string]string { return nil } +// NOTE(hackerwins): Select Operation is not used in the current version. +// In the previous version, it was used to represent selection of Text. +// However, it has been replaced by Presence now. It is retained for backward +// compatibility purposes. type Operation_Select struct { ParentCreatedAt *TimeTicket `protobuf:"bytes,1,opt,name=parent_created_at,json=parentCreatedAt,proto3" json:"parent_created_at,omitempty"` From *TextNodePos `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` @@ -1210,14 +1214,15 @@ func (m *Operation_Increase) GetExecutedAt() *TimeTicket { } type Operation_TreeEdit struct { - ParentCreatedAt *TimeTicket `protobuf:"bytes,1,opt,name=parent_created_at,json=parentCreatedAt,proto3" json:"parent_created_at,omitempty"` - From *TreePos `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` - To *TreePos `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` - Contents []*TreeNodes `protobuf:"bytes,4,rep,name=contents,proto3" json:"contents,omitempty"` - ExecutedAt *TimeTicket `protobuf:"bytes,5,opt,name=executed_at,json=executedAt,proto3" json:"executed_at,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ParentCreatedAt *TimeTicket `protobuf:"bytes,1,opt,name=parent_created_at,json=parentCreatedAt,proto3" json:"parent_created_at,omitempty"` + From *TreePos `protobuf:"bytes,2,opt,name=from,proto3" json:"from,omitempty"` + To *TreePos `protobuf:"bytes,3,opt,name=to,proto3" json:"to,omitempty"` + CreatedAtMapByActor map[string]*TimeTicket `protobuf:"bytes,4,rep,name=created_at_map_by_actor,json=createdAtMapByActor,proto3" json:"created_at_map_by_actor,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + Contents []*TreeNodes `protobuf:"bytes,5,rep,name=contents,proto3" json:"contents,omitempty"` + ExecutedAt *TimeTicket `protobuf:"bytes,6,opt,name=executed_at,json=executedAt,proto3" json:"executed_at,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Operation_TreeEdit) Reset() { *m = Operation_TreeEdit{} } @@ -1274,6 +1279,13 @@ func (m *Operation_TreeEdit) GetTo() *TreePos { return nil } +func (m *Operation_TreeEdit) GetCreatedAtMapByActor() map[string]*TimeTicket { + if m != nil { + return m.CreatedAtMapByActor + } + return nil +} + func (m *Operation_TreeEdit) GetContents() []*TreeNodes { if m != nil { return m.Contents @@ -3323,6 +3335,7 @@ func init() { proto.RegisterMapType((map[string]string)(nil), "yorkie.v1.Operation.Style.AttributesEntry") proto.RegisterType((*Operation_Increase)(nil), "yorkie.v1.Operation.Increase") proto.RegisterType((*Operation_TreeEdit)(nil), "yorkie.v1.Operation.TreeEdit") + proto.RegisterMapType((map[string]*TimeTicket)(nil), "yorkie.v1.Operation.TreeEdit.CreatedAtMapByActorEntry") proto.RegisterType((*Operation_TreeStyle)(nil), "yorkie.v1.Operation.TreeStyle") proto.RegisterMapType((map[string]string)(nil), "yorkie.v1.Operation.TreeStyle.AttributesEntry") proto.RegisterType((*JSONElementSimple)(nil), "yorkie.v1.JSONElementSimple") @@ -3361,169 +3374,171 @@ func init() { func init() { proto.RegisterFile("yorkie/v1/resources.proto", fileDescriptor_36361b2f5d0f0896) } var fileDescriptor_36361b2f5d0f0896 = []byte{ - // 2592 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x4d, 0x8f, 0x1b, 0x49, - 0xf9, 0x9f, 0x6e, 0xb7, 0x5f, 0xfa, 0x99, 0xc9, 0x8c, 0x53, 0x93, 0x17, 0xc7, 0x49, 0xe6, 0x3f, - 0xeb, 0xdd, 0xff, 0xee, 0x6c, 0x02, 0x9e, 0x17, 0x12, 0x76, 0x49, 0x08, 0xe0, 0xb1, 0x3b, 0x19, - 0x67, 0x27, 0x9e, 0xa1, 0xed, 0xc9, 0x92, 0x15, 0xa8, 0xd5, 0xd3, 0x5d, 0x33, 0xd3, 0x3b, 0x76, - 0xb7, 0xb7, 0xbb, 0xed, 0x8d, 0x25, 0x4e, 0x0b, 0x48, 0x5c, 0xb9, 0xf1, 0x15, 0xf8, 0x08, 0x7b, - 0x84, 0x03, 0x42, 0x02, 0x04, 0x12, 0x2b, 0x71, 0x65, 0xc3, 0x01, 0xc1, 0x0d, 0x21, 0x71, 0x41, - 0x48, 0xa8, 0x5e, 0xba, 0xdd, 0xb6, 0xdb, 0x8e, 0x63, 0x46, 0xab, 0x44, 0xdc, 0xba, 0xaa, 0x7e, - 0x4f, 0xd5, 0xf3, 0xf2, 0xab, 0xaa, 0xa7, 0xba, 0x0a, 0xae, 0xf4, 0x1c, 0xf7, 0xd4, 0xc2, 0xeb, - 0xdd, 0xcd, 0x75, 0x17, 0x7b, 0x4e, 0xc7, 0x35, 0xb0, 0x57, 0x6c, 0xbb, 0x8e, 0xef, 0x20, 0x99, - 0x35, 0x15, 0xbb, 0x9b, 0xf9, 0xff, 0x3b, 0x76, 0x9c, 0xe3, 0x26, 0x5e, 0xa7, 0x0d, 0x87, 0x9d, - 0xa3, 0x75, 0xdf, 0x6a, 0x61, 0xcf, 0xd7, 0x5b, 0x6d, 0x86, 0xcd, 0xaf, 0x0c, 0x03, 0x3e, 0x76, - 0xf5, 0x76, 0x1b, 0xbb, 0xbc, 0xaf, 0xc2, 0xaf, 0x05, 0xc8, 0xd4, 0x6d, 0xbd, 0xed, 0x9d, 0x38, - 0x3e, 0xba, 0x01, 0x92, 0xeb, 0x38, 0x7e, 0x4e, 0x58, 0x15, 0xd6, 0xe6, 0xb7, 0x2e, 0x15, 0xc3, - 0x71, 0x8a, 0x0f, 0xeb, 0x7b, 0x35, 0xa5, 0x89, 0x5b, 0xd8, 0xf6, 0x55, 0x8a, 0x41, 0xdf, 0x02, - 0xb9, 0xed, 0x62, 0x0f, 0xdb, 0x06, 0xf6, 0x72, 0xe2, 0x6a, 0x62, 0x6d, 0x7e, 0xab, 0x10, 0x11, - 0x08, 0xfa, 0x2c, 0xee, 0x07, 0x20, 0xc5, 0xf6, 0xdd, 0x9e, 0xda, 0x17, 0xca, 0x7f, 0x1b, 0x16, - 0x07, 0x1b, 0x51, 0x16, 0x12, 0xa7, 0xb8, 0x47, 0x87, 0x97, 0x55, 0xf2, 0x89, 0xde, 0x86, 0x64, - 0x57, 0x6f, 0x76, 0x70, 0x4e, 0xa4, 0x2a, 0x2d, 0x47, 0x46, 0x08, 0x64, 0x55, 0x86, 0xb8, 0x23, - 0xbe, 0x2b, 0x14, 0x7e, 0x22, 0x02, 0x94, 0x4f, 0x74, 0xfb, 0x18, 0xef, 0xeb, 0xc6, 0x29, 0x7a, - 0x0d, 0x16, 0x4c, 0xc7, 0xe8, 0x10, 0xad, 0xb5, 0x7e, 0xc7, 0xf3, 0x41, 0xdd, 0x7b, 0xb8, 0x87, - 0x6e, 0x03, 0x18, 0x27, 0xd8, 0x38, 0x6d, 0x3b, 0x96, 0xed, 0xf3, 0x51, 0x2e, 0x46, 0x46, 0x29, - 0x87, 0x8d, 0x6a, 0x04, 0x88, 0xf2, 0x90, 0xf1, 0xb8, 0x85, 0xb9, 0xc4, 0xaa, 0xb0, 0xb6, 0xa0, - 0x86, 0x65, 0x74, 0x13, 0xd2, 0x06, 0xd5, 0xc1, 0xcb, 0x49, 0xd4, 0x2f, 0xe7, 0x07, 0xfa, 0x23, - 0x2d, 0x6a, 0x80, 0x40, 0x25, 0x38, 0xdf, 0xb2, 0x6c, 0xcd, 0xeb, 0xd9, 0x06, 0x36, 0x35, 0xdf, - 0x32, 0x4e, 0xb1, 0x9f, 0x4b, 0x8e, 0xa8, 0xd1, 0xb0, 0x5a, 0xb8, 0x41, 0x1b, 0xd5, 0xa5, 0x96, - 0x65, 0xd7, 0x29, 0x9c, 0x55, 0xa0, 0xeb, 0x00, 0x96, 0xa7, 0xb9, 0xb8, 0xe5, 0x74, 0xb1, 0x99, - 0x4b, 0xad, 0x0a, 0x6b, 0x19, 0x55, 0xb6, 0x3c, 0x95, 0x55, 0x14, 0x7e, 0x2e, 0x40, 0x8a, 0x8d, - 0x8a, 0x5e, 0x07, 0xd1, 0x32, 0x79, 0x74, 0x97, 0x47, 0x94, 0xaa, 0x56, 0x54, 0xd1, 0x32, 0x51, - 0x0e, 0xd2, 0x2d, 0xec, 0x79, 0xfa, 0x31, 0x73, 0xba, 0xac, 0x06, 0x45, 0x74, 0x0b, 0xc0, 0x69, - 0x63, 0x57, 0xf7, 0x2d, 0xc7, 0xf6, 0x72, 0x09, 0x6a, 0xdb, 0x85, 0x48, 0x37, 0x7b, 0x41, 0xa3, - 0x1a, 0xc1, 0xa1, 0x6d, 0x58, 0x0a, 0x62, 0xae, 0x31, 0xab, 0x73, 0x12, 0xd5, 0xe0, 0x4a, 0x4c, - 0x30, 0xb9, 0x7b, 0x16, 0xdb, 0x03, 0xe5, 0xc2, 0x8f, 0x04, 0xc8, 0x04, 0x4a, 0x12, 0x7b, 0x8d, - 0xa6, 0x45, 0x62, 0xea, 0xe1, 0x8f, 0xa8, 0x35, 0xe7, 0x54, 0x99, 0xd5, 0xd4, 0xf1, 0x47, 0xe8, - 0x35, 0x00, 0x0f, 0xbb, 0x5d, 0xec, 0xd2, 0x66, 0x62, 0x42, 0x62, 0x5b, 0xdc, 0x10, 0x54, 0x99, - 0xd5, 0x12, 0xc8, 0x35, 0x48, 0x37, 0xf5, 0x56, 0xdb, 0x71, 0x59, 0xf0, 0x58, 0x7b, 0x50, 0x85, - 0xae, 0x40, 0x46, 0x37, 0x7c, 0xc7, 0xd5, 0x2c, 0x93, 0x6a, 0xba, 0xa0, 0xa6, 0x69, 0xb9, 0x6a, - 0x16, 0x7e, 0x93, 0x07, 0x39, 0xb4, 0x12, 0x7d, 0x09, 0x12, 0x1e, 0x0e, 0x66, 0x4b, 0x2e, 0xce, - 0x11, 0xc5, 0x3a, 0xf6, 0x77, 0xe6, 0x54, 0x02, 0x23, 0x68, 0xdd, 0x34, 0x39, 0xc5, 0xe2, 0xd1, - 0x25, 0xd3, 0x24, 0x68, 0xdd, 0x34, 0xd1, 0x3a, 0x48, 0x24, 0x7c, 0x54, 0xbf, 0x41, 0x57, 0xf5, - 0xe1, 0x8f, 0x9c, 0x2e, 0xde, 0x99, 0x53, 0x29, 0x10, 0xdd, 0x86, 0x14, 0xa3, 0x00, 0xf7, 0xee, - 0xd5, 0x58, 0x11, 0x46, 0x8a, 0x9d, 0x39, 0x95, 0x83, 0xc9, 0x38, 0xd8, 0xb4, 0x02, 0xca, 0xc5, - 0x8f, 0xa3, 0x98, 0x16, 0xb1, 0x82, 0x02, 0xc9, 0x38, 0x1e, 0x6e, 0x62, 0xc3, 0xa7, 0x4c, 0x1b, - 0x37, 0x4e, 0x9d, 0x42, 0xc8, 0x38, 0x0c, 0x8c, 0xb6, 0x20, 0xe9, 0xf9, 0xbd, 0x26, 0xce, 0xa5, - 0xa9, 0x54, 0x3e, 0x5e, 0x8a, 0x20, 0x76, 0xe6, 0x54, 0x06, 0x45, 0x77, 0x21, 0x63, 0xd9, 0x86, - 0x8b, 0x75, 0x0f, 0xe7, 0x32, 0x54, 0xec, 0x7a, 0xac, 0x58, 0x95, 0x83, 0x76, 0xe6, 0xd4, 0x50, - 0x00, 0x7d, 0x1d, 0x64, 0xdf, 0xc5, 0x58, 0xa3, 0xd6, 0xc9, 0x13, 0xa4, 0x1b, 0x2e, 0xc6, 0xdc, - 0xc2, 0x8c, 0xcf, 0xbf, 0xd1, 0x37, 0x01, 0xa8, 0x34, 0xd3, 0x19, 0xa8, 0xf8, 0xca, 0x58, 0xf1, - 0x40, 0x6f, 0x3a, 0x22, 0x2d, 0xe4, 0x7f, 0x29, 0x40, 0xa2, 0x8e, 0x7d, 0x32, 0xbf, 0xdb, 0xba, - 0x4b, 0xc8, 0x4a, 0xf4, 0xf2, 0xb1, 0xa9, 0xe9, 0x01, 0x63, 0xc6, 0xcd, 0x6f, 0x86, 0x2f, 0x33, - 0x78, 0xc9, 0x0f, 0x56, 0x45, 0xb1, 0xbf, 0x2a, 0x6e, 0x05, 0xab, 0x22, 0x63, 0xc7, 0xb5, 0xf8, - 0x85, 0xba, 0x6e, 0xb5, 0xda, 0xcd, 0x60, 0x79, 0x44, 0x5f, 0x85, 0x79, 0xfc, 0x14, 0x1b, 0x1d, - 0xae, 0x82, 0x34, 0x49, 0x05, 0x08, 0x90, 0x25, 0x3f, 0xff, 0x0f, 0x01, 0x12, 0x25, 0xd3, 0x3c, - 0x0b, 0x43, 0xee, 0xd1, 0x95, 0xa0, 0x1b, 0xed, 0x40, 0x9c, 0xd4, 0xc1, 0x39, 0x82, 0xee, 0x8b, - 0x7f, 0x91, 0x56, 0xff, 0x53, 0x00, 0x89, 0x4c, 0xaf, 0x97, 0xc0, 0xec, 0x5b, 0x00, 0x11, 0xc9, - 0xc4, 0x24, 0x49, 0xd9, 0x08, 0xa5, 0x66, 0x35, 0xfc, 0x53, 0x01, 0x52, 0x6c, 0x91, 0x38, 0x0b, - 0xd3, 0x07, 0x75, 0x17, 0x67, 0xd3, 0x3d, 0x31, 0xad, 0xee, 0xbf, 0x90, 0x40, 0xa2, 0xb3, 0xf7, - 0x0c, 0x34, 0xbf, 0x01, 0xd2, 0x91, 0xeb, 0xb4, 0xb8, 0xce, 0xd1, 0x54, 0xa8, 0x81, 0x9f, 0xfa, - 0x35, 0xc7, 0xc4, 0xfb, 0x8e, 0xa7, 0x52, 0x0c, 0x7a, 0x13, 0x44, 0xdf, 0xe1, 0x6a, 0x8e, 0x43, - 0x8a, 0xbe, 0x83, 0x4e, 0xe0, 0x72, 0x5f, 0x1f, 0xad, 0xa5, 0xb7, 0xb5, 0xc3, 0x9e, 0x46, 0xb7, - 0x16, 0x9e, 0x28, 0x6c, 0x8d, 0x5d, 0x7e, 0x8b, 0xa1, 0x66, 0x8f, 0xf4, 0xf6, 0x76, 0xaf, 0x44, - 0x84, 0x58, 0x42, 0xb5, 0x6c, 0x8c, 0xb6, 0x90, 0x3d, 0xdc, 0x70, 0x6c, 0x1f, 0xdb, 0x6c, 0x61, - 0x97, 0xd5, 0xa0, 0x38, 0xec, 0xdb, 0xd4, 0x94, 0xbe, 0x45, 0x55, 0x00, 0xdd, 0xf7, 0x5d, 0xeb, - 0xb0, 0xe3, 0x63, 0x2f, 0x97, 0xa6, 0xea, 0xbe, 0x3d, 0x5e, 0xdd, 0x52, 0x88, 0x65, 0x5a, 0x46, - 0x84, 0xf3, 0xdf, 0x83, 0xdc, 0x38, 0x6b, 0x62, 0x32, 0xc0, 0x9b, 0x83, 0x19, 0xe0, 0x18, 0x55, - 0xfb, 0x39, 0x60, 0xfe, 0x1e, 0x2c, 0x0d, 0x8d, 0x1e, 0xd3, 0xeb, 0x85, 0x68, 0xaf, 0x72, 0x54, - 0xfc, 0x8f, 0x02, 0xa4, 0xd8, 0xee, 0xf5, 0xb2, 0xd2, 0x68, 0xd6, 0xa9, 0xfd, 0xb9, 0x08, 0x49, - 0xba, 0x39, 0xbd, 0xac, 0x86, 0x3d, 0x1c, 0xe0, 0x18, 0x9b, 0x12, 0x37, 0xc6, 0x27, 0x0a, 0x93, - 0x48, 0x36, 0xec, 0xa4, 0xe4, 0xb4, 0x4e, 0xfa, 0x2f, 0xd9, 0xf3, 0xa9, 0x00, 0x99, 0x20, 0x1d, - 0x39, 0x0b, 0x37, 0x6f, 0x0d, 0xb2, 0x7f, 0x96, 0x3d, 0x6f, 0xea, 0xe5, 0xf3, 0x07, 0x22, 0x64, - 0x82, 0x64, 0xe8, 0x2c, 0x74, 0x7f, 0x73, 0x80, 0x22, 0x28, 0x2a, 0xe5, 0xe2, 0x08, 0x3d, 0x0a, - 0x11, 0x7a, 0xc4, 0xa1, 0x08, 0x35, 0x36, 0x20, 0xc3, 0x57, 0xb0, 0x80, 0x18, 0x17, 0x86, 0x90, - 0x84, 0x48, 0x9e, 0x1a, 0xa2, 0x66, 0x26, 0xc0, 0xe7, 0x22, 0xc8, 0x61, 0x4e, 0xf7, 0xb2, 0xb9, - 0xa1, 0x16, 0x33, 0x43, 0x8a, 0x93, 0xd3, 0xd2, 0x97, 0x70, 0x96, 0x6c, 0xa7, 0x40, 0x3a, 0x74, - 0xcc, 0x5e, 0xe1, 0xef, 0x02, 0x9c, 0x1f, 0xa1, 0xf1, 0x50, 0xd2, 0x20, 0x4c, 0x99, 0x34, 0x6c, - 0x40, 0x86, 0x9e, 0x77, 0x9f, 0x9b, 0x68, 0xa4, 0x29, 0x8c, 0x25, 0x27, 0xfc, 0xd0, 0xfc, 0xfc, - 0xc4, 0x8a, 0x03, 0x4b, 0x3e, 0x5a, 0x03, 0xc9, 0xef, 0xb5, 0xd9, 0x29, 0x6b, 0x71, 0x80, 0x85, - 0x8f, 0x89, 0x7d, 0x8d, 0x5e, 0x1b, 0xab, 0x14, 0xd1, 0xb7, 0x3f, 0x49, 0x0f, 0x91, 0xac, 0x50, - 0xf8, 0xd9, 0x39, 0x98, 0x8f, 0xd8, 0x8c, 0x2a, 0x30, 0xff, 0xa1, 0xe7, 0xd8, 0x9a, 0x73, 0xf8, - 0x21, 0x39, 0x54, 0x31, 0x73, 0x5f, 0x8b, 0x9f, 0xe7, 0xf4, 0x7b, 0x8f, 0x02, 0x77, 0xe6, 0x54, - 0x20, 0x72, 0xac, 0x84, 0x4a, 0x40, 0x4b, 0x9a, 0xee, 0xba, 0x7a, 0x8f, 0xdb, 0xbf, 0x3a, 0xa1, - 0x93, 0x12, 0xc1, 0x91, 0x13, 0x0b, 0x91, 0xa2, 0x05, 0xf6, 0x43, 0xc7, 0x6a, 0x59, 0xbe, 0x15, - 0x1e, 0x3b, 0xc7, 0xf5, 0xb0, 0x1f, 0xe0, 0x48, 0x0f, 0xa1, 0x10, 0xda, 0x04, 0xc9, 0xc7, 0x4f, - 0x03, 0x1a, 0x5d, 0x1d, 0x23, 0x4c, 0x56, 0x7d, 0x72, 0x9a, 0x24, 0x50, 0x74, 0x87, 0x24, 0x2a, - 0x1d, 0xdb, 0xc7, 0x2e, 0x4f, 0x45, 0x56, 0xc6, 0x48, 0x95, 0x19, 0x6a, 0x67, 0x4e, 0x0d, 0x04, - 0xe8, 0x70, 0x2e, 0x0e, 0x4e, 0x94, 0x63, 0x87, 0x73, 0x31, 0x3d, 0x24, 0x13, 0x68, 0xfe, 0x33, - 0x01, 0xa0, 0xef, 0x43, 0xb4, 0x06, 0x49, 0x9b, 0x2c, 0x1b, 0x39, 0x81, 0xce, 0xa4, 0xe8, 0xac, - 0x53, 0x77, 0x1a, 0x64, 0x45, 0x51, 0x19, 0x60, 0xc6, 0x44, 0x36, 0xca, 0xc9, 0xc4, 0x0c, 0x9c, - 0x94, 0xa6, 0xe3, 0x64, 0xfe, 0x0f, 0x02, 0xc8, 0x61, 0x54, 0x27, 0x5a, 0xf5, 0xa0, 0xf4, 0xea, - 0x58, 0xf5, 0x57, 0x01, 0xe4, 0x90, 0x69, 0xe1, 0xbc, 0x13, 0xa6, 0x9f, 0x77, 0x62, 0x64, 0xde, - 0xcd, 0x78, 0x8c, 0x8a, 0xda, 0x2a, 0xcd, 0x60, 0x6b, 0x72, 0x4a, 0x5b, 0x7f, 0x27, 0x80, 0x44, - 0x26, 0x06, 0x7a, 0x7b, 0x30, 0x78, 0xcb, 0x31, 0xe9, 0xd2, 0xab, 0x11, 0xbd, 0xbf, 0x08, 0x90, - 0xe6, 0x93, 0xf6, 0x7f, 0x21, 0x76, 0x2e, 0xc6, 0x13, 0x63, 0xc7, 0x33, 0x94, 0x57, 0x22, 0x76, - 0xe1, 0xfe, 0xfc, 0x08, 0xd2, 0x7c, 0x1d, 0x8c, 0xd9, 0xde, 0x37, 0x20, 0x8d, 0xd9, 0x1a, 0x1b, - 0x73, 0x08, 0x88, 0xde, 0x17, 0x04, 0xb0, 0x82, 0x01, 0x69, 0xbe, 0x00, 0x91, 0xa4, 0xc8, 0x26, - 0x5b, 0x85, 0x30, 0x92, 0xee, 0x04, 0x4b, 0x14, 0x6d, 0x9f, 0x61, 0x90, 0xc7, 0x90, 0x21, 0xf2, - 0x24, 0x3d, 0xe9, 0xb3, 0x49, 0x88, 0x64, 0x20, 0xc4, 0x27, 0x9d, 0xb6, 0x39, 0x9d, 0xef, 0x39, - 0xb0, 0xe4, 0x17, 0x7e, 0x4b, 0xb2, 0x63, 0x3e, 0x03, 0xd1, 0xff, 0x47, 0x7e, 0xa4, 0x5f, 0x8c, - 0x99, 0xa2, 0xfc, 0x57, 0x7a, 0x6c, 0x06, 0x34, 0x63, 0xde, 0x71, 0x1b, 0xe6, 0x2d, 0xdb, 0xd3, - 0xe8, 0x9f, 0x24, 0xfe, 0x63, 0x7a, 0xec, 0xd8, 0xb2, 0x65, 0x7b, 0xfb, 0x2e, 0xee, 0x56, 0x4d, - 0x54, 0x1e, 0xc8, 0x18, 0x93, 0x94, 0x98, 0xaf, 0xc7, 0x48, 0x4d, 0x3c, 0xb1, 0xab, 0xd3, 0xa4, - 0x7b, 0x13, 0xae, 0x6a, 0x82, 0x80, 0x44, 0xaf, 0x6a, 0x3e, 0x00, 0xe8, 0x6b, 0x3c, 0x63, 0xce, - 0x77, 0x09, 0x52, 0xce, 0xd1, 0x91, 0x87, 0x59, 0x14, 0x93, 0x2a, 0x2f, 0x15, 0xfe, 0xc5, 0x4f, - 0x32, 0x34, 0x56, 0x6f, 0x41, 0xa2, 0xed, 0x78, 0x71, 0x7d, 0x72, 0x44, 0xb5, 0xa2, 0x12, 0x04, - 0x42, 0x7c, 0x95, 0x62, 0xc1, 0x1a, 0x5a, 0x8f, 0x12, 0xe3, 0x23, 0x38, 0xe5, 0xac, 0x42, 0xef, - 0xc0, 0x42, 0x18, 0x41, 0xa2, 0x51, 0x72, 0x92, 0x46, 0xc0, 0x43, 0xb8, 0xef, 0x78, 0x44, 0x09, - 0x13, 0xb7, 0xfd, 0x13, 0x9a, 0x22, 0x25, 0x55, 0x56, 0x18, 0x8a, 0x6c, 0x7a, 0x34, 0xb2, 0xbc, - 0xb3, 0x2f, 0x3c, 0xb2, 0x77, 0xd8, 0x01, 0x8a, 0x1e, 0xc8, 0xd0, 0x97, 0xfb, 0x7f, 0xa2, 0x26, - 0xac, 0x8a, 0x01, 0x86, 0xb2, 0x22, 0x74, 0xc2, 0x19, 0xb3, 0xe2, 0xfb, 0x90, 0xe6, 0x67, 0x29, - 0xb4, 0x05, 0x32, 0x3f, 0xd6, 0xc5, 0x4f, 0xe3, 0x7e, 0x1c, 0x32, 0x0c, 0x57, 0x35, 0xd1, 0x3d, - 0x58, 0x6a, 0xe2, 0x23, 0x5f, 0xf3, 0xac, 0xc3, 0xa6, 0x65, 0x1f, 0x13, 0x49, 0x71, 0x92, 0xe4, - 0x39, 0x82, 0xae, 0x33, 0x70, 0xd5, 0x2c, 0xb4, 0x40, 0x3a, 0xf0, 0xb0, 0x8b, 0x16, 0xc3, 0xa5, - 0x43, 0xa6, 0x6b, 0x44, 0x1e, 0x32, 0x1d, 0x0f, 0xbb, 0xb6, 0xde, 0x0a, 0x98, 0x17, 0x96, 0xd1, - 0xd7, 0x62, 0xf6, 0xbd, 0x7c, 0x91, 0xdd, 0xe8, 0x16, 0x83, 0x1b, 0x5d, 0xea, 0x05, 0x7a, 0xe5, - 0x1b, 0x71, 0x42, 0xe1, 0xdf, 0x22, 0xa4, 0xf7, 0x5d, 0x87, 0xa6, 0xb9, 0xc3, 0x43, 0x22, 0x90, - 0x22, 0xc3, 0xd1, 0x6f, 0x74, 0x1d, 0xa0, 0xdd, 0x39, 0x6c, 0x5a, 0x06, 0xbd, 0x28, 0x65, 0x6c, - 0x97, 0x59, 0xcd, 0x7b, 0xb8, 0x47, 0x9a, 0x3d, 0x6c, 0xb8, 0x98, 0xdd, 0xa3, 0x4a, 0xac, 0x99, - 0xd5, 0x90, 0xe6, 0x35, 0xc8, 0xea, 0x1d, 0xff, 0x44, 0xfb, 0x18, 0x1f, 0x9e, 0x38, 0xce, 0xa9, - 0xd6, 0x71, 0x9b, 0xfc, 0xc7, 0xe3, 0x22, 0xa9, 0x7f, 0x9f, 0x55, 0x1f, 0xb8, 0x4d, 0xb4, 0x01, - 0x17, 0x06, 0x90, 0x2d, 0xec, 0x9f, 0x38, 0xa6, 0x97, 0x4b, 0xad, 0x26, 0xd6, 0x64, 0x15, 0x45, - 0xd0, 0x8f, 0x58, 0x0b, 0xfa, 0x06, 0x5c, 0xe5, 0xd7, 0x7d, 0x26, 0xd6, 0x0d, 0xdf, 0xea, 0xea, - 0x3e, 0xd6, 0xfc, 0x13, 0x17, 0x7b, 0x27, 0x4e, 0xd3, 0xa4, 0xd9, 0xbf, 0xac, 0x5e, 0x61, 0x90, - 0x4a, 0x88, 0x68, 0x04, 0x80, 0x21, 0x27, 0x66, 0x5e, 0xc0, 0x89, 0x44, 0x34, 0xb2, 0x53, 0xc8, - 0xcf, 0x17, 0xed, 0x6f, 0x17, 0x3f, 0x4e, 0xc0, 0xa5, 0x03, 0x52, 0xd2, 0x0f, 0x9b, 0x98, 0x07, - 0xe2, 0xbe, 0x85, 0x9b, 0xa6, 0x87, 0x36, 0xb8, 0xfb, 0x05, 0xfe, 0x4b, 0x67, 0xb8, 0xbf, 0xba, - 0xef, 0x5a, 0xf6, 0x31, 0xcd, 0x8c, 0x78, 0x70, 0xee, 0xc7, 0xb8, 0x57, 0x9c, 0x42, 0x7a, 0xd8, - 0xf9, 0x47, 0x63, 0x9c, 0xcf, 0x98, 0x75, 0x2b, 0xc2, 0xe3, 0x78, 0xd5, 0x8b, 0xa5, 0x91, 0xf0, - 0xc4, 0x86, 0xec, 0xbb, 0x93, 0x43, 0x26, 0x4d, 0xa1, 0xfa, 0xf8, 0x80, 0xe6, 0x8b, 0x80, 0x46, - 0xf5, 0x60, 0xd7, 0xd6, 0xcc, 0x1c, 0x81, 0x72, 0x29, 0x28, 0x16, 0x3e, 0x11, 0x61, 0xa9, 0xc2, - 0xaf, 0xfc, 0xeb, 0x9d, 0x56, 0x4b, 0x77, 0x7b, 0x23, 0x53, 0x62, 0xf4, 0x8e, 0x6d, 0xf8, 0x86, - 0x5f, 0x8e, 0xdc, 0xf0, 0x0f, 0x52, 0x4a, 0x7a, 0x11, 0x4a, 0xdd, 0x85, 0x79, 0xdd, 0x30, 0xb0, - 0xe7, 0x45, 0x73, 0xcc, 0x49, 0xb2, 0x10, 0xc0, 0x47, 0xf8, 0x98, 0x7a, 0x11, 0x3e, 0xfe, 0x4d, - 0xe8, 0xbf, 0xb6, 0xe0, 0xaf, 0x01, 0xde, 0x1d, 0xc8, 0xca, 0xdf, 0x18, 0x7b, 0x1b, 0xcf, 0x9f, - 0x07, 0x44, 0xb2, 0xf4, 0x75, 0xc8, 0x04, 0x17, 0xf4, 0x93, 0x1e, 0x66, 0x84, 0xa0, 0x42, 0x2b, - 0x78, 0x96, 0x41, 0x3a, 0x41, 0x57, 0xe1, 0x72, 0x79, 0xa7, 0x54, 0x7b, 0xa0, 0x68, 0x8d, 0x27, - 0xfb, 0x8a, 0x76, 0x50, 0xab, 0xef, 0x2b, 0xe5, 0xea, 0xfd, 0xaa, 0x52, 0xc9, 0xce, 0xa1, 0x65, - 0x58, 0x8a, 0x36, 0xee, 0x1f, 0x34, 0xb2, 0x02, 0xba, 0x04, 0x28, 0x5a, 0x59, 0x51, 0x76, 0x95, - 0x86, 0x92, 0x15, 0xd1, 0x45, 0x38, 0x1f, 0xad, 0x2f, 0xef, 0x2a, 0x25, 0x35, 0x9b, 0x28, 0x74, - 0x21, 0x13, 0x28, 0x81, 0x36, 0x41, 0x22, 0x54, 0xe6, 0xbb, 0xcf, 0xf5, 0x18, 0x3d, 0x8b, 0x15, - 0xdd, 0xd7, 0xd9, 0xd6, 0x48, 0xa1, 0xf9, 0x77, 0x40, 0x0e, 0xab, 0x5e, 0xe4, 0xbf, 0x56, 0xa1, - 0x46, 0xcc, 0x0c, 0xdf, 0x88, 0x0c, 0x3e, 0x44, 0x10, 0xe2, 0x1e, 0x22, 0x0c, 0x3e, 0x65, 0x10, - 0x87, 0x9e, 0x32, 0x14, 0x7e, 0x28, 0xc0, 0x7c, 0xe4, 0x27, 0xf9, 0xd9, 0xee, 0x87, 0xe8, 0x2d, - 0x58, 0x72, 0x71, 0x53, 0x27, 0xa7, 0x6b, 0x8d, 0x03, 0x12, 0x14, 0xb0, 0x18, 0x54, 0xef, 0xb1, - 0x8d, 0xd3, 0x00, 0xe8, 0xf7, 0x1c, 0x7d, 0x3c, 0x21, 0x8c, 0x3e, 0x9e, 0xb8, 0x06, 0xb2, 0x89, - 0x9b, 0xe4, 0xd0, 0x8e, 0xdd, 0xc0, 0xa0, 0xb0, 0x62, 0xe0, 0x69, 0x45, 0x62, 0xf0, 0x69, 0xc5, - 0x01, 0x64, 0x2a, 0x8e, 0xa1, 0x74, 0xb1, 0xed, 0xa3, 0x9b, 0x03, 0xcc, 0xbc, 0x1c, 0xb1, 0x30, - 0x80, 0x44, 0xc8, 0x78, 0x0d, 0xd8, 0x3e, 0xe5, 0x9d, 0xf0, 0x11, 0x17, 0xd4, 0x7e, 0xc5, 0x8d, - 0xcf, 0x44, 0x90, 0xc3, 0x43, 0x26, 0x21, 0xd7, 0xe3, 0xd2, 0xee, 0x01, 0xa7, 0x4b, 0xed, 0x60, - 0x77, 0x37, 0x3b, 0x47, 0xc8, 0x15, 0xa9, 0xdc, 0xde, 0xdb, 0xdb, 0x55, 0x4a, 0x35, 0x46, 0xba, - 0x48, 0x7d, 0xb5, 0xd6, 0x50, 0x1e, 0x28, 0x6a, 0x56, 0x1c, 0xea, 0x64, 0x77, 0xaf, 0xf6, 0x20, - 0x9b, 0x20, 0x4c, 0x8c, 0x54, 0x56, 0xf6, 0x0e, 0xb6, 0x77, 0x95, 0xac, 0x34, 0x54, 0x5d, 0x6f, - 0xa8, 0xd5, 0xda, 0x83, 0x6c, 0x12, 0x5d, 0x80, 0x6c, 0x74, 0xc8, 0x27, 0x0d, 0xa5, 0x9e, 0x4d, - 0x0d, 0x75, 0x5c, 0x29, 0x35, 0x94, 0x6c, 0x1a, 0xe5, 0xe1, 0x52, 0xa4, 0x92, 0x1c, 0x79, 0xb4, - 0xbd, 0xed, 0x87, 0x4a, 0xb9, 0x91, 0xcd, 0xa0, 0x2b, 0x70, 0x71, 0xb8, 0xad, 0xa4, 0xaa, 0xa5, - 0x27, 0x59, 0x79, 0xa8, 0xaf, 0x86, 0xf2, 0x9d, 0x46, 0x16, 0x86, 0xfa, 0xe2, 0x16, 0x69, 0xe5, - 0x5a, 0x23, 0x3b, 0x8f, 0x2e, 0xc3, 0xf2, 0x90, 0x55, 0xb4, 0x61, 0x61, 0xb8, 0x27, 0x55, 0x51, - 0xb2, 0xe7, 0x6e, 0x7c, 0x22, 0xc0, 0x42, 0x34, 0x16, 0xe8, 0x0d, 0x58, 0xad, 0xec, 0x95, 0x35, - 0xe5, 0xb1, 0x52, 0x6b, 0x04, 0x3e, 0x28, 0x1f, 0x3c, 0x52, 0x6a, 0x8d, 0xba, 0xc6, 0xa6, 0x28, - 0x99, 0xdc, 0x93, 0x50, 0xef, 0x97, 0x1a, 0xe5, 0x1d, 0xa5, 0x92, 0x15, 0xd0, 0x9b, 0x50, 0x18, - 0x8b, 0x3a, 0xa8, 0x05, 0x38, 0x71, 0xfb, 0xe6, 0xaf, 0x9e, 0xad, 0x08, 0xbf, 0x7f, 0xb6, 0x22, - 0xfc, 0xe9, 0xd9, 0x8a, 0xf0, 0xd3, 0x3f, 0xaf, 0xcc, 0xc1, 0x79, 0x13, 0x77, 0x03, 0xb6, 0xe8, - 0x6d, 0xab, 0xd8, 0xdd, 0xdc, 0x17, 0x3e, 0x90, 0x8a, 0x77, 0xbb, 0x9b, 0x87, 0x29, 0xba, 0x3e, - 0x7e, 0xe5, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xcb, 0xc9, 0x51, 0xe8, 0x58, 0x27, 0x00, 0x00, + // 2609 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5a, 0x5d, 0x6f, 0xdb, 0xd6, + 0xf9, 0x37, 0x29, 0xea, 0x85, 0x8f, 0x1d, 0x5b, 0x39, 0xce, 0x8b, 0xa2, 0x24, 0xfe, 0xbb, 0x6a, + 0xff, 0xad, 0x9b, 0x6c, 0xf2, 0xcb, 0x9a, 0xb6, 0x4b, 0x96, 0x6d, 0xb2, 0xc4, 0xc4, 0x4a, 0x1d, + 0xd9, 0xa3, 0xe4, 0x74, 0x29, 0x36, 0x10, 0x34, 0x79, 0x6c, 0xb3, 0x96, 0x48, 0x95, 0xa4, 0xd4, + 0x08, 0xd8, 0x55, 0xb1, 0x01, 0xbb, 0xdd, 0xdd, 0xf6, 0x11, 0xf6, 0x11, 0x7a, 0xb9, 0x5d, 0x0c, + 0x03, 0x86, 0x61, 0x05, 0x56, 0x60, 0xb7, 0x6b, 0x76, 0x31, 0x6c, 0x77, 0xc3, 0x80, 0xdd, 0x0c, + 0x03, 0x86, 0xf3, 0x42, 0x8a, 0x92, 0x28, 0x45, 0xd1, 0xbc, 0x22, 0xc1, 0xee, 0x78, 0xce, 0xf9, + 0x3d, 0xe7, 0x3c, 0xef, 0xe7, 0x39, 0x3c, 0x07, 0xae, 0xf4, 0x1c, 0xf7, 0xd4, 0xc2, 0xeb, 0xdd, + 0xcd, 0x75, 0x17, 0x7b, 0x4e, 0xc7, 0x35, 0xb0, 0x57, 0x6c, 0xbb, 0x8e, 0xef, 0x20, 0x99, 0x0d, + 0x15, 0xbb, 0x9b, 0xf9, 0xff, 0x3b, 0x76, 0x9c, 0xe3, 0x26, 0x5e, 0xa7, 0x03, 0x87, 0x9d, 0xa3, + 0x75, 0xdf, 0x6a, 0x61, 0xcf, 0xd7, 0x5b, 0x6d, 0x86, 0xcd, 0xaf, 0x0c, 0x03, 0x3e, 0x76, 0xf5, + 0x76, 0x1b, 0xbb, 0x7c, 0xae, 0xc2, 0x6f, 0x04, 0xc8, 0xd4, 0x6d, 0xbd, 0xed, 0x9d, 0x38, 0x3e, + 0xba, 0x01, 0x92, 0xeb, 0x38, 0x7e, 0x4e, 0x58, 0x15, 0xd6, 0xe6, 0xb7, 0x2e, 0x15, 0xc3, 0x75, + 0x8a, 0x0f, 0xea, 0x7b, 0x35, 0xa5, 0x89, 0x5b, 0xd8, 0xf6, 0x55, 0x8a, 0x41, 0xdf, 0x06, 0xb9, + 0xed, 0x62, 0x0f, 0xdb, 0x06, 0xf6, 0x72, 0xe2, 0x6a, 0x62, 0x6d, 0x7e, 0xab, 0x10, 0x21, 0x08, + 0xe6, 0x2c, 0xee, 0x07, 0x20, 0xc5, 0xf6, 0xdd, 0x9e, 0xda, 0x27, 0xca, 0x7f, 0x07, 0x16, 0x07, + 0x07, 0x51, 0x16, 0x12, 0xa7, 0xb8, 0x47, 0x97, 0x97, 0x55, 0xf2, 0x89, 0xde, 0x84, 0x64, 0x57, + 0x6f, 0x76, 0x70, 0x4e, 0xa4, 0x2c, 0x2d, 0x47, 0x56, 0x08, 0x68, 0x55, 0x86, 0xb8, 0x2d, 0xbe, + 0x2b, 0x14, 0x7e, 0x22, 0x02, 0x94, 0x4f, 0x74, 0xfb, 0x18, 0xef, 0xeb, 0xc6, 0x29, 0x7a, 0x05, + 0x16, 0x4c, 0xc7, 0xe8, 0x10, 0xae, 0xb5, 0xfe, 0xc4, 0xf3, 0x41, 0xdf, 0x7b, 0xb8, 0x87, 0x6e, + 0x01, 0x18, 0x27, 0xd8, 0x38, 0x6d, 0x3b, 0x96, 0xed, 0xf3, 0x55, 0x2e, 0x46, 0x56, 0x29, 0x87, + 0x83, 0x6a, 0x04, 0x88, 0xf2, 0x90, 0xf1, 0xb8, 0x84, 0xb9, 0xc4, 0xaa, 0xb0, 0xb6, 0xa0, 0x86, + 0x6d, 0x74, 0x13, 0xd2, 0x06, 0xe5, 0xc1, 0xcb, 0x49, 0x54, 0x2f, 0xe7, 0x07, 0xe6, 0x23, 0x23, + 0x6a, 0x80, 0x40, 0x25, 0x38, 0xdf, 0xb2, 0x6c, 0xcd, 0xeb, 0xd9, 0x06, 0x36, 0x35, 0xdf, 0x32, + 0x4e, 0xb1, 0x9f, 0x4b, 0x8e, 0xb0, 0xd1, 0xb0, 0x5a, 0xb8, 0x41, 0x07, 0xd5, 0xa5, 0x96, 0x65, + 0xd7, 0x29, 0x9c, 0x75, 0xa0, 0xeb, 0x00, 0x96, 0xa7, 0xb9, 0xb8, 0xe5, 0x74, 0xb1, 0x99, 0x4b, + 0xad, 0x0a, 0x6b, 0x19, 0x55, 0xb6, 0x3c, 0x95, 0x75, 0x14, 0x7e, 0x21, 0x40, 0x8a, 0xad, 0x8a, + 0x5e, 0x05, 0xd1, 0x32, 0xb9, 0x75, 0x97, 0x47, 0x98, 0xaa, 0x56, 0x54, 0xd1, 0x32, 0x51, 0x0e, + 0xd2, 0x2d, 0xec, 0x79, 0xfa, 0x31, 0x53, 0xba, 0xac, 0x06, 0x4d, 0xf4, 0x16, 0x80, 0xd3, 0xc6, + 0xae, 0xee, 0x5b, 0x8e, 0xed, 0xe5, 0x12, 0x54, 0xb6, 0x0b, 0x91, 0x69, 0xf6, 0x82, 0x41, 0x35, + 0x82, 0x43, 0xdb, 0xb0, 0x14, 0xd8, 0x5c, 0x63, 0x52, 0xe7, 0x24, 0xca, 0xc1, 0x95, 0x18, 0x63, + 0x72, 0xf5, 0x2c, 0xb6, 0x07, 0xda, 0x85, 0x1f, 0x09, 0x90, 0x09, 0x98, 0x24, 0xf2, 0x1a, 0x4d, + 0x8b, 0xd8, 0xd4, 0xc3, 0x1f, 0x51, 0x69, 0xce, 0xa9, 0x32, 0xeb, 0xa9, 0xe3, 0x8f, 0xd0, 0x2b, + 0x00, 0x1e, 0x76, 0xbb, 0xd8, 0xa5, 0xc3, 0x44, 0x84, 0xc4, 0xb6, 0xb8, 0x21, 0xa8, 0x32, 0xeb, + 0x25, 0x90, 0x6b, 0x90, 0x6e, 0xea, 0xad, 0xb6, 0xe3, 0x32, 0xe3, 0xb1, 0xf1, 0xa0, 0x0b, 0x5d, + 0x81, 0x8c, 0x6e, 0xf8, 0x8e, 0xab, 0x59, 0x26, 0xe5, 0x74, 0x41, 0x4d, 0xd3, 0x76, 0xd5, 0x2c, + 0xfc, 0xec, 0x1a, 0xc8, 0xa1, 0x94, 0xe8, 0x2b, 0x90, 0xf0, 0x70, 0x10, 0x2d, 0xb9, 0x38, 0x45, + 0x14, 0xeb, 0xd8, 0xdf, 0x99, 0x53, 0x09, 0x8c, 0xa0, 0x75, 0xd3, 0xe4, 0x2e, 0x16, 0x8f, 0x2e, + 0x99, 0x26, 0x41, 0xeb, 0xa6, 0x89, 0xd6, 0x41, 0x22, 0xe6, 0xa3, 0xfc, 0x0d, 0xaa, 0xaa, 0x0f, + 0x7f, 0xe8, 0x74, 0xf1, 0xce, 0x9c, 0x4a, 0x81, 0xe8, 0x16, 0xa4, 0x98, 0x0b, 0x70, 0xed, 0x5e, + 0x8d, 0x25, 0x61, 0x4e, 0xb1, 0x33, 0xa7, 0x72, 0x30, 0x59, 0x07, 0x9b, 0x56, 0xe0, 0x72, 0xf1, + 0xeb, 0x28, 0xa6, 0x45, 0xa4, 0xa0, 0x40, 0xb2, 0x8e, 0x87, 0x9b, 0xd8, 0xf0, 0xa9, 0xa7, 0x8d, + 0x5b, 0xa7, 0x4e, 0x21, 0x64, 0x1d, 0x06, 0x46, 0x5b, 0x90, 0xf4, 0xfc, 0x5e, 0x13, 0xe7, 0xd2, + 0x94, 0x2a, 0x1f, 0x4f, 0x45, 0x10, 0x3b, 0x73, 0x2a, 0x83, 0xa2, 0x3b, 0x90, 0xb1, 0x6c, 0xc3, + 0xc5, 0xba, 0x87, 0x73, 0x19, 0x4a, 0x76, 0x3d, 0x96, 0xac, 0xca, 0x41, 0x3b, 0x73, 0x6a, 0x48, + 0x80, 0xbe, 0x01, 0xb2, 0xef, 0x62, 0xac, 0x51, 0xe9, 0xe4, 0x09, 0xd4, 0x0d, 0x17, 0x63, 0x2e, + 0x61, 0xc6, 0xe7, 0xdf, 0xe8, 0x5b, 0x00, 0x94, 0x9a, 0xf1, 0x0c, 0x94, 0x7c, 0x65, 0x2c, 0x79, + 0xc0, 0x37, 0x5d, 0x91, 0x36, 0xf2, 0xbf, 0x12, 0x20, 0x51, 0xc7, 0x3e, 0x89, 0xef, 0xb6, 0xee, + 0x12, 0x67, 0x25, 0x7c, 0xf9, 0xd8, 0xd4, 0xf4, 0xc0, 0x63, 0xc6, 0xc5, 0x37, 0xc3, 0x97, 0x19, + 0xbc, 0xe4, 0x07, 0x59, 0x51, 0xec, 0x67, 0xc5, 0xad, 0x20, 0x2b, 0x32, 0xef, 0xb8, 0x16, 0x9f, + 0xa8, 0xeb, 0x56, 0xab, 0xdd, 0x0c, 0xd2, 0x23, 0x7a, 0x1b, 0xe6, 0xf1, 0x13, 0x6c, 0x74, 0x38, + 0x0b, 0xd2, 0x24, 0x16, 0x20, 0x40, 0x96, 0xfc, 0xfc, 0xdf, 0x05, 0x48, 0x94, 0x4c, 0xf3, 0x2c, + 0x04, 0xb9, 0x4b, 0x33, 0x41, 0x37, 0x3a, 0x81, 0x38, 0x69, 0x82, 0x73, 0x04, 0xdd, 0x27, 0xff, + 0x32, 0xa5, 0xfe, 0x87, 0x00, 0x12, 0x09, 0xaf, 0x17, 0x40, 0xec, 0xb7, 0x00, 0x22, 0x94, 0x89, + 0x49, 0x94, 0xb2, 0x11, 0x52, 0xcd, 0x2a, 0xf8, 0xa7, 0x02, 0xa4, 0x58, 0x92, 0x38, 0x0b, 0xd1, + 0x07, 0x79, 0x17, 0x67, 0xe3, 0x3d, 0x31, 0x2d, 0xef, 0xbf, 0x94, 0x40, 0xa2, 0xd1, 0x7b, 0x06, + 0x9c, 0xdf, 0x00, 0xe9, 0xc8, 0x75, 0x5a, 0x9c, 0xe7, 0x68, 0x29, 0xd4, 0xc0, 0x4f, 0xfc, 0x9a, + 0x63, 0xe2, 0x7d, 0xc7, 0x53, 0x29, 0x06, 0xbd, 0x0e, 0xa2, 0xef, 0x70, 0x36, 0xc7, 0x21, 0x45, + 0xdf, 0x41, 0x27, 0x70, 0xb9, 0xcf, 0x8f, 0xd6, 0xd2, 0xdb, 0xda, 0x61, 0x4f, 0xa3, 0x5b, 0x0b, + 0x2f, 0x14, 0xb6, 0xc6, 0xa6, 0xdf, 0x62, 0xc8, 0xd9, 0x43, 0xbd, 0xbd, 0xdd, 0x2b, 0x11, 0x22, + 0x56, 0x50, 0x2d, 0x1b, 0xa3, 0x23, 0x64, 0x0f, 0x37, 0x1c, 0xdb, 0xc7, 0x36, 0x4b, 0xec, 0xb2, + 0x1a, 0x34, 0x87, 0x75, 0x9b, 0x9a, 0x52, 0xb7, 0xa8, 0x0a, 0xa0, 0xfb, 0xbe, 0x6b, 0x1d, 0x76, + 0x7c, 0xec, 0xe5, 0xd2, 0x94, 0xdd, 0x37, 0xc7, 0xb3, 0x5b, 0x0a, 0xb1, 0x8c, 0xcb, 0x08, 0x71, + 0xfe, 0xfb, 0x90, 0x1b, 0x27, 0x4d, 0x4c, 0x05, 0x78, 0x73, 0xb0, 0x02, 0x1c, 0xc3, 0x6a, 0xbf, + 0x06, 0xcc, 0xdf, 0x85, 0xa5, 0xa1, 0xd5, 0x63, 0x66, 0xbd, 0x10, 0x9d, 0x55, 0x8e, 0x92, 0xff, + 0x41, 0x80, 0x14, 0xdb, 0xbd, 0x5e, 0x54, 0x37, 0x9a, 0x35, 0xb4, 0xbf, 0x10, 0x21, 0x49, 0x37, + 0xa7, 0x17, 0x55, 0xb0, 0x07, 0x03, 0x3e, 0xc6, 0x42, 0xe2, 0xc6, 0xf8, 0x42, 0x61, 0x92, 0x93, + 0x0d, 0x2b, 0x29, 0x39, 0xad, 0x92, 0xfe, 0x43, 0xef, 0xf9, 0x54, 0x80, 0x4c, 0x50, 0x8e, 0x9c, + 0x85, 0x9a, 0xb7, 0x06, 0xbd, 0x7f, 0x96, 0x3d, 0x6f, 0xea, 0xf4, 0xf9, 0x59, 0x02, 0x32, 0x41, + 0x31, 0x74, 0x16, 0xbc, 0xbf, 0x3e, 0xe0, 0x22, 0x28, 0x4a, 0xe5, 0xe2, 0x88, 0x7b, 0x14, 0x22, + 0xee, 0x11, 0x87, 0x22, 0xae, 0xd1, 0x7c, 0x56, 0xea, 0x7c, 0x7b, 0x62, 0x6d, 0xf7, 0x9c, 0xe9, + 0x73, 0x03, 0x32, 0x3c, 0x5f, 0x7a, 0xb9, 0xe4, 0xc8, 0x31, 0x87, 0x4c, 0x4a, 0xdc, 0xd6, 0x53, + 0x43, 0xd4, 0xac, 0x69, 0xf5, 0xbf, 0x9d, 0x0b, 0xbf, 0x10, 0x41, 0x0e, 0x0b, 0xd4, 0x17, 0xcd, + 0xa6, 0xb5, 0x98, 0x70, 0x2f, 0x4e, 0xae, 0xb1, 0x5f, 0xc0, 0x90, 0xdf, 0x4e, 0x81, 0x74, 0xe8, + 0x98, 0xbd, 0xc2, 0xdf, 0x04, 0x38, 0x3f, 0x12, 0x93, 0x43, 0x15, 0x90, 0x30, 0x65, 0x05, 0xb4, + 0x01, 0x19, 0x7a, 0x78, 0x7f, 0x66, 0xd5, 0x94, 0xa6, 0x30, 0x56, 0x69, 0xf1, 0x3f, 0x00, 0xcf, + 0xae, 0x12, 0x39, 0xb0, 0xe4, 0xa3, 0x35, 0x90, 0xfc, 0x5e, 0x9b, 0x1d, 0x19, 0x17, 0x07, 0x9c, + 0xfc, 0x11, 0x91, 0xaf, 0xd1, 0x6b, 0x63, 0x95, 0x22, 0xfa, 0xf2, 0x27, 0xe9, 0x89, 0x98, 0x35, + 0x0a, 0x3f, 0x3f, 0x07, 0xf3, 0x11, 0x99, 0x51, 0x05, 0xe6, 0x3f, 0xf4, 0x1c, 0x5b, 0x73, 0x0e, + 0x3f, 0x24, 0x27, 0x44, 0x26, 0xee, 0x2b, 0xf1, 0x49, 0x8b, 0x7e, 0xef, 0x51, 0xe0, 0xce, 0x9c, + 0x0a, 0x84, 0x8e, 0xb5, 0x50, 0x09, 0x68, 0x4b, 0xd3, 0x5d, 0x57, 0xef, 0x71, 0xf9, 0x57, 0x27, + 0x4c, 0x52, 0x22, 0x38, 0x72, 0xfc, 0x22, 0x54, 0xb4, 0xc1, 0xfe, 0x4e, 0x59, 0x2d, 0xcb, 0xb7, + 0xc2, 0x33, 0xf4, 0xb8, 0x19, 0xf6, 0x03, 0x1c, 0x99, 0x21, 0x24, 0x42, 0x9b, 0x20, 0xf9, 0xf8, + 0x49, 0xe0, 0x46, 0x57, 0xc7, 0x10, 0x93, 0x2d, 0x8c, 0x1c, 0x8d, 0x09, 0x14, 0xdd, 0x26, 0x55, + 0x57, 0xc7, 0xf6, 0xb1, 0xcb, 0x13, 0xc0, 0xca, 0x18, 0xaa, 0x32, 0x43, 0xed, 0xcc, 0xa9, 0x01, + 0x01, 0x5d, 0xce, 0xc5, 0xc1, 0xf1, 0x78, 0xec, 0x72, 0x2e, 0xa6, 0x27, 0x7e, 0x02, 0xcd, 0x7f, + 0x2e, 0x00, 0xf4, 0x75, 0x88, 0xd6, 0x20, 0x69, 0x93, 0xac, 0x94, 0x13, 0x68, 0x24, 0x45, 0xa3, + 0x4e, 0xdd, 0x69, 0x90, 0x84, 0xa5, 0x32, 0xc0, 0x8c, 0x55, 0x79, 0xd4, 0x27, 0x13, 0x33, 0xf8, + 0xa4, 0x34, 0x9d, 0x4f, 0xe6, 0x7f, 0x2f, 0x80, 0x1c, 0x5a, 0x75, 0xa2, 0x54, 0xf7, 0x4b, 0x2f, + 0x8f, 0x54, 0x7f, 0x11, 0x40, 0x0e, 0x3d, 0x2d, 0x8c, 0x3b, 0x61, 0xfa, 0xb8, 0x13, 0x23, 0x71, + 0x37, 0xe3, 0x99, 0x30, 0x2a, 0xab, 0x34, 0x83, 0xac, 0xc9, 0x29, 0x65, 0xfd, 0x9d, 0x00, 0x12, + 0x09, 0x0c, 0xf4, 0xe6, 0xa0, 0xf1, 0x96, 0x63, 0x6a, 0xbf, 0x97, 0xc3, 0x7a, 0x7f, 0x16, 0x20, + 0xcd, 0x83, 0xf6, 0x7f, 0xc1, 0x76, 0x2e, 0xc6, 0x13, 0x6d, 0xc7, 0x0b, 0xa0, 0x97, 0xc2, 0x76, + 0xe1, 0xfe, 0xfc, 0x10, 0xd2, 0x3c, 0x0f, 0xc6, 0x6c, 0xef, 0x1b, 0x90, 0xc6, 0x2c, 0xc7, 0xc6, + 0x9c, 0x68, 0xa2, 0x97, 0x1f, 0x01, 0xac, 0x60, 0x40, 0x9a, 0x27, 0x20, 0x52, 0x14, 0xd9, 0x64, + 0xab, 0x10, 0x46, 0xca, 0x9d, 0x20, 0x45, 0xd1, 0xf1, 0x19, 0x16, 0x79, 0x04, 0x19, 0x42, 0x4f, + 0xca, 0x93, 0xbe, 0x37, 0x09, 0x91, 0x0a, 0x84, 0xe8, 0xa4, 0xd3, 0x36, 0xa7, 0xd3, 0x3d, 0x07, + 0x96, 0xfc, 0xc2, 0x6f, 0x45, 0xc8, 0x04, 0x11, 0x88, 0xfe, 0x3f, 0x72, 0x2b, 0x70, 0x31, 0x26, + 0x44, 0xf9, 0xbd, 0x40, 0x6c, 0x05, 0x34, 0x63, 0xdd, 0x71, 0x0b, 0xe6, 0x2d, 0xdb, 0xd3, 0xe8, + 0x6f, 0x31, 0xfe, 0x97, 0x7d, 0xec, 0xda, 0xb2, 0x65, 0x7b, 0xfb, 0x2e, 0xee, 0x56, 0x4d, 0x54, + 0x1e, 0xa8, 0x18, 0x59, 0x65, 0xfe, 0x6a, 0x0c, 0xd5, 0xc4, 0xdf, 0x0f, 0xea, 0x34, 0xe5, 0xde, + 0x84, 0x7b, 0xa7, 0xc0, 0x20, 0xd1, 0x7b, 0xa7, 0x0f, 0x00, 0xfa, 0x1c, 0xcf, 0x58, 0xf3, 0x5d, + 0x82, 0x94, 0x73, 0x74, 0xe4, 0x61, 0x66, 0xc5, 0xa4, 0xca, 0x5b, 0x85, 0x7f, 0x8a, 0xec, 0x58, + 0x46, 0x6d, 0xf5, 0x06, 0x24, 0xda, 0x8e, 0x17, 0x37, 0x27, 0x47, 0x54, 0x2b, 0x2a, 0x41, 0x20, + 0xc4, 0xb3, 0x14, 0x33, 0xd6, 0x50, 0x3e, 0x4a, 0x8c, 0xb7, 0xe0, 0x94, 0x51, 0x85, 0xde, 0x81, + 0x85, 0xd0, 0x82, 0x84, 0xa3, 0xe4, 0x24, 0x8e, 0x80, 0x9b, 0x70, 0xdf, 0xf1, 0x08, 0x13, 0x26, + 0x6e, 0xfb, 0x27, 0xb4, 0x44, 0x4a, 0xaa, 0xac, 0x31, 0x64, 0xd9, 0xf4, 0xa8, 0x65, 0xf9, 0x64, + 0x5f, 0xba, 0x65, 0x6f, 0xb3, 0x03, 0x14, 0x3d, 0xef, 0xa1, 0xaf, 0xf6, 0x7f, 0xab, 0x4d, 0xc8, + 0x8a, 0x01, 0x86, 0x7a, 0x45, 0xa8, 0x84, 0x33, 0xf6, 0x8a, 0x1f, 0x40, 0x9a, 0x9f, 0xa5, 0xd0, + 0x16, 0xc8, 0xfc, 0x58, 0x17, 0x1f, 0xc6, 0x7d, 0x3b, 0x64, 0x18, 0xae, 0x6a, 0xa2, 0xbb, 0xb0, + 0xd4, 0xc4, 0x47, 0xbe, 0xe6, 0x59, 0x87, 0x4d, 0xcb, 0x3e, 0x26, 0x94, 0xe2, 0x24, 0xca, 0x73, + 0x04, 0x5d, 0x67, 0xe0, 0xaa, 0x59, 0x68, 0x81, 0x74, 0xe0, 0x61, 0x17, 0x2d, 0x86, 0xa9, 0x43, + 0xa6, 0x39, 0x22, 0x0f, 0x99, 0x8e, 0x87, 0x5d, 0x5b, 0x6f, 0x05, 0x9e, 0x17, 0xb6, 0xd1, 0xd7, + 0x63, 0xf6, 0xbd, 0x7c, 0x91, 0x5d, 0x4f, 0x17, 0x83, 0xeb, 0x69, 0xaa, 0x05, 0x7a, 0x7f, 0x1d, + 0x51, 0x42, 0xe1, 0x5f, 0x22, 0xa4, 0xf7, 0x5d, 0x87, 0x96, 0xb9, 0xc3, 0x4b, 0x22, 0x90, 0x22, + 0xcb, 0xd1, 0x6f, 0x74, 0x1d, 0xa0, 0xdd, 0x39, 0x6c, 0x5a, 0x06, 0xbd, 0xf5, 0x65, 0xde, 0x2e, + 0xb3, 0x9e, 0xf7, 0x70, 0x8f, 0x0c, 0x7b, 0xd8, 0x70, 0x31, 0xbb, 0x14, 0x96, 0xd8, 0x30, 0xeb, + 0x21, 0xc3, 0x6b, 0x90, 0xd5, 0x3b, 0xfe, 0x89, 0xf6, 0x31, 0x3e, 0x3c, 0x71, 0x9c, 0x53, 0xad, + 0xe3, 0x36, 0xf9, 0x5f, 0xd4, 0x45, 0xd2, 0xff, 0x3e, 0xeb, 0x3e, 0x70, 0x9b, 0x68, 0x03, 0x2e, + 0x0c, 0x20, 0x5b, 0xd8, 0x3f, 0x71, 0x4c, 0x2f, 0x97, 0x5a, 0x4d, 0xac, 0xc9, 0x2a, 0x8a, 0xa0, + 0x1f, 0xb2, 0x11, 0xf4, 0x4d, 0xb8, 0xca, 0xef, 0x2e, 0x4d, 0xac, 0x1b, 0xbe, 0xd5, 0xd5, 0x7d, + 0xac, 0xf9, 0x27, 0x2e, 0xf6, 0x4e, 0x9c, 0xa6, 0x49, 0xab, 0x7f, 0x59, 0xbd, 0xc2, 0x20, 0x95, + 0x10, 0xd1, 0x08, 0x00, 0x43, 0x4a, 0xcc, 0x3c, 0x87, 0x12, 0x09, 0x69, 0x64, 0xa7, 0x90, 0x9f, + 0x4d, 0xda, 0xdf, 0x2e, 0x7e, 0x9c, 0x80, 0x4b, 0x07, 0xa4, 0xa5, 0x1f, 0x36, 0x31, 0x37, 0xc4, + 0x3d, 0x0b, 0x37, 0x4d, 0x0f, 0x6d, 0x70, 0xf5, 0x0b, 0xfc, 0xff, 0xd4, 0xf0, 0x7c, 0x75, 0xdf, + 0xb5, 0xec, 0x63, 0x5a, 0x19, 0x71, 0xe3, 0xdc, 0x8b, 0x51, 0xaf, 0x38, 0x05, 0xf5, 0xb0, 0xf2, + 0x8f, 0xc6, 0x28, 0x9f, 0x79, 0xd6, 0x5b, 0x11, 0x3f, 0x8e, 0x67, 0xbd, 0x58, 0x1a, 0x31, 0x4f, + 0xac, 0xc9, 0xbe, 0x37, 0xd9, 0x64, 0xd2, 0x14, 0xac, 0x8f, 0x37, 0x68, 0xbe, 0x08, 0x68, 0x94, + 0x0f, 0x76, 0x07, 0xcf, 0xc4, 0x11, 0xa8, 0x2f, 0x05, 0xcd, 0xc2, 0x27, 0x22, 0x2c, 0x55, 0xf8, + 0xfb, 0x85, 0x7a, 0xa7, 0xd5, 0xd2, 0xdd, 0xde, 0x48, 0x48, 0x8c, 0x5e, 0x18, 0x0e, 0x3f, 0x57, + 0x90, 0x23, 0xcf, 0x15, 0x06, 0x5d, 0x4a, 0x7a, 0x1e, 0x97, 0xba, 0x03, 0xf3, 0xba, 0x61, 0x60, + 0xcf, 0x8b, 0xd6, 0x98, 0x93, 0x68, 0x21, 0x80, 0x8f, 0xf8, 0x63, 0xea, 0x79, 0xfc, 0xf1, 0xaf, + 0x42, 0xff, 0xe9, 0x08, 0x7f, 0xda, 0xf0, 0xee, 0x40, 0x55, 0xfe, 0xda, 0xd8, 0xa7, 0x05, 0xfc, + 0xad, 0x43, 0xa4, 0x4a, 0x5f, 0x87, 0x4c, 0xf0, 0xda, 0x60, 0xd2, 0x2b, 0x93, 0x10, 0x54, 0x68, + 0x05, 0x6f, 0x4c, 0xc8, 0x24, 0xe8, 0x2a, 0x5c, 0x2e, 0xef, 0x94, 0x6a, 0xf7, 0x15, 0xad, 0xf1, + 0x78, 0x5f, 0xd1, 0x0e, 0x6a, 0xf5, 0x7d, 0xa5, 0x5c, 0xbd, 0x57, 0x55, 0x2a, 0xd9, 0x39, 0xb4, + 0x0c, 0x4b, 0xd1, 0xc1, 0xfd, 0x83, 0x46, 0x56, 0x40, 0x97, 0x00, 0x45, 0x3b, 0x2b, 0xca, 0xae, + 0xd2, 0x50, 0xb2, 0x22, 0xba, 0x08, 0xe7, 0xa3, 0xfd, 0xe5, 0x5d, 0xa5, 0xa4, 0x66, 0x13, 0x85, + 0x2e, 0x64, 0x02, 0x26, 0xd0, 0x26, 0x48, 0xc4, 0x95, 0xf9, 0xee, 0x73, 0x3d, 0x86, 0xcf, 0x62, + 0x45, 0xf7, 0x75, 0xb6, 0x35, 0x52, 0x68, 0xfe, 0x1d, 0x90, 0xc3, 0xae, 0xe7, 0xf9, 0xaf, 0x55, + 0xa8, 0x11, 0x31, 0xc3, 0x07, 0x2f, 0x83, 0xaf, 0x2a, 0x84, 0xb8, 0x57, 0x15, 0x83, 0xef, 0x32, + 0xc4, 0xa1, 0x77, 0x19, 0x85, 0x1f, 0x0a, 0x30, 0x1f, 0xf9, 0xe3, 0x7f, 0xb6, 0xfb, 0x21, 0x7a, + 0x03, 0x96, 0x5c, 0xdc, 0xd4, 0xc9, 0xe9, 0x5a, 0xe3, 0x80, 0x04, 0x05, 0x2c, 0x06, 0xdd, 0x7b, + 0x6c, 0xe3, 0x34, 0x00, 0xfa, 0x33, 0x47, 0x5f, 0x82, 0x08, 0xa3, 0x2f, 0x41, 0xae, 0x81, 0x6c, + 0xe2, 0x26, 0x39, 0xb4, 0x63, 0x37, 0x10, 0x28, 0xec, 0x18, 0x78, 0x27, 0x92, 0x18, 0x7c, 0x27, + 0x72, 0x00, 0x99, 0x8a, 0x63, 0x28, 0x5d, 0x6c, 0xfb, 0xe8, 0xe6, 0x80, 0x67, 0x5e, 0x8e, 0x48, + 0x18, 0x40, 0x22, 0xce, 0x78, 0x0d, 0xd8, 0x3e, 0xe5, 0x9d, 0xf0, 0x15, 0x17, 0xd4, 0x7e, 0xc7, + 0x8d, 0xcf, 0x45, 0x90, 0xc3, 0x43, 0x26, 0x71, 0xae, 0x47, 0xa5, 0xdd, 0x03, 0xee, 0x2e, 0xb5, + 0x83, 0xdd, 0xdd, 0xec, 0x1c, 0x71, 0xae, 0x48, 0xe7, 0xf6, 0xde, 0xde, 0xae, 0x52, 0xaa, 0x31, + 0xa7, 0x8b, 0xf4, 0x57, 0x6b, 0x0d, 0xe5, 0xbe, 0xa2, 0x66, 0xc5, 0xa1, 0x49, 0x76, 0xf7, 0x6a, + 0xf7, 0xb3, 0x09, 0xe2, 0x89, 0x91, 0xce, 0xca, 0xde, 0xc1, 0xf6, 0xae, 0x92, 0x95, 0x86, 0xba, + 0xeb, 0x0d, 0xb5, 0x5a, 0xbb, 0x9f, 0x4d, 0xa2, 0x0b, 0x90, 0x8d, 0x2e, 0xf9, 0xb8, 0xa1, 0xd4, + 0xb3, 0xa9, 0xa1, 0x89, 0x2b, 0xa5, 0x86, 0x92, 0x4d, 0xa3, 0x3c, 0x5c, 0x8a, 0x74, 0x92, 0x23, + 0x8f, 0xb6, 0xb7, 0xfd, 0x40, 0x29, 0x37, 0xb2, 0x19, 0x74, 0x05, 0x2e, 0x0e, 0x8f, 0x95, 0x54, + 0xb5, 0xf4, 0x38, 0x2b, 0x0f, 0xcd, 0xd5, 0x50, 0xbe, 0xdb, 0xc8, 0xc2, 0xd0, 0x5c, 0x5c, 0x22, + 0xad, 0x5c, 0x6b, 0x64, 0xe7, 0xd1, 0x65, 0x58, 0x1e, 0x92, 0x8a, 0x0e, 0x2c, 0x0c, 0xcf, 0xa4, + 0x2a, 0x4a, 0xf6, 0xdc, 0x8d, 0x4f, 0x04, 0x58, 0x88, 0xda, 0x02, 0xbd, 0x06, 0xab, 0x95, 0xbd, + 0xb2, 0xa6, 0x3c, 0x52, 0x6a, 0x8d, 0x40, 0x07, 0xe5, 0x83, 0x87, 0x4a, 0xad, 0x51, 0xd7, 0x58, + 0x88, 0x92, 0xe0, 0x9e, 0x84, 0x7a, 0xbf, 0xd4, 0x28, 0xef, 0x28, 0x95, 0xac, 0x80, 0x5e, 0x87, + 0xc2, 0x58, 0xd4, 0x41, 0x2d, 0xc0, 0x89, 0xdb, 0x37, 0x7f, 0xfd, 0x74, 0x45, 0xf8, 0xec, 0xe9, + 0x8a, 0xf0, 0xc7, 0xa7, 0x2b, 0xc2, 0x4f, 0xff, 0xb4, 0x32, 0x07, 0xe7, 0x4d, 0xdc, 0x0d, 0xbc, + 0x45, 0x6f, 0x5b, 0xc5, 0xee, 0xe6, 0xbe, 0xf0, 0x81, 0x54, 0xbc, 0xd3, 0xdd, 0x3c, 0x4c, 0xd1, + 0xfc, 0xf8, 0xb5, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb5, 0x3c, 0x8c, 0xee, 0x25, 0x28, 0x00, + 0x00, } func (m *Snapshot) Marshal() (dAtA []byte, err error) { @@ -4723,7 +4738,7 @@ func (m *Operation_TreeEdit) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintResources(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } if len(m.Contents) > 0 { for iNdEx := len(m.Contents) - 1; iNdEx >= 0; iNdEx-- { @@ -4736,6 +4751,32 @@ func (m *Operation_TreeEdit) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintResources(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x2a + } + } + if len(m.CreatedAtMapByActor) > 0 { + for k := range m.CreatedAtMapByActor { + v := m.CreatedAtMapByActor[k] + baseI := i + if v != nil { + { + size, err := v.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintResources(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + i -= len(k) + copy(dAtA[i:], k) + i = encodeVarintResources(dAtA, i, uint64(len(k))) + i-- + dAtA[i] = 0xa + i = encodeVarintResources(dAtA, i, uint64(baseI-i)) + i-- dAtA[i] = 0x22 } } @@ -7237,6 +7278,19 @@ func (m *Operation_TreeEdit) Size() (n int) { l = m.To.Size() n += 1 + l + sovResources(uint64(l)) } + if len(m.CreatedAtMapByActor) > 0 { + for k, v := range m.CreatedAtMapByActor { + _ = k + _ = v + l = 0 + if v != nil { + l = v.Size() + l += 1 + sovResources(uint64(l)) + } + mapEntrySize := 1 + len(k) + sovResources(uint64(len(k))) + l + n += mapEntrySize + 1 + sovResources(uint64(mapEntrySize)) + } + } if len(m.Contents) > 0 { for _, e := range m.Contents { l = e.Size() @@ -11324,6 +11378,135 @@ func (m *Operation_TreeEdit) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field CreatedAtMapByActor", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResources + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthResources + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthResources + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.CreatedAtMapByActor == nil { + m.CreatedAtMapByActor = make(map[string]*TimeTicket) + } + var mapkey string + var mapvalue *TimeTicket + for iNdEx < postIndex { + entryPreIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResources + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + if fieldNum == 1 { + var stringLenmapkey uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResources + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLenmapkey |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLenmapkey := int(stringLenmapkey) + if intStringLenmapkey < 0 { + return ErrInvalidLengthResources + } + postStringIndexmapkey := iNdEx + intStringLenmapkey + if postStringIndexmapkey < 0 { + return ErrInvalidLengthResources + } + if postStringIndexmapkey > l { + return io.ErrUnexpectedEOF + } + mapkey = string(dAtA[iNdEx:postStringIndexmapkey]) + iNdEx = postStringIndexmapkey + } else if fieldNum == 2 { + var mapmsglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResources + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + mapmsglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if mapmsglen < 0 { + return ErrInvalidLengthResources + } + postmsgIndex := iNdEx + mapmsglen + if postmsgIndex < 0 { + return ErrInvalidLengthResources + } + if postmsgIndex > l { + return io.ErrUnexpectedEOF + } + mapvalue = &TimeTicket{} + if err := mapvalue.Unmarshal(dAtA[iNdEx:postmsgIndex]); err != nil { + return err + } + iNdEx = postmsgIndex + } else { + iNdEx = entryPreIndex + skippy, err := skipResources(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthResources + } + if (iNdEx + skippy) > postIndex { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + m.CreatedAtMapByActor[mapkey] = mapvalue + iNdEx = postIndex + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Contents", wireType) } @@ -11357,7 +11540,7 @@ func (m *Operation_TreeEdit) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ExecutedAt", wireType) } diff --git a/api/yorkie/v1/resources.proto b/api/yorkie/v1/resources.proto index 393ed88b6..b4949cc18 100644 --- a/api/yorkie/v1/resources.proto +++ b/api/yorkie/v1/resources.proto @@ -121,8 +121,9 @@ message Operation { TimeTicket parent_created_at = 1; TreePos from = 2; TreePos to = 3; - repeated TreeNodes contents = 4; - TimeTicket executed_at = 5; + map created_at_map_by_actor = 4; + repeated TreeNodes contents = 5; + TimeTicket executed_at = 6; } message TreeStyle { TimeTicket parent_created_at = 1; diff --git a/pkg/document/crdt/tree.go b/pkg/document/crdt/tree.go index 01d0c64b1..8bad680f0 100644 --- a/pkg/document/crdt/tree.go +++ b/pkg/document/crdt/tree.go @@ -297,15 +297,17 @@ func (n *TreeNode) SplitElement(offset int) (*TreeNode, error) { } // remove marks the node as removed. -func (n *TreeNode) remove(removedAt *time.Ticket) { +func (n *TreeNode) remove(removedAt *time.Ticket, latestCreatedAt *time.Ticket) bool { justRemoved := n.RemovedAt == nil - if n.RemovedAt == nil || n.RemovedAt.Compare(removedAt) > 0 { + if !n.Pos.CreatedAt.After(latestCreatedAt) && + (n.RemovedAt == nil || n.RemovedAt.Compare(removedAt) > 0) { n.RemovedAt = removedAt + if justRemoved { + n.IndexTreeNode.UpdateAncestorsSize() + } + return true } - - if justRemoved { - n.IndexTreeNode.UpdateAncestorsSize() - } + return false } // InsertAt inserts the given node at the given offset. @@ -527,17 +529,21 @@ func (t *Tree) ToXML() string { // EditByIndex edits the given range with the given value. // This method uses indexes instead of a pair of TreePos for testing. -func (t *Tree) EditByIndex(start, end int, contents []*TreeNode, editedAt *time.Ticket) error { +func (t *Tree) EditByIndex(start, end int, + latestCreatedAtMapByActor map[string]*time.Ticket, + contents []*TreeNode, + editedAt *time.Ticket, +) (map[string]*time.Ticket, error) { fromPos, err := t.FindPos(start) if err != nil { - return err + return nil, err } toPos, err := t.FindPos(end) if err != nil { - return err + return nil, err } - return t.Edit(fromPos, toPos, contents, editedAt) + return t.Edit(fromPos, toPos, latestCreatedAtMapByActor, contents, editedAt) } // FindPos finds the position of the given index in the tree. @@ -593,19 +599,23 @@ func (t *Tree) FindPos(offset int) (*TreePos, error) { // Edit edits the tree with the given range and content. // If the content is undefined, the range will be removed. -func (t *Tree) Edit(from, to *TreePos, contents []*TreeNode, editedAt *time.Ticket) error { +func (t *Tree) Edit(from, to *TreePos, + latestCreatedAtMapByActor map[string]*time.Ticket, + contents []*TreeNode, + editedAt *time.Ticket, +) (map[string]*time.Ticket, error) { // 01. split text nodes at the given range if needed. fromParent, fromLeft, err := t.findTreeNodesWithSplitText(from, editedAt) if err != nil { - return err + return nil, err } toParent, toLeft, err := t.findTreeNodesWithSplitText(to, editedAt) if err != nil { - return err + return nil, err } // 02. remove the nodes and update linked list and index tree. - toBeRemoveds := make([]*TreeNode, 0) + createdAtMapByActor := make(map[string]*time.Ticket) if fromLeft != toLeft { var fromChildIndex int @@ -623,27 +633,43 @@ func (t *Tree) Edit(from, to *TreePos, contents []*TreeNode, editedAt *time.Tick parentChildern := parent.Children(true) for i := fromChildIndex; i <= toChildIndex; i++ { - node := parentChildern[i] + node := parentChildern[i].Value + actorIDHex := node.Pos.CreatedAt.ActorIDHex() - if node.Value.Pos.CreatedAt.Lamport() == - editedAt.Lamport() && - node.Value.Pos.CreatedAt.ActorID().String() != editedAt.ActorID().String() { - continue + var latestCreatedAt *time.Ticket + if latestCreatedAtMapByActor == nil { + latestCreatedAt = time.MaxTicket + } else { + createdAt, ok := latestCreatedAtMapByActor[actorIDHex] + if ok { + latestCreatedAt = createdAt + } else { + latestCreatedAt = time.InitialTicket + } } - // traverse the nodes including tombstones - index.TraverseNode(node, func(node *index.Node[*TreeNode], depth int) { - if !node.Value.IsRemoved() { - toBeRemoveds = append(toBeRemoveds, node.Value) + if node.remove(editedAt, latestCreatedAt) { + latestCreatedAt = createdAtMapByActor[actorIDHex] + createdAt := node.Pos.CreatedAt + if latestCreatedAt == nil || createdAt.After(latestCreatedAt) { + createdAtMapByActor[actorIDHex] = createdAt } - }) - } - - for _, node := range toBeRemoveds { - node.remove(editedAt) - if node.IsRemoved() { t.removedNodeMap[node.Pos.ToIDString()] = node + + // traverse the nodes including tombstones + index.TraverseNode(node.IndexTreeNode, func(node *index.Node[*TreeNode], depth int) { + if node.Value.remove(editedAt, time.MaxTicket) { + // TODO(sejongk): Refactor the repeated code. + latestCreatedAt = latestCreatedAtMapByActor[actorIDHex] + createdAt := node.Value.Pos.CreatedAt + if latestCreatedAt == nil || createdAt.After(latestCreatedAt) { + createdAtMapByActor[actorIDHex] = createdAt + } + + t.removedNodeMap[node.Value.Pos.ToIDString()] = node.Value + } + }) } } } @@ -658,13 +684,13 @@ func (t *Tree) Edit(from, to *TreePos, contents []*TreeNode, editedAt *time.Tick // 03-1-1. when there's no leftSibling, then insert content into very front of parent's children List err := fromParent.InsertAt(content.IndexTreeNode, 0) if err != nil { - return err + return nil, err } } else { // 03-1-2. insert after leftSibling err := fromParent.InsertAfter(content.IndexTreeNode, leftInChildren) if err != nil { - return err + return nil, err } } @@ -673,7 +699,14 @@ func (t *Tree) Edit(from, to *TreePos, contents []*TreeNode, editedAt *time.Tick // if insertion happens during concurrent editing and parent node has been removed, // make new nodes as tombstone immediately if fromParent.Value.IsRemoved() { - node.Value.remove(editedAt) + actorIDHex := node.Value.Pos.CreatedAt.ActorIDHex() + if node.Value.remove(editedAt, time.MaxTicket) { + latestCreatedAt := latestCreatedAtMapByActor[actorIDHex] + createdAt := node.Value.Pos.CreatedAt + if latestCreatedAt == nil || createdAt.After(latestCreatedAt) { + createdAtMapByActor[actorIDHex] = createdAt + } + } t.removedNodeMap[node.Value.Pos.ToIDString()] = node.Value } @@ -681,8 +714,7 @@ func (t *Tree) Edit(from, to *TreePos, contents []*TreeNode, editedAt *time.Tick }) } } - - return nil + return createdAtMapByActor, nil } // StyleByIndex applies the given attributes of the given range. diff --git a/pkg/document/crdt/tree_test.go b/pkg/document/crdt/tree_test.go index 67b44c850..a3c72bd84 100644 --- a/pkg/document/crdt/tree_test.go +++ b/pkg/document/crdt/tree_test.go @@ -104,7 +104,7 @@ func TestTree(t *testing.T) { // 1 //

- err := tree.EditByIndex(0, 0, + _, err := tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

", tree.ToXML()) @@ -112,8 +112,8 @@ func TestTree(t *testing.T) { // 1 //

h e l l o

- err = tree.EditByIndex( - 1, 1, + _, err = tree.EditByIndex( + 1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "hello")}, helper.IssueTime(ctx), ) @@ -126,15 +126,15 @@ func TestTree(t *testing.T) { p := crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil) err = p.InsertAt(crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "world"), 0) assert.NoError(t, err) - err = tree.EditByIndex(7, 7, []*crdt.TreeNode{p}, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(7, 7, nil, []*crdt.TreeNode{p}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

hello

world

", tree.ToXML()) assert.Equal(t, 14, tree.Root().Len()) // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 //

h e l l o !

w o r l d

- err = tree.EditByIndex( - 6, 6, + _, err = tree.EditByIndex( + 6, 6, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "!")}, helper.IssueTime(ctx), ) @@ -167,8 +167,8 @@ func TestTree(t *testing.T) { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 //

h e l l o ~ !

w o r l d

- err = tree.EditByIndex( - 6, 6, + _, err = tree.EditByIndex( + 6, 6, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "~")}, helper.IssueTime(ctx), ) @@ -184,16 +184,16 @@ func TestTree(t *testing.T) { ctx := helper.TextChangeContext(helper.TestRoot()) tree := crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err := tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err := tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(4, 4, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(4, 4, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(5, 5, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(5, 5, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "cd")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

cd

", tree.ToXML()) @@ -206,7 +206,7 @@ func TestTree(t *testing.T) { // 02. Delete b from the first paragraph. // 0 1 2 3 4 5 6 7 //

a

c d

- err = tree.EditByIndex(2, 3, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(2, 3, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

a

cd

", tree.ToXML()) @@ -224,16 +224,16 @@ func TestTree(t *testing.T) { ctx := helper.TextChangeContext(helper.TestRoot()) tree := crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err := tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err := tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(4, 4, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(4, 4, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(5, 5, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(5, 5, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "cd")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

cd

", tree.ToXML()) @@ -241,7 +241,7 @@ func TestTree(t *testing.T) { // 02. delete b, c and first paragraph. // 0 1 2 3 4 //

a d

- err = tree.EditByIndex(2, 6, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(2, 6, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ad

", tree.ToXML()) @@ -252,7 +252,7 @@ func TestTree(t *testing.T) { assert.Equal(t, 1, structure.Children[0].Children[1].Size) // 03. insert a new text node at the start of the first paragraph. - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "@")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

@ad

", tree.ToXML()) @@ -265,143 +265,143 @@ func TestTree(t *testing.T) { //

a b

ctx := helper.TextChangeContext(helper.TestRoot()) tree := crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err := tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err := tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(2, 2, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(2, 2, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "i", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(3, 3, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(3, 3, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) - err = tree.EditByIndex(5, 6, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(5, 6, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) // 02. Edit between two element nodes in same hierarchy. tree = crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err = tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(2, 2, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(2, 2, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "i", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(3, 3, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(3, 3, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) - err = tree.EditByIndex(6, 7, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(6, 7, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) // 03. Edit between text and element node in same hierarchy. tree = crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err = tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(2, 2, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(2, 2, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "i", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(3, 3, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(3, 3, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) - err = tree.EditByIndex(4, 6, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(4, 6, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

a

", tree.ToXML()) // 04. Edit between text and element node in same hierarchy. tree = crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err = tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(2, 2, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(2, 2, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "i", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(3, 3, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(3, 3, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) - err = tree.EditByIndex(5, 7, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(5, 7, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) // 05. Edit between text and element node in same hierarchy. tree = crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err = tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(2, 2, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(2, 2, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "i", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(3, 3, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(3, 3, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) - err = tree.EditByIndex(4, 7, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(4, 7, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

a

", tree.ToXML()) // 06. Edit between text and element node in same hierarchy. tree = crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err = tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(2, 2, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(2, 2, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "i", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(3, 3, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(3, 3, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

", tree.ToXML()) - err = tree.EditByIndex(3, 7, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(3, 7, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

", tree.ToXML()) // 07. Edit between text and element node in same hierarchy. tree = crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err = tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(4, 4, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(4, 4, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(5, 5, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(5, 5, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "b", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(6, 6, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(6, 6, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "cd")}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(10, 10, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(10, 10, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(11, 11, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(11, 11, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ef")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

cd

ef

", tree.ToXML()) - err = tree.EditByIndex(9, 10, nil, helper.IssueTime(ctx)) + _, err = tree.EditByIndex(9, 10, nil, nil, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

cd

ef

", tree.ToXML()) }) @@ -411,16 +411,16 @@ func TestTree(t *testing.T) { // 01. style attributes to an element node. ctx := helper.TextChangeContext(helper.TestRoot()) tree := crdt.NewTree(crdt.NewTreeNode(helper.IssuePos(ctx), "root", nil), helper.IssueTime(ctx)) - err := tree.EditByIndex(0, 0, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err := tree.EditByIndex(0, 0, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(1, 1, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(1, 1, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "ab")}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(4, 4, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(4, 4, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "p", nil)}, helper.IssueTime(ctx)) assert.NoError(t, err) - err = tree.EditByIndex(5, 5, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), + _, err = tree.EditByIndex(5, 5, nil, []*crdt.TreeNode{crdt.NewTreeNode(helper.IssuePos(ctx), "text", nil, "cd")}, helper.IssueTime(ctx)) assert.NoError(t, err) assert.Equal(t, "

ab

cd

", tree.ToXML()) diff --git a/pkg/document/json/tree.go b/pkg/document/json/tree.go index 38d3040ec..7437c000a 100644 --- a/pkg/document/json/tree.go +++ b/pkg/document/json/tree.go @@ -193,7 +193,8 @@ func (t *Tree) edit(fromPos, toPos *crdt.TreePos, contents []*TreeNode) bool { } ticket = t.context.LastTimeTicket() - if err := t.Tree.Edit(fromPos, toPos, clones, ticket); err != nil { + maxCreationMapByActor, err := t.Tree.Edit(fromPos, toPos, nil, clones, ticket) + if err != nil { panic(err) } @@ -201,6 +202,7 @@ func (t *Tree) edit(fromPos, toPos *crdt.TreePos, contents []*TreeNode) bool { t.CreatedAt(), fromPos, toPos, + maxCreationMapByActor, nodes, ticket, )) diff --git a/pkg/document/operations/tree_edit.go b/pkg/document/operations/tree_edit.go index 65a212e97..400ffd094 100644 --- a/pkg/document/operations/tree_edit.go +++ b/pkg/document/operations/tree_edit.go @@ -33,6 +33,10 @@ type TreeEdit struct { // toPos represents the end point of the editing range. to *crdt.TreePos + // latestCreatedAtMapByActor is a map that stores the latest creation time + // by actor for the nodes included in the editing range. + latestCreatedAtMapByActor map[string]*time.Ticket + // contents is the content of tree added when editing. contents []*crdt.TreeNode @@ -45,15 +49,17 @@ func NewTreeEdit( parentCreatedAt *time.Ticket, from *crdt.TreePos, to *crdt.TreePos, + latestCreatedAtMapByActor map[string]*time.Ticket, contents []*crdt.TreeNode, executedAt *time.Ticket, ) *TreeEdit { return &TreeEdit{ - parentCreatedAt: parentCreatedAt, - from: from, - to: to, - contents: contents, - executedAt: executedAt, + parentCreatedAt: parentCreatedAt, + from: from, + to: to, + latestCreatedAtMapByActor: latestCreatedAtMapByActor, + contents: contents, + executedAt: executedAt, } } @@ -78,7 +84,7 @@ func (e *TreeEdit) Execute(root *crdt.Root) error { } } - if err = obj.Edit(e.from, e.to, contents, e.executedAt); err != nil { + if _, err = obj.Edit(e.from, e.to, e.latestCreatedAtMapByActor, contents, e.executedAt); err != nil { return err } @@ -121,3 +127,9 @@ func (e *TreeEdit) ParentCreatedAt() *time.Ticket { func (e *TreeEdit) Contents() []*crdt.TreeNode { return e.contents } + +// CreatedAtMapByActor returns the map that stores the latest creation time +// by actor for the nodes included in the editing range. +func (e *TreeEdit) CreatedAtMapByActor() map[string]*time.Ticket { + return e.latestCreatedAtMapByActor +} diff --git a/test/integration/tree_test.go b/test/integration/tree_test.go index 3d5ce879f..6c1e8fd47 100644 --- a/test/integration/tree_test.go +++ b/test/integration/tree_test.go @@ -477,7 +477,6 @@ func TestTree(t *testing.T) { }) t.Run("concurrently insert and delete contained elements of the same depth test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -516,6 +515,54 @@ func TestTree(t *testing.T) { assert.Equal(t, "

", d1.Root().GetTree("t").ToXML()) }) + t.Run("concurrently multiple insert and delete contained elements of the same depth test", func(t *testing.T) { + ctx := context.Background() + d1 := document.New(helper.TestDocKey(t)) + assert.NoError(t, c1.Attach(ctx, d1)) + + assert.NoError(t, d1.Update(func(root *json.Object, p *presence.Presence) error { + root.SetNewTree("t", &json.TreeNode{ + Type: "root", + Children: []json.TreeNode{{ + Type: "p", + Children: []json.TreeNode{{Type: "text", Value: "1234"}}, + }, { + Type: "p", + Children: []json.TreeNode{{Type: "text", Value: "abcd"}}, + }}, + }) + return nil + })) + assert.NoError(t, c1.Sync(ctx)) + assert.Equal(t, "

1234

abcd

", d1.Root().GetTree("t").ToXML()) + + d2 := document.New(helper.TestDocKey(t)) + assert.NoError(t, c2.Attach(ctx, d2)) + + assert.NoError(t, d1.Update(func(root *json.Object, p *presence.Presence) error { + root.GetTree("t").Edit(6, 6, &json.TreeNode{Type: "p", Children: []json.TreeNode{}}) + return nil + })) + assert.NoError(t, d1.Update(func(root *json.Object, p *presence.Presence) error { + root.GetTree("t").Edit(8, 8, &json.TreeNode{Type: "p", Children: []json.TreeNode{}}) + return nil + })) + assert.NoError(t, d1.Update(func(root *json.Object, p *presence.Presence) error { + root.GetTree("t").Edit(10, 10, &json.TreeNode{Type: "p", Children: []json.TreeNode{}}) + return nil + })) + assert.NoError(t, d2.Update(func(root *json.Object, p *presence.Presence) error { + root.GetTree("t").Edit(0, 12, nil) + return nil + })) + assert.Equal(t, "

1234

abcd

", d1.Root().GetTree("t").ToXML()) + assert.Equal(t, "", d2.Root().GetTree("t").ToXML()) + + syncClientsThenAssertEqual(t, []clientAndDocPair{{c1, d1}, {c2, d2}}) + assert.Equal(t, "

", d1.Root().GetTree("t").ToXML()) + assert.Equal(t, "

", d2.Root().GetTree("t").ToXML()) + }) + t.Run("detecting error when inserting and deleting contained elements at different depths test", func(t *testing.T) { ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) @@ -595,7 +642,6 @@ func TestTree(t *testing.T) { }) t.Run("concurrently insert and delete contained text test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -887,7 +933,6 @@ func TestTree(t *testing.T) { }) t.Run("concurrently delete and insert side by side elements test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -1077,7 +1122,6 @@ func TestTree(t *testing.T) { }) t.Run("concurrently insert and delete side by side text test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -1402,7 +1446,6 @@ func TestTree(t *testing.T) { }) t.Run("handle insert within block delete concurrently test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -1439,7 +1482,7 @@ func TestTree(t *testing.T) { }) t.Run("handle insert within block delete concurrently test [2]", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs + t.Skip() ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -1475,8 +1518,7 @@ func TestTree(t *testing.T) { assert.Equal(t, "

1abc

", d1.Root().GetTree("t").ToXML()) }) - t.Run("handle block element insertion within delete test [2]", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs + t.Run("handle block element insertion within delete test 2", func(t *testing.T) { ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -1564,7 +1606,6 @@ func TestTree(t *testing.T) { }) t.Run("handle concurrent element insert/deletion (right) test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1)) @@ -1643,7 +1684,6 @@ func TestTree(t *testing.T) { }) t.Run("handle deletion after insertion concurrently test", func(t *testing.T) { - t.Skip() // TODO(sejonk): Remove this after fixing bugs ctx := context.Background() d1 := document.New(helper.TestDocKey(t)) assert.NoError(t, c1.Attach(ctx, d1))