From f94e57545e13a5d41230b8b4fdc1597309202c1e Mon Sep 17 00:00:00 2001 From: Rodrigo Zhou Date: Thu, 2 Feb 2023 19:50:35 -0800 Subject: [PATCH] Update admin handler to handle search attributes operations with SQL DB (#3894) Update admin handler to handle search attributes in SQL db --- api/adminservice/v1/request_response.pb.go | 551 ++++++++++++------ .../adminservice/v1/request_response.proto | 5 +- service/frontend/adminHandler.go | 230 +++++++- service/frontend/adminHandler_test.go | 11 +- 4 files changed, 580 insertions(+), 217 deletions(-) diff --git a/api/adminservice/v1/request_response.pb.go b/api/adminservice/v1/request_response.pb.go index ca2306042c5..601caf254e2 100644 --- a/api/adminservice/v1/request_response.pb.go +++ b/api/adminservice/v1/request_response.pb.go @@ -1451,6 +1451,7 @@ type AddSearchAttributesRequest struct { SearchAttributes map[string]v16.IndexedValueType `protobuf:"bytes,1,rep,name=search_attributes,json=searchAttributes,proto3" json:"search_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=temporal.api.enums.v1.IndexedValueType"` IndexName string `protobuf:"bytes,2,opt,name=index_name,json=indexName,proto3" json:"index_name,omitempty"` SkipSchemaUpdate bool `protobuf:"varint,3,opt,name=skip_schema_update,json=skipSchemaUpdate,proto3" json:"skip_schema_update,omitempty"` + Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` } func (m *AddSearchAttributesRequest) Reset() { *m = AddSearchAttributesRequest{} } @@ -1506,6 +1507,13 @@ func (m *AddSearchAttributesRequest) GetSkipSchemaUpdate() bool { return false } +func (m *AddSearchAttributesRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + type AddSearchAttributesResponse struct { } @@ -1544,6 +1552,7 @@ var xxx_messageInfo_AddSearchAttributesResponse proto.InternalMessageInfo type RemoveSearchAttributesRequest struct { SearchAttributes []string `protobuf:"bytes,1,rep,name=search_attributes,json=searchAttributes,proto3" json:"search_attributes,omitempty"` IndexName string `protobuf:"bytes,2,opt,name=index_name,json=indexName,proto3" json:"index_name,omitempty"` + Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` } func (m *RemoveSearchAttributesRequest) Reset() { *m = RemoveSearchAttributesRequest{} } @@ -1592,6 +1601,13 @@ func (m *RemoveSearchAttributesRequest) GetIndexName() string { return "" } +func (m *RemoveSearchAttributesRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + type RemoveSearchAttributesResponse struct { } @@ -1629,6 +1645,7 @@ var xxx_messageInfo_RemoveSearchAttributesResponse proto.InternalMessageInfo type GetSearchAttributesRequest struct { IndexName string `protobuf:"bytes,1,opt,name=index_name,json=indexName,proto3" json:"index_name,omitempty"` + Namespace string `protobuf:"bytes,4,opt,name=namespace,proto3" json:"namespace,omitempty"` } func (m *GetSearchAttributesRequest) Reset() { *m = GetSearchAttributesRequest{} } @@ -1670,6 +1687,13 @@ func (m *GetSearchAttributesRequest) GetIndexName() string { return "" } +func (m *GetSearchAttributesRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + type GetSearchAttributesResponse struct { CustomAttributes map[string]v16.IndexedValueType `protobuf:"bytes,1,rep,name=custom_attributes,json=customAttributes,proto3" json:"custom_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=temporal.api.enums.v1.IndexedValueType"` SystemAttributes map[string]v16.IndexedValueType `protobuf:"bytes,2,rep,name=system_attributes,json=systemAttributes,proto3" json:"system_attributes,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3,enum=temporal.api.enums.v1.IndexedValueType"` @@ -3219,194 +3243,195 @@ func init() { } var fileDescriptor_cc07c1a2abe7cb51 = []byte{ - // 2985 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x3a, 0xcd, 0x6f, 0x1b, 0xc7, - 0xf5, 0x5e, 0x7e, 0x89, 0x7c, 0x92, 0x28, 0x69, 0x6d, 0x59, 0x34, 0x15, 0x51, 0x0a, 0xe3, 0x38, - 0xb6, 0x7f, 0x09, 0xf5, 0xb3, 0xd2, 0x36, 0x4e, 0x52, 0x23, 0x90, 0x65, 0x47, 0x56, 0x2a, 0xe5, - 0x63, 0xe5, 0xd8, 0x45, 0x80, 0x60, 0x33, 0xdc, 0x1d, 0x51, 0x0b, 0x2f, 0x77, 0x37, 0x3b, 0x43, - 0x5a, 0x0a, 0xd0, 0x0f, 0x34, 0x2d, 0x7a, 0x2a, 0x6a, 0xa0, 0x28, 0x10, 0xe4, 0xd4, 0x63, 0x0b, - 0xb4, 0xe8, 0xad, 0xf7, 0xde, 0x7a, 0x0c, 0xda, 0x4b, 0xd0, 0x16, 0x4d, 0xa3, 0x5c, 0xda, 0x5b, - 0xfe, 0x84, 0x62, 0xbe, 0x96, 0xbb, 0xe4, 0x92, 0xa2, 0x6a, 0x3b, 0x05, 0x72, 0xe3, 0xbe, 0x79, - 0xef, 0xcd, 0x9b, 0xf7, 0x35, 0xef, 0xbd, 0x21, 0xbc, 0x44, 0x71, 0x3b, 0xf0, 0x43, 0xe4, 0xae, - 0x12, 0x1c, 0x76, 0x71, 0xb8, 0x8a, 0x02, 0x67, 0x15, 0xd9, 0x6d, 0xc7, 0x63, 0xdf, 0x8e, 0x85, - 0x57, 0xbb, 0x57, 0x56, 0x43, 0xfc, 0x7e, 0x07, 0x13, 0x6a, 0x86, 0x98, 0x04, 0xbe, 0x47, 0x70, - 0x23, 0x08, 0x7d, 0xea, 0xeb, 0x4f, 0x29, 0xda, 0x86, 0xa0, 0x6d, 0xa0, 0xc0, 0x69, 0xc4, 0x69, - 0x1b, 0xdd, 0x2b, 0xd5, 0xe5, 0x96, 0xef, 0xb7, 0x5c, 0xbc, 0xca, 0x49, 0x9a, 0x9d, 0xbd, 0x55, - 0xea, 0xb4, 0x31, 0xa1, 0xa8, 0x1d, 0x08, 0x2e, 0xd5, 0x5a, 0x3f, 0x82, 0xdd, 0x09, 0x11, 0x75, - 0x7c, 0x4f, 0xae, 0x3f, 0x69, 0xe3, 0x00, 0x7b, 0x36, 0xf6, 0x2c, 0x07, 0x93, 0xd5, 0x96, 0xdf, - 0xf2, 0x39, 0x9c, 0xff, 0x92, 0x28, 0xf5, 0xe8, 0x10, 0x4c, 0x7a, 0xec, 0x75, 0xda, 0x84, 0x89, - 0x6d, 0xf9, 0xed, 0x76, 0xc4, 0xe6, 0x42, 0x3a, 0x0e, 0x45, 0xe4, 0x9e, 0xf9, 0x7e, 0x07, 0x77, - 0xe4, 0xa1, 0xaa, 0xe7, 0x13, 0x78, 0x82, 0x05, 0x43, 0x6c, 0x63, 0x42, 0x50, 0x4b, 0x61, 0x3d, - 0x9d, 0xc0, 0xea, 0xe2, 0x90, 0x38, 0x69, 0x68, 0xc9, 0x4d, 0xef, 0xfb, 0xe1, 0xbd, 0x3d, 0xd7, - 0xbf, 0x3f, 0x88, 0xf7, 0x6c, 0x9a, 0x15, 0x2c, 0xb7, 0x43, 0x28, 0x0e, 0x07, 0xb1, 0x2f, 0xa5, - 0x61, 0xa7, 0x9f, 0xfa, 0xf2, 0x68, 0x54, 0xb1, 0x83, 0xc4, 0x7d, 0x66, 0x24, 0x2e, 0x53, 0xd4, - 0x28, 0x69, 0xf7, 0x1d, 0x42, 0xfd, 0xf0, 0x70, 0x50, 0xda, 0x46, 0x1a, 0xb6, 0x87, 0xda, 0x98, - 0x04, 0x48, 0xb8, 0x57, 0x12, 0xff, 0xff, 0xd3, 0xf0, 0x43, 0x1c, 0xb8, 0x8e, 0xc5, 0xdd, 0x62, - 0x90, 0xe2, 0xc5, 0x34, 0x8a, 0x80, 0xd9, 0x84, 0x50, 0xec, 0x89, 0x3d, 0xe4, 0x51, 0xcd, 0x36, - 0xa6, 0xc8, 0x46, 0x14, 0x49, 0xd2, 0xe7, 0xc7, 0x20, 0xc5, 0x07, 0xd8, 0xea, 0xb0, 0x9d, 0x89, - 0x24, 0x7a, 0x65, 0x0c, 0x22, 0x65, 0x6b, 0xb3, 0xdd, 0xa1, 0xa8, 0xe9, 0x62, 0x93, 0x50, 0x44, - 0x47, 0xaa, 0xa4, 0x8f, 0x01, 0xd3, 0xb7, 0xdc, 0xb0, 0xfe, 0xa1, 0x06, 0x55, 0x03, 0x37, 0x3b, - 0x8e, 0x6b, 0xef, 0x08, 0x76, 0xbb, 0x8c, 0x9b, 0x21, 0xc2, 0x52, 0x7f, 0x02, 0x4a, 0x91, 0x3e, - 0x2b, 0xda, 0x8a, 0x76, 0xb1, 0x64, 0xf4, 0x00, 0xfa, 0x26, 0x94, 0xa2, 0x13, 0x54, 0x32, 0x2b, - 0xda, 0xc5, 0xc9, 0xb5, 0x4b, 0x91, 0x00, 0x3c, 0x64, 0xa5, 0xc7, 0x74, 0xaf, 0x34, 0xee, 0x4a, - 0xa9, 0x6f, 0x2a, 0x02, 0xa3, 0x47, 0x5b, 0x5f, 0x82, 0xc5, 0x54, 0x21, 0x44, 0x4e, 0xa8, 0xff, - 0x58, 0x83, 0xc5, 0x1b, 0x98, 0x58, 0xa1, 0xd3, 0xc4, 0xff, 0x43, 0x29, 0xff, 0x90, 0x81, 0x27, - 0xd2, 0xc5, 0x10, 0x72, 0xea, 0xe7, 0xa0, 0x48, 0xf6, 0x51, 0x68, 0x9b, 0x8e, 0x2d, 0xc5, 0x98, - 0xe0, 0xdf, 0x5b, 0xb6, 0xfe, 0x24, 0x4c, 0x49, 0x37, 0x36, 0x91, 0x6d, 0x87, 0x5c, 0x8e, 0x92, - 0x31, 0x29, 0x61, 0xeb, 0xb6, 0x1d, 0xea, 0xfb, 0x70, 0xda, 0x42, 0xd6, 0x3e, 0x4e, 0xda, 0xb5, - 0x92, 0xe5, 0x12, 0x5f, 0x6d, 0xa4, 0x65, 0xc4, 0x98, 0x61, 0xe3, 0xd2, 0x27, 0x84, 0x9b, 0xe3, - 0x4c, 0xe3, 0x20, 0xdd, 0x83, 0xb3, 0xcc, 0x51, 0x9b, 0x88, 0xf4, 0x6f, 0x96, 0x7b, 0xc8, 0xcd, - 0xce, 0x28, 0xbe, 0x71, 0x68, 0xfd, 0xcf, 0x1a, 0x54, 0x95, 0xe2, 0x6e, 0x89, 0x13, 0xdf, 0xf2, - 0x09, 0x55, 0xe6, 0x63, 0xba, 0xf1, 0x09, 0xe5, 0x8a, 0xc1, 0x84, 0x48, 0xd5, 0x4d, 0x32, 0xd8, - 0xba, 0x00, 0x25, 0x34, 0xcb, 0x54, 0x97, 0xef, 0x69, 0x36, 0x61, 0xfc, 0x6c, 0xbf, 0xf1, 0xbf, - 0x0b, 0x7a, 0x14, 0x2f, 0x3d, 0x2f, 0xc8, 0x9d, 0xd4, 0x0b, 0xe6, 0xee, 0xf7, 0x83, 0xea, 0xff, - 0x88, 0x39, 0x65, 0xe2, 0x50, 0xd2, 0x19, 0x9e, 0x82, 0x69, 0x2e, 0x22, 0x31, 0xbd, 0x4e, 0xbb, - 0x89, 0x43, 0x7e, 0xac, 0xbc, 0x31, 0x25, 0x80, 0xaf, 0x73, 0x98, 0xbe, 0x08, 0x25, 0x75, 0x2e, - 0x52, 0xc9, 0xac, 0x64, 0x2f, 0xe6, 0x8d, 0xa2, 0x3c, 0x18, 0xd1, 0xdf, 0x85, 0x99, 0xe8, 0x20, - 0x26, 0xb7, 0xa2, 0x74, 0x86, 0x6f, 0xa4, 0xda, 0x27, 0xc2, 0x65, 0x47, 0x78, 0x5d, 0x7d, 0x6c, - 0x30, 0xba, 0x2d, 0x6f, 0xcf, 0x37, 0xca, 0x5e, 0x02, 0xa6, 0x57, 0x60, 0x42, 0x69, 0x3c, 0x2f, - 0x9c, 0x55, 0x7e, 0xbe, 0x96, 0x2b, 0xe6, 0x66, 0xf3, 0xf5, 0x06, 0xcc, 0x6d, 0xb8, 0x3e, 0xc1, - 0xbb, 0x4c, 0x1e, 0x65, 0xab, 0x7e, 0x17, 0xef, 0x19, 0xa2, 0x7e, 0x06, 0xf4, 0x38, 0xbe, 0x8c, - 0xdd, 0x67, 0x61, 0x66, 0x13, 0xd3, 0x71, 0x79, 0xbc, 0x07, 0xb3, 0x3d, 0x6c, 0xa9, 0xc8, 0x6d, - 0x00, 0x89, 0xee, 0xed, 0xf9, 0x9c, 0x60, 0x72, 0xed, 0xb9, 0x71, 0x3c, 0x94, 0xb3, 0xe1, 0x47, - 0x17, 0x4a, 0x66, 0x3f, 0xeb, 0x3f, 0xcb, 0xc0, 0xc2, 0xb6, 0x43, 0xa8, 0x34, 0xd9, 0x6d, 0x96, - 0x0b, 0x8f, 0x17, 0x4c, 0x7f, 0x15, 0x8a, 0x16, 0xa2, 0xb8, 0xe5, 0x87, 0x87, 0xdc, 0x01, 0xcb, - 0x6b, 0x97, 0x53, 0x45, 0xe0, 0x97, 0x1a, 0xdb, 0x9c, 0x31, 0xde, 0x90, 0x14, 0x46, 0x44, 0xab, - 0xdf, 0x02, 0xe0, 0x75, 0x41, 0x88, 0xbc, 0x96, 0x32, 0xe7, 0xa5, 0x54, 0x4e, 0x32, 0x35, 0x28, - 0x5e, 0x06, 0x23, 0x30, 0x4a, 0x54, 0xfd, 0xd4, 0x97, 0x00, 0x9a, 0x88, 0x5a, 0xfb, 0x26, 0x71, - 0x3e, 0x10, 0x81, 0x9b, 0x37, 0x4a, 0x1c, 0xb2, 0xeb, 0x7c, 0x80, 0xf5, 0x0b, 0x30, 0xe3, 0xe1, - 0x03, 0x6a, 0x06, 0xa8, 0x85, 0x4d, 0xea, 0xdf, 0xc3, 0x1e, 0xb7, 0xf2, 0x94, 0x31, 0xcd, 0xc0, - 0x6f, 0xa2, 0x16, 0xbe, 0xcd, 0x80, 0xec, 0x02, 0xa8, 0x0c, 0xea, 0x43, 0xaa, 0xfe, 0x15, 0xc8, - 0xf3, 0xcb, 0xa2, 0xa2, 0xad, 0x64, 0x87, 0x0a, 0xda, 0x57, 0x96, 0x09, 0x69, 0x05, 0x5d, 0x9a, - 0x14, 0x99, 0x34, 0x29, 0x3e, 0xca, 0x40, 0x8e, 0xd1, 0xb1, 0x5c, 0xd0, 0xf3, 0xf9, 0x28, 0x8d, - 0x4e, 0x46, 0xb0, 0x2d, 0x5b, 0x5f, 0x86, 0xc9, 0x28, 0xa4, 0x65, 0x3a, 0x28, 0x19, 0xa0, 0x40, - 0x5b, 0xb6, 0x3e, 0x0f, 0x85, 0xb0, 0xe3, 0xb1, 0x35, 0x91, 0x0e, 0xf2, 0x61, 0xc7, 0xdb, 0xb2, - 0xf5, 0x05, 0x98, 0xe0, 0xaa, 0x77, 0x6c, 0xae, 0xad, 0xac, 0x51, 0x60, 0x9f, 0x5b, 0xb6, 0xbe, - 0x01, 0x5c, 0xad, 0x26, 0x3d, 0x0c, 0x30, 0x57, 0x52, 0x79, 0xed, 0xc2, 0xf1, 0xc6, 0xbd, 0x7d, - 0x18, 0x60, 0xa3, 0x48, 0xe5, 0x2f, 0xfd, 0x1a, 0x94, 0xf6, 0x9c, 0x10, 0x9b, 0xac, 0x06, 0xad, - 0x14, 0xb8, 0x5d, 0xab, 0x0d, 0x51, 0x7f, 0x36, 0x54, 0xfd, 0xd9, 0xb8, 0xad, 0x0a, 0xd4, 0xeb, - 0xb9, 0x07, 0x9f, 0x2d, 0x6b, 0x46, 0x91, 0x91, 0x30, 0x20, 0x0b, 0x46, 0x59, 0xea, 0x55, 0x26, - 0xb8, 0x70, 0xea, 0xb3, 0xfe, 0x57, 0x0d, 0xe6, 0x0c, 0xdc, 0xf6, 0xbb, 0x98, 0x2b, 0xf6, 0xab, - 0x73, 0xd5, 0x98, 0xbe, 0xb2, 0x09, 0x7d, 0x6d, 0xc1, 0x4c, 0xd7, 0x21, 0x4e, 0xd3, 0x71, 0x1d, - 0x7a, 0x28, 0x0e, 0x9c, 0x1b, 0xf3, 0xc0, 0xe5, 0x1e, 0x21, 0x5b, 0x62, 0x39, 0x23, 0x7e, 0x36, - 0x99, 0x33, 0x7e, 0x91, 0x85, 0x67, 0x36, 0x31, 0x1d, 0x4c, 0xc3, 0xe8, 0xbe, 0x74, 0xd3, 0x3b, - 0x6b, 0xb1, 0xcb, 0x23, 0xe1, 0x30, 0xa5, 0x41, 0x87, 0x79, 0x54, 0x05, 0x80, 0x7e, 0x1e, 0xca, - 0x84, 0xa2, 0x90, 0x9a, 0xb8, 0x8b, 0x3d, 0xda, 0x53, 0xcc, 0x14, 0x87, 0xde, 0x64, 0xc0, 0x2d, - 0x5b, 0x6f, 0xc0, 0xe9, 0x38, 0x96, 0x32, 0xab, 0xf0, 0xb9, 0xb9, 0x1e, 0xea, 0x1d, 0xb1, 0xa0, - 0xaf, 0xc0, 0x14, 0xf6, 0xec, 0x1e, 0xcf, 0x3c, 0x47, 0x04, 0xec, 0xd9, 0x8a, 0xe3, 0x65, 0x98, - 0xeb, 0x61, 0x28, 0x7e, 0x05, 0x8e, 0x36, 0xa3, 0xd0, 0x14, 0xb7, 0xcb, 0x30, 0xd7, 0x46, 0x07, - 0x4e, 0xbb, 0xd3, 0x16, 0x41, 0xc7, 0xb3, 0xc3, 0x04, 0xf7, 0x90, 0x19, 0xb9, 0xc0, 0xc2, 0x6e, - 0x58, 0x8e, 0x28, 0xa6, 0x44, 0xe7, 0x6b, 0xb9, 0xa2, 0x36, 0x9b, 0xa9, 0xff, 0x2a, 0x03, 0x17, - 0x8f, 0xb7, 0x8a, 0xcc, 0x1c, 0x29, 0xac, 0xb5, 0x14, 0xd6, 0xcc, 0x97, 0x54, 0x5d, 0xc4, 0x73, - 0x17, 0x16, 0xd7, 0xe0, 0xe4, 0xda, 0xca, 0x30, 0x0b, 0xdd, 0x40, 0x14, 0x5d, 0x77, 0xfd, 0xa6, - 0x51, 0x96, 0x84, 0xd7, 0x05, 0x9d, 0x7e, 0x17, 0x66, 0xa4, 0x6e, 0x4c, 0xb9, 0x22, 0xf3, 0x6b, - 0xe3, 0xb8, 0xfc, 0x2a, 0x75, 0x27, 0x4f, 0x61, 0x94, 0xbb, 0x89, 0x6f, 0xfd, 0x22, 0xcc, 0x2a, - 0x19, 0x3d, 0xdf, 0xc6, 0xfc, 0xae, 0xce, 0xad, 0x64, 0x2f, 0x66, 0x23, 0x11, 0x5e, 0xf7, 0x6d, - 0xbc, 0x65, 0x93, 0xfa, 0x03, 0x0d, 0x96, 0x36, 0x31, 0x35, 0x7a, 0x2d, 0xc5, 0x8e, 0x68, 0x27, - 0xa2, 0x2b, 0x66, 0x1b, 0x0a, 0x5c, 0x1b, 0x2a, 0xa5, 0xa6, 0x5f, 0xe5, 0xb1, 0x9e, 0x84, 0xc9, - 0x17, 0xe3, 0xc7, 0xb5, 0x66, 0x48, 0x1e, 0xcc, 0xf9, 0x55, 0xf7, 0xc1, 0x1c, 0x5e, 0x55, 0x95, - 0x12, 0xc6, 0x6a, 0x80, 0xfa, 0xc7, 0x19, 0xa8, 0x0d, 0x13, 0x49, 0xda, 0xea, 0x7b, 0x50, 0x16, - 0xb9, 0x44, 0xf6, 0x3e, 0x4a, 0xb6, 0x3b, 0x63, 0xa5, 0xfb, 0xd1, 0xcc, 0xc5, 0x25, 0xac, 0xa0, - 0x37, 0x3d, 0x1a, 0x1e, 0x1a, 0xa2, 0x2e, 0x52, 0xb0, 0xea, 0x21, 0xe8, 0x83, 0x48, 0xfa, 0x2c, - 0x64, 0xef, 0xe1, 0x43, 0x99, 0xdb, 0xd8, 0x4f, 0x7d, 0x07, 0xf2, 0x5d, 0xe4, 0x76, 0xb0, 0x0c, - 0xe1, 0x17, 0x4e, 0xa8, 0xb9, 0x48, 0x32, 0xc1, 0xe5, 0xa5, 0xcc, 0x55, 0xad, 0xfe, 0x47, 0x0d, - 0x2e, 0x6c, 0x62, 0x1a, 0x15, 0x4b, 0x23, 0x0c, 0xf7, 0x22, 0x9c, 0x73, 0x11, 0x1f, 0x54, 0xd0, - 0xd0, 0xc1, 0x5d, 0x1c, 0x69, 0x4b, 0x65, 0xe0, 0xac, 0x71, 0x96, 0x21, 0x18, 0x6a, 0x5d, 0x32, - 0xd8, 0xb2, 0x23, 0xd2, 0x20, 0xf4, 0x2d, 0x4c, 0x48, 0x92, 0x34, 0xd3, 0x23, 0x7d, 0x53, 0xad, - 0xf7, 0x48, 0xfb, 0x0d, 0x9c, 0x1d, 0x34, 0xf0, 0xf7, 0x79, 0xae, 0x1c, 0x7d, 0x04, 0x69, 0xe8, - 0x5d, 0x28, 0xc6, 0x4c, 0xfc, 0x50, 0x4a, 0x8c, 0x18, 0xd5, 0x3f, 0x80, 0x95, 0x4d, 0x4c, 0x6f, - 0x6c, 0xbf, 0x35, 0x42, 0x79, 0x77, 0x64, 0xd5, 0xc3, 0x2a, 0x38, 0xe5, 0x5d, 0x27, 0xdd, 0x9a, - 0xdd, 0x10, 0xa2, 0x98, 0xa3, 0xf2, 0x17, 0xa9, 0xff, 0x44, 0x83, 0x27, 0x47, 0x6c, 0x2e, 0x8f, - 0xfd, 0x1e, 0xcc, 0xc5, 0xd8, 0x9a, 0xf1, 0x8a, 0xe6, 0xf9, 0xff, 0x42, 0x08, 0x63, 0x36, 0x4c, - 0x02, 0x48, 0xfd, 0x2f, 0x1a, 0x9c, 0x31, 0x30, 0x0a, 0x02, 0xf7, 0x90, 0x27, 0x63, 0x32, 0xec, - 0x76, 0xca, 0x0d, 0xde, 0x4e, 0xe9, 0x1d, 0x4a, 0xe6, 0xe1, 0x3b, 0x14, 0xfd, 0x2a, 0x14, 0xf8, - 0x95, 0x41, 0x64, 0x1e, 0x3c, 0x3e, 0xa5, 0x4a, 0x7c, 0x99, 0xf0, 0x17, 0x60, 0xbe, 0xef, 0x50, - 0xf2, 0x7e, 0xfe, 0x7b, 0x06, 0xaa, 0xeb, 0xb6, 0xbd, 0x8b, 0x51, 0x68, 0xed, 0xaf, 0x53, 0x1a, - 0x3a, 0xcd, 0x0e, 0xed, 0x59, 0xfb, 0x47, 0x1a, 0xcc, 0x11, 0xbe, 0x66, 0xa2, 0x68, 0x51, 0x2a, - 0xfc, 0xed, 0xb1, 0x72, 0xca, 0x70, 0xe6, 0x8d, 0x7e, 0xb8, 0x48, 0x29, 0xb3, 0xa4, 0x0f, 0xcc, - 0xca, 0x63, 0xc7, 0xb3, 0xf1, 0x41, 0x3c, 0x31, 0x96, 0x38, 0x84, 0x85, 0x8a, 0xfe, 0x2c, 0xe8, - 0xe4, 0x9e, 0x13, 0x98, 0xc4, 0xda, 0xc7, 0x6d, 0x64, 0x76, 0x02, 0x5b, 0xf5, 0xda, 0x45, 0x63, - 0x96, 0xad, 0xec, 0xf2, 0x85, 0xb7, 0x39, 0xbc, 0xea, 0xc2, 0x7c, 0xea, 0xbe, 0xf1, 0x2c, 0x55, - 0x12, 0x59, 0xea, 0x5a, 0x3c, 0x4b, 0x95, 0xd7, 0x9e, 0x49, 0xea, 0x3c, 0xaa, 0xb9, 0xb6, 0x98, - 0x24, 0xd8, 0xbe, 0xc3, 0x50, 0x79, 0x25, 0x19, 0xcb, 0x4a, 0x4b, 0xb0, 0x98, 0xaa, 0x00, 0xa9, - 0xfd, 0x7b, 0xb0, 0x24, 0x6a, 0xa6, 0x61, 0xfa, 0xff, 0xbf, 0x61, 0xea, 0x2f, 0x9d, 0x58, 0x4f, - 0xf5, 0x15, 0xa8, 0x0d, 0xdb, 0x4c, 0x8a, 0xf3, 0x32, 0x54, 0x59, 0xcb, 0x36, 0x44, 0x96, 0x24, - 0x7b, 0xad, 0x9f, 0xfd, 0xc7, 0x05, 0x58, 0x4c, 0xa5, 0x96, 0xa1, 0xfb, 0xa1, 0x06, 0x73, 0x56, - 0x87, 0x50, 0xbf, 0x3d, 0xe8, 0x4a, 0x63, 0x5f, 0x4f, 0xc3, 0xb8, 0x37, 0x36, 0x38, 0xe7, 0x01, - 0x5f, 0xb2, 0xfa, 0xc0, 0x5c, 0x0a, 0x72, 0x48, 0x28, 0x4e, 0x48, 0x91, 0x79, 0x44, 0x52, 0xec, - 0x72, 0xce, 0x83, 0x1e, 0xdd, 0x07, 0xd6, 0x5b, 0x30, 0xd1, 0x46, 0x41, 0xe0, 0x78, 0xad, 0x4a, - 0x96, 0x6f, 0xbd, 0xf3, 0xd0, 0x5b, 0xef, 0x08, 0x7e, 0x62, 0x47, 0xc5, 0x5d, 0xf7, 0x60, 0x11, - 0xd9, 0xb6, 0x39, 0x98, 0x95, 0x44, 0x07, 0x2e, 0x6a, 0xfd, 0xd5, 0xa4, 0x63, 0x2b, 0xe4, 0xd4, - 0xe4, 0xc4, 0xd3, 0x76, 0x05, 0xd9, 0x76, 0xea, 0x0a, 0x8b, 0xae, 0x54, 0x4b, 0x3c, 0x96, 0xe8, - 0xe2, 0xb1, 0x9c, 0xa6, 0xf1, 0xc7, 0xb3, 0xdb, 0x4b, 0x30, 0x15, 0x57, 0x72, 0xca, 0x26, 0x67, - 0xe2, 0x9b, 0x94, 0xe2, 0x79, 0xe0, 0x65, 0x38, 0xab, 0x06, 0x4c, 0x1b, 0xe2, 0xc2, 0x8f, 0x5d, - 0x2b, 0x89, 0xb2, 0x40, 0x1b, 0x2c, 0x0b, 0x7e, 0x53, 0x80, 0x85, 0x01, 0x6a, 0x19, 0x55, 0x3f, - 0x80, 0x39, 0xd2, 0x09, 0x02, 0x3f, 0xa4, 0xd8, 0x36, 0x2d, 0xd7, 0xe1, 0x77, 0x84, 0x08, 0x2a, - 0x63, 0x2c, 0x9f, 0x1a, 0xc2, 0xb8, 0xb1, 0xab, 0xb8, 0x6e, 0x08, 0xa6, 0xca, 0x95, 0xfb, 0xc0, - 0xfa, 0xd3, 0x50, 0x16, 0xdc, 0xa3, 0x6e, 0x46, 0x1c, 0x7e, 0x5a, 0x40, 0x55, 0x2f, 0x73, 0x17, - 0x66, 0xda, 0xb8, 0xdd, 0xc4, 0x21, 0xd9, 0x77, 0x02, 0xe1, 0x7c, 0xa3, 0x2a, 0x7a, 0xf5, 0xe6, - 0xd0, 0xbd, 0xd2, 0xd8, 0x89, 0xc8, 0xc4, 0xe8, 0xab, 0x9d, 0xf8, 0x66, 0x59, 0x49, 0xe9, 0x2f, - 0xba, 0x94, 0x4b, 0x12, 0x92, 0x52, 0x75, 0xe5, 0x07, 0xd4, 0xcb, 0x9a, 0x3c, 0xd5, 0x13, 0x88, - 0xda, 0xd9, 0xf2, 0x3b, 0x1e, 0xe5, 0x4d, 0x59, 0xde, 0x98, 0x93, 0x4b, 0xbc, 0xac, 0xdd, 0x60, - 0x0b, 0x2c, 0x27, 0xc7, 0xa6, 0x53, 0x26, 0x5b, 0x16, 0x6d, 0x59, 0xc9, 0x98, 0x8d, 0x2d, 0xec, - 0x32, 0xb8, 0x7e, 0x09, 0x66, 0x63, 0x0d, 0xb6, 0xc0, 0x2d, 0x72, 0xdc, 0x58, 0xe3, 0x2d, 0x50, - 0x37, 0x61, 0x4a, 0x35, 0x3d, 0x5c, 0x3f, 0x25, 0xae, 0x9f, 0xf3, 0x49, 0x4f, 0x95, 0x18, 0xb1, - 0x56, 0x87, 0x6b, 0x65, 0xb2, 0xdb, 0xfb, 0xd0, 0xbf, 0x0d, 0xd5, 0x3d, 0xe4, 0xb8, 0x7e, 0xcc, - 0x28, 0xa6, 0xe3, 0x59, 0x21, 0x6e, 0x63, 0x8f, 0x56, 0x80, 0x57, 0xa9, 0x15, 0x85, 0x11, 0x71, - 0x91, 0xeb, 0xfa, 0x55, 0xa8, 0x38, 0x9e, 0x43, 0x1d, 0xe4, 0x9a, 0xfd, 0x5c, 0x2a, 0x93, 0xa2, - 0xc2, 0x95, 0xeb, 0xaf, 0x26, 0x59, 0xe8, 0xd7, 0x60, 0xd1, 0x21, 0x66, 0xcb, 0xf5, 0x9b, 0xc8, - 0x35, 0x7b, 0xb5, 0x12, 0xf6, 0x50, 0xd3, 0xc5, 0x76, 0x65, 0x8a, 0xdf, 0xc8, 0x15, 0x87, 0x6c, - 0x72, 0x8c, 0xa8, 0xcc, 0xbd, 0x29, 0xd6, 0xab, 0x1b, 0x30, 0x9f, 0xea, 0x74, 0x27, 0x0a, 0xb4, - 0x77, 0xe0, 0xf4, 0xb6, 0x43, 0xa8, 0xf4, 0xe6, 0xe8, 0xee, 0x5a, 0x84, 0x52, 0xaf, 0x85, 0x16, - 0x8d, 0x48, 0x31, 0x18, 0xd1, 0x3b, 0xa7, 0x4e, 0xb6, 0x7e, 0xae, 0xc1, 0x99, 0x24, 0x73, 0x19, - 0x84, 0x6f, 0x40, 0x51, 0x3a, 0xd4, 0xe8, 0x62, 0xb4, 0x6f, 0xa8, 0x29, 0xf9, 0xec, 0xc8, 0xc7, - 0x26, 0x23, 0x62, 0x32, 0xb6, 0x44, 0xbf, 0xd4, 0x60, 0x79, 0xdd, 0xb6, 0xdf, 0x08, 0x45, 0x71, - 0xc3, 0xae, 0x77, 0xda, 0x9f, 0x60, 0x2e, 0xc1, 0xec, 0x5e, 0xe8, 0x7b, 0x14, 0x7b, 0x76, 0xdf, - 0x58, 0x7e, 0x46, 0xc1, 0xd5, 0x68, 0x7e, 0x13, 0x56, 0x84, 0xb1, 0xcc, 0x90, 0x73, 0x32, 0x55, - 0xe8, 0x58, 0xbe, 0xe7, 0x61, 0x2b, 0xaa, 0x66, 0x8b, 0xc6, 0x92, 0xc0, 0x4b, 0x6c, 0xb8, 0x11, - 0x21, 0xd5, 0xeb, 0xb0, 0x32, 0x5c, 0x2c, 0x59, 0x6c, 0xbc, 0x02, 0x55, 0x51, 0x8e, 0xa4, 0x4a, - 0x3d, 0x46, 0x5a, 0xe4, 0x2f, 0x4d, 0x29, 0x0c, 0x7a, 0x93, 0xa7, 0x73, 0x31, 0x6b, 0xc9, 0x34, - 0xa2, 0xf8, 0xef, 0xc2, 0x3c, 0x6f, 0xe4, 0xf6, 0x31, 0x0a, 0x69, 0x13, 0x23, 0x6a, 0xde, 0x77, - 0xe8, 0xbe, 0xe3, 0xc9, 0x66, 0xea, 0xdc, 0xc0, 0xf8, 0xeb, 0x86, 0x7c, 0x6f, 0xbe, 0x9e, 0xfb, - 0xe8, 0xb3, 0x65, 0xcd, 0x38, 0xcd, 0xa8, 0x6f, 0x29, 0xe2, 0xbb, 0x9c, 0x56, 0x5f, 0x86, 0xc9, - 0x30, 0xb0, 0x22, 0x2d, 0xcb, 0x71, 0x66, 0x18, 0x58, 0x4a, 0xc1, 0x0b, 0x30, 0xc1, 0x9f, 0x47, - 0xa2, 0x79, 0x66, 0x81, 0x7d, 0xf2, 0xb9, 0x65, 0x2e, 0xf4, 0x5d, 0x31, 0x7c, 0x2b, 0xc7, 0x2f, - 0xe4, 0xb4, 0x21, 0x5f, 0xe2, 0x44, 0x86, 0xef, 0x62, 0x83, 0x13, 0xeb, 0xef, 0x42, 0x95, 0x60, - 0xc2, 0xc3, 0x9d, 0x8f, 0xa6, 0xb0, 0x6d, 0xa2, 0x3d, 0xa6, 0x41, 0x3e, 0xd7, 0xcb, 0x8f, 0x39, - 0xd7, 0x5b, 0x90, 0x3c, 0x76, 0x05, 0x8b, 0x75, 0xc6, 0x81, 0xcf, 0x35, 0x13, 0x31, 0x54, 0x38, - 0x3e, 0x86, 0x26, 0xd2, 0x3c, 0xf6, 0x63, 0x0d, 0xaa, 0x69, 0x56, 0x91, 0x91, 0x74, 0x1b, 0xca, - 0xc8, 0xa2, 0x4e, 0x17, 0x9b, 0x32, 0xcd, 0xcb, 0x78, 0x7a, 0xee, 0xb8, 0x5b, 0x22, 0xa9, 0x93, - 0x69, 0xc1, 0x44, 0x72, 0x1f, 0x3b, 0x9c, 0x7e, 0x97, 0x81, 0x79, 0xd1, 0x83, 0xf6, 0x77, 0xbd, - 0x37, 0x21, 0xc7, 0x47, 0xca, 0x1a, 0xb7, 0xcf, 0x95, 0xd1, 0xf6, 0xb9, 0x81, 0x91, 0xbd, 0x8d, - 0x29, 0xc5, 0xe1, 0x5b, 0x1d, 0x2c, 0xeb, 0x08, 0x4e, 0x3e, 0xea, 0xed, 0x8b, 0xdd, 0xa3, 0x7e, - 0x27, 0xb4, 0xa2, 0xa0, 0x93, 0x1e, 0x32, 0x2d, 0xa0, 0xf2, 0x7c, 0xfa, 0x0b, 0x2c, 0x3b, 0x33, - 0x0c, 0xa6, 0x23, 0x16, 0xd2, 0xb1, 0xf9, 0x83, 0x18, 0x4b, 0xce, 0x47, 0xeb, 0x37, 0xbd, 0xd8, - 0xf8, 0x21, 0x75, 0x98, 0x98, 0x1f, 0x7b, 0x98, 0x58, 0x48, 0xd3, 0xd7, 0xbf, 0x35, 0x38, 0xdb, - 0xaf, 0x2f, 0x69, 0xc8, 0x47, 0xa4, 0xb0, 0xd4, 0x7e, 0x3f, 0xf3, 0x08, 0xfb, 0xfd, 0xb4, 0xb3, - 0x66, 0xd3, 0xce, 0xfa, 0x37, 0x0d, 0x16, 0xde, 0xec, 0x84, 0x2d, 0xfc, 0x75, 0xf4, 0x8e, 0x7a, - 0x15, 0x2a, 0x83, 0x87, 0x93, 0x89, 0xf4, 0xf7, 0x19, 0x58, 0xd8, 0xc1, 0x5f, 0xd3, 0x93, 0x3f, - 0x96, 0xb8, 0xb8, 0x0e, 0x95, 0x41, 0x85, 0x9d, 0x6c, 0x9a, 0xce, 0x8a, 0x8d, 0x45, 0x03, 0xef, - 0x85, 0x98, 0xec, 0xab, 0x56, 0x2b, 0xf1, 0xc0, 0xd9, 0x3f, 0x8e, 0xca, 0x3e, 0xbe, 0xc7, 0x12, - 0x39, 0x43, 0xaa, 0xc1, 0x13, 0xe9, 0x02, 0xf5, 0xfc, 0x64, 0xc9, 0xc0, 0x04, 0x7b, 0x76, 0x5f, - 0xd4, 0x0d, 0x95, 0xf9, 0x11, 0xbe, 0x08, 0x3e, 0x0d, 0xe5, 0x64, 0xcd, 0x22, 0x5b, 0x81, 0xe9, - 0x30, 0x5e, 0x1c, 0xa4, 0x3c, 0xfb, 0xe4, 0x53, 0x9e, 0x7d, 0x9e, 0x82, 0x69, 0x81, 0x95, 0x7c, - 0xa0, 0x11, 0x48, 0xc3, 0xde, 0x7a, 0x26, 0x06, 0xde, 0x7a, 0x96, 0x61, 0x92, 0x61, 0x28, 0x26, - 0xc5, 0x08, 0x41, 0xb2, 0x10, 0x13, 0x99, 0x74, 0x85, 0x49, 0x9d, 0xfe, 0x36, 0x03, 0x95, 0x4d, - 0x4c, 0x19, 0x50, 0xc4, 0x4c, 0x5c, 0x9d, 0xa3, 0xff, 0x2b, 0xb3, 0x24, 0x07, 0xb5, 0xfc, 0x6f, - 0x6b, 0x6a, 0x1a, 0x44, 0x15, 0x23, 0x7d, 0x1b, 0x66, 0x7a, 0xcb, 0xe2, 0xbd, 0x34, 0xcb, 0x83, - 0xf8, 0xfc, 0x90, 0xd6, 0xb8, 0x27, 0x03, 0x8b, 0xdb, 0x69, 0x1a, 0xff, 0xd4, 0x6b, 0x30, 0xd9, - 0x76, 0x44, 0x7e, 0xee, 0x45, 0x5c, 0xa9, 0xed, 0x88, 0x51, 0xaf, 0xcd, 0xd7, 0xd1, 0x41, 0xb4, - 0x9e, 0x97, 0xeb, 0xe8, 0x40, 0xae, 0x27, 0x5f, 0xc0, 0x0b, 0x63, 0xbc, 0x80, 0xa7, 0x56, 0x17, - 0x0f, 0x34, 0x38, 0x97, 0xa2, 0x2e, 0x19, 0x7a, 0xdf, 0x49, 0x3e, 0x81, 0x7f, 0x73, 0x9c, 0x1a, - 0x7d, 0xdd, 0x75, 0x7d, 0x0b, 0x51, 0x6c, 0x47, 0x33, 0xeb, 0x13, 0x3e, 0x87, 0xff, 0x54, 0x83, - 0xda, 0x0d, 0xec, 0x62, 0x8a, 0x07, 0x43, 0xec, 0xab, 0xfd, 0xcf, 0xd3, 0x35, 0x58, 0x1e, 0x2a, - 0x88, 0xd4, 0x50, 0x15, 0x8a, 0xf7, 0x51, 0xe8, 0x39, 0x5e, 0x4b, 0x4d, 0x19, 0xa3, 0xef, 0xeb, - 0xee, 0x27, 0x9f, 0xd7, 0x4e, 0x7d, 0xfa, 0x79, 0xed, 0xd4, 0x97, 0x9f, 0xd7, 0xb4, 0x1f, 0x1e, - 0xd5, 0xb4, 0x5f, 0x1f, 0xd5, 0xb4, 0x3f, 0x1d, 0xd5, 0xb4, 0x4f, 0x8e, 0x6a, 0xda, 0x3f, 0x8f, - 0x6a, 0xda, 0xbf, 0x8e, 0x6a, 0xa7, 0xbe, 0x3c, 0xaa, 0x69, 0x0f, 0xbe, 0xa8, 0x9d, 0xfa, 0xe4, - 0x8b, 0xda, 0xa9, 0x4f, 0xbf, 0xa8, 0x9d, 0x7a, 0xe7, 0x5b, 0x2d, 0xbf, 0x27, 0xac, 0xe3, 0x8f, - 0xf8, 0xff, 0xe8, 0xcb, 0xf1, 0xef, 0x66, 0x81, 0xd7, 0xa7, 0xcf, 0xff, 0x27, 0x00, 0x00, 0xff, - 0xff, 0x14, 0xfe, 0x56, 0xf5, 0x7a, 0x2a, 0x00, 0x00, + // 2998 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x3a, 0x4d, 0x6c, 0x1b, 0xc7, + 0xd5, 0x5e, 0xfe, 0x89, 0x7c, 0x92, 0x28, 0x69, 0x6d, 0x59, 0x34, 0x15, 0x51, 0x0a, 0xe3, 0x38, + 0xb6, 0xbf, 0x84, 0xfa, 0xac, 0xb4, 0x8d, 0x93, 0xd4, 0x08, 0x64, 0xd9, 0x91, 0x95, 0x4a, 0xf9, + 0x59, 0x39, 0x76, 0x1b, 0x20, 0xd8, 0x0c, 0x77, 0x47, 0xd4, 0xc2, 0xcb, 0xdd, 0xcd, 0xce, 0x90, + 0xb6, 0x02, 0xf4, 0x07, 0x4d, 0x8b, 0xa2, 0x87, 0xa2, 0x06, 0x8a, 0x02, 0x41, 0x4e, 0x3d, 0xb6, + 0x40, 0x8b, 0xde, 0x7a, 0xef, 0xad, 0xc7, 0xa0, 0xbd, 0x04, 0x2d, 0xd0, 0x34, 0xf2, 0xa5, 0xbd, + 0xe5, 0xdc, 0x53, 0x31, 0x7f, 0xcb, 0x5d, 0x72, 0x49, 0x51, 0xb5, 0x9d, 0x02, 0xb9, 0x71, 0xdf, + 0xbc, 0xf7, 0xe6, 0xcd, 0xfb, 0x9b, 0xf7, 0xde, 0x10, 0x5e, 0xa2, 0xb8, 0x1d, 0xf8, 0x21, 0x72, + 0x57, 0x09, 0x0e, 0xbb, 0x38, 0x5c, 0x45, 0x81, 0xb3, 0x8a, 0xec, 0xb6, 0xe3, 0xb1, 0x6f, 0xc7, + 0xc2, 0xab, 0xdd, 0x4b, 0xab, 0x21, 0x7e, 0xbf, 0x83, 0x09, 0x35, 0x43, 0x4c, 0x02, 0xdf, 0x23, + 0xb8, 0x11, 0x84, 0x3e, 0xf5, 0xf5, 0xa7, 0x14, 0x6d, 0x43, 0xd0, 0x36, 0x50, 0xe0, 0x34, 0xe2, + 0xb4, 0x8d, 0xee, 0xa5, 0xea, 0x72, 0xcb, 0xf7, 0x5b, 0x2e, 0x5e, 0xe5, 0x24, 0xcd, 0xce, 0xde, + 0x2a, 0x75, 0xda, 0x98, 0x50, 0xd4, 0x0e, 0x04, 0x97, 0x6a, 0xad, 0x1f, 0xc1, 0xee, 0x84, 0x88, + 0x3a, 0xbe, 0x27, 0xd7, 0x9f, 0xb4, 0x71, 0x80, 0x3d, 0x1b, 0x7b, 0x96, 0x83, 0xc9, 0x6a, 0xcb, + 0x6f, 0xf9, 0x1c, 0xce, 0x7f, 0x49, 0x94, 0x7a, 0x74, 0x08, 0x26, 0x3d, 0xf6, 0x3a, 0x6d, 0xc2, + 0xc4, 0xb6, 0xfc, 0x76, 0x3b, 0x62, 0x73, 0x2e, 0x1d, 0x87, 0x22, 0x72, 0xc7, 0x7c, 0xbf, 0x83, + 0x3b, 0xf2, 0x50, 0xd5, 0xb3, 0x09, 0x3c, 0xc1, 0x82, 0x21, 0xb6, 0x31, 0x21, 0xa8, 0xa5, 0xb0, + 0x9e, 0x4e, 0x60, 0x75, 0x71, 0x48, 0x9c, 0x34, 0xb4, 0xe4, 0xa6, 0x77, 0xfd, 0xf0, 0xce, 0x9e, + 0xeb, 0xdf, 0x1d, 0xc4, 0x7b, 0x36, 0xcd, 0x0a, 0x96, 0xdb, 0x21, 0x14, 0x87, 0x83, 0xd8, 0x17, + 0xd2, 0xb0, 0xd3, 0x4f, 0x7d, 0x71, 0x34, 0xaa, 0xd8, 0x41, 0xe2, 0x3e, 0x33, 0x12, 0x97, 0x29, + 0x6a, 0x94, 0xb4, 0xfb, 0x0e, 0xa1, 0x7e, 0x78, 0x30, 0x28, 0x6d, 0x23, 0x0d, 0xdb, 0x43, 0x6d, + 0x4c, 0x02, 0x24, 0xdc, 0x2b, 0x89, 0xff, 0xff, 0x69, 0xf8, 0x21, 0x0e, 0x5c, 0xc7, 0xe2, 0x6e, + 0x31, 0x48, 0xf1, 0x62, 0x1a, 0x45, 0xc0, 0x6c, 0x42, 0x28, 0xf6, 0xc4, 0x1e, 0xf2, 0xa8, 0x66, + 0x1b, 0x53, 0x64, 0x23, 0x8a, 0x24, 0xe9, 0xf3, 0x63, 0x90, 0xe2, 0x7b, 0xd8, 0xea, 0xb0, 0x9d, + 0x89, 0x24, 0x7a, 0x65, 0x0c, 0x22, 0x65, 0x6b, 0xb3, 0xdd, 0xa1, 0xa8, 0xe9, 0x62, 0x93, 0x50, + 0x44, 0x47, 0xaa, 0xa4, 0x8f, 0x01, 0xd3, 0xb7, 0xdc, 0xb0, 0xfe, 0xa1, 0x06, 0x55, 0x03, 0x37, + 0x3b, 0x8e, 0x6b, 0xef, 0x08, 0x76, 0xbb, 0x8c, 0x9b, 0x21, 0xc2, 0x52, 0x7f, 0x02, 0x4a, 0x91, + 0x3e, 0x2b, 0xda, 0x8a, 0x76, 0xbe, 0x64, 0xf4, 0x00, 0xfa, 0x26, 0x94, 0xa2, 0x13, 0x54, 0x32, + 0x2b, 0xda, 0xf9, 0xc9, 0xb5, 0x0b, 0x91, 0x00, 0x3c, 0x64, 0xa5, 0xc7, 0x74, 0x2f, 0x35, 0x6e, + 0x4b, 0xa9, 0xaf, 0x2b, 0x02, 0xa3, 0x47, 0x5b, 0x5f, 0x82, 0xc5, 0x54, 0x21, 0x44, 0x4e, 0xa8, + 0xff, 0x48, 0x83, 0xc5, 0x6b, 0x98, 0x58, 0xa1, 0xd3, 0xc4, 0xff, 0x43, 0x29, 0xff, 0x90, 0x81, + 0x27, 0xd2, 0xc5, 0x10, 0x72, 0xea, 0x67, 0xa0, 0x48, 0xf6, 0x51, 0x68, 0x9b, 0x8e, 0x2d, 0xc5, + 0x98, 0xe0, 0xdf, 0x5b, 0xb6, 0xfe, 0x24, 0x4c, 0x49, 0x37, 0x36, 0x91, 0x6d, 0x87, 0x5c, 0x8e, + 0x92, 0x31, 0x29, 0x61, 0xeb, 0xb6, 0x1d, 0xea, 0xfb, 0x70, 0xd2, 0x42, 0xd6, 0x3e, 0x4e, 0xda, + 0xb5, 0x92, 0xe5, 0x12, 0x5f, 0x6e, 0xa4, 0x65, 0xc4, 0x98, 0x61, 0xe3, 0xd2, 0x27, 0x84, 0x9b, + 0xe3, 0x4c, 0xe3, 0x20, 0xdd, 0x83, 0xd3, 0xcc, 0x51, 0x9b, 0x88, 0xf4, 0x6f, 0x96, 0x7b, 0xc8, + 0xcd, 0x4e, 0x29, 0xbe, 0x71, 0x68, 0xfd, 0xcf, 0x1a, 0x54, 0x95, 0xe2, 0x6e, 0x88, 0x13, 0xdf, + 0xf0, 0x09, 0x55, 0xe6, 0x63, 0xba, 0xf1, 0x09, 0xe5, 0x8a, 0xc1, 0x84, 0x48, 0xd5, 0x4d, 0x32, + 0xd8, 0xba, 0x00, 0x25, 0x34, 0xcb, 0x54, 0x97, 0xef, 0x69, 0x36, 0x61, 0xfc, 0x6c, 0xbf, 0xf1, + 0xbf, 0x0d, 0x7a, 0x14, 0x2f, 0x3d, 0x2f, 0xc8, 0x1d, 0xd7, 0x0b, 0xe6, 0xee, 0xf6, 0x83, 0xea, + 0x7f, 0x8f, 0x39, 0x65, 0xe2, 0x50, 0xd2, 0x19, 0x9e, 0x82, 0x69, 0x2e, 0x22, 0x31, 0xbd, 0x4e, + 0xbb, 0x89, 0x43, 0x7e, 0xac, 0xbc, 0x31, 0x25, 0x80, 0xaf, 0x73, 0x98, 0xbe, 0x08, 0x25, 0x75, + 0x2e, 0x52, 0xc9, 0xac, 0x64, 0xcf, 0xe7, 0x8d, 0xa2, 0x3c, 0x18, 0xd1, 0xdf, 0x85, 0x99, 0xe8, + 0x20, 0x26, 0xb7, 0xa2, 0x74, 0x86, 0xaf, 0xa5, 0xda, 0x27, 0xc2, 0x65, 0x47, 0x78, 0x5d, 0x7d, + 0x6c, 0x30, 0xba, 0x2d, 0x6f, 0xcf, 0x37, 0xca, 0x5e, 0x02, 0xa6, 0x57, 0x60, 0x42, 0x69, 0x3c, + 0x2f, 0x9c, 0x55, 0x7e, 0xbe, 0x96, 0x2b, 0xe6, 0x66, 0xf3, 0xf5, 0x06, 0xcc, 0x6d, 0xb8, 0x3e, + 0xc1, 0xbb, 0x4c, 0x1e, 0x65, 0xab, 0x7e, 0x17, 0xef, 0x19, 0xa2, 0x7e, 0x0a, 0xf4, 0x38, 0xbe, + 0x8c, 0xdd, 0x67, 0x61, 0x66, 0x13, 0xd3, 0x71, 0x79, 0xbc, 0x07, 0xb3, 0x3d, 0x6c, 0xa9, 0xc8, + 0x6d, 0x00, 0x89, 0xee, 0xed, 0xf9, 0x9c, 0x60, 0x72, 0xed, 0xb9, 0x71, 0x3c, 0x94, 0xb3, 0xe1, + 0x47, 0x17, 0x4a, 0x66, 0x3f, 0xeb, 0x3f, 0xcb, 0xc0, 0xc2, 0xb6, 0x43, 0xa8, 0x34, 0xd9, 0x4d, + 0x96, 0x0b, 0x8f, 0x16, 0x4c, 0x7f, 0x15, 0x8a, 0x16, 0xa2, 0xb8, 0xe5, 0x87, 0x07, 0xdc, 0x01, + 0xcb, 0x6b, 0x17, 0x53, 0x45, 0xe0, 0x97, 0x1a, 0xdb, 0x9c, 0x31, 0xde, 0x90, 0x14, 0x46, 0x44, + 0xab, 0xdf, 0x00, 0xe0, 0x75, 0x41, 0x88, 0xbc, 0x96, 0x32, 0xe7, 0x85, 0x54, 0x4e, 0x32, 0x35, + 0x28, 0x5e, 0x06, 0x23, 0x30, 0x4a, 0x54, 0xfd, 0xd4, 0x97, 0x00, 0x9a, 0x88, 0x5a, 0xfb, 0x26, + 0x71, 0x3e, 0x10, 0x81, 0x9b, 0x37, 0x4a, 0x1c, 0xb2, 0xeb, 0x7c, 0x80, 0xf5, 0x73, 0x30, 0xe3, + 0xe1, 0x7b, 0xd4, 0x0c, 0x50, 0x0b, 0x9b, 0xd4, 0xbf, 0x83, 0x3d, 0x6e, 0xe5, 0x29, 0x63, 0x9a, + 0x81, 0xdf, 0x44, 0x2d, 0x7c, 0x93, 0x01, 0xd9, 0x05, 0x50, 0x19, 0xd4, 0x87, 0x54, 0xfd, 0x2b, + 0x90, 0xe7, 0x97, 0x45, 0x45, 0x5b, 0xc9, 0x0e, 0x15, 0xb4, 0xaf, 0x2c, 0x13, 0xd2, 0x0a, 0xba, + 0x34, 0x29, 0x32, 0x69, 0x52, 0x7c, 0x94, 0x81, 0x1c, 0xa3, 0x63, 0xb9, 0xa0, 0xe7, 0xf3, 0x51, + 0x1a, 0x9d, 0x8c, 0x60, 0x5b, 0xb6, 0xbe, 0x0c, 0x93, 0x51, 0x48, 0xcb, 0x74, 0x50, 0x32, 0x40, + 0x81, 0xb6, 0x6c, 0x7d, 0x1e, 0x0a, 0x61, 0xc7, 0x63, 0x6b, 0x22, 0x1d, 0xe4, 0xc3, 0x8e, 0xb7, + 0x65, 0xeb, 0x0b, 0x30, 0xc1, 0x55, 0xef, 0xd8, 0x5c, 0x5b, 0x59, 0xa3, 0xc0, 0x3e, 0xb7, 0x6c, + 0x7d, 0x03, 0xb8, 0x5a, 0x4d, 0x7a, 0x10, 0x60, 0xae, 0xa4, 0xf2, 0xda, 0xb9, 0xa3, 0x8d, 0x7b, + 0xf3, 0x20, 0xc0, 0x46, 0x91, 0xca, 0x5f, 0xfa, 0x15, 0x28, 0xed, 0x39, 0x21, 0x36, 0x59, 0x0d, + 0x5a, 0x29, 0x70, 0xbb, 0x56, 0x1b, 0xa2, 0xfe, 0x6c, 0xa8, 0xfa, 0xb3, 0x71, 0x53, 0x15, 0xa8, + 0x57, 0x73, 0xf7, 0x3f, 0x5b, 0xd6, 0x8c, 0x22, 0x23, 0x61, 0x40, 0x16, 0x8c, 0xb2, 0xd4, 0xab, + 0x4c, 0x70, 0xe1, 0xd4, 0x67, 0xfd, 0xaf, 0x1a, 0xcc, 0x19, 0xb8, 0xed, 0x77, 0x31, 0x57, 0xec, + 0x97, 0xe7, 0xaa, 0x31, 0x7d, 0x65, 0x13, 0xfa, 0xda, 0x82, 0x99, 0xae, 0x43, 0x9c, 0xa6, 0xe3, + 0x3a, 0xf4, 0x40, 0x1c, 0x38, 0x37, 0xe6, 0x81, 0xcb, 0x3d, 0x42, 0xb6, 0xc4, 0x72, 0x46, 0xfc, + 0x6c, 0x32, 0x67, 0xfc, 0x22, 0x0b, 0xcf, 0x6c, 0x62, 0x3a, 0x98, 0x86, 0xd1, 0x5d, 0xe9, 0xa6, + 0xb7, 0xd6, 0x62, 0x97, 0x47, 0xc2, 0x61, 0x4a, 0x83, 0x0e, 0xf3, 0xa8, 0x0a, 0x00, 0xfd, 0x2c, + 0x94, 0x09, 0x45, 0x21, 0x35, 0x71, 0x17, 0x7b, 0xb4, 0xa7, 0x98, 0x29, 0x0e, 0xbd, 0xce, 0x80, + 0x5b, 0xb6, 0xde, 0x80, 0x93, 0x71, 0x2c, 0x65, 0x56, 0xe1, 0x73, 0x73, 0x3d, 0xd4, 0x5b, 0x62, + 0x41, 0x5f, 0x81, 0x29, 0xec, 0xd9, 0x3d, 0x9e, 0x79, 0x8e, 0x08, 0xd8, 0xb3, 0x15, 0xc7, 0x8b, + 0x30, 0xd7, 0xc3, 0x50, 0xfc, 0x0a, 0x1c, 0x6d, 0x46, 0xa1, 0x29, 0x6e, 0x17, 0x61, 0xae, 0x8d, + 0xee, 0x39, 0xed, 0x4e, 0x5b, 0x04, 0x1d, 0xcf, 0x0e, 0x13, 0xdc, 0x43, 0x66, 0xe4, 0x02, 0x0b, + 0xbb, 0x61, 0x39, 0xa2, 0x98, 0x12, 0x9d, 0xaf, 0xe5, 0x8a, 0xda, 0x6c, 0xa6, 0xfe, 0xab, 0x0c, + 0x9c, 0x3f, 0xda, 0x2a, 0x32, 0x73, 0xa4, 0xb0, 0xd6, 0x52, 0x58, 0x33, 0x5f, 0x52, 0x75, 0x11, + 0xcf, 0x5d, 0x58, 0x5c, 0x83, 0x93, 0x6b, 0x2b, 0xc3, 0x2c, 0x74, 0x0d, 0x51, 0x74, 0xd5, 0xf5, + 0x9b, 0x46, 0x59, 0x12, 0x5e, 0x15, 0x74, 0xfa, 0x6d, 0x98, 0x91, 0xba, 0x31, 0xe5, 0x8a, 0xcc, + 0xaf, 0x8d, 0xa3, 0xf2, 0xab, 0xd4, 0x9d, 0x3c, 0x85, 0x51, 0xee, 0x26, 0xbe, 0xf5, 0xf3, 0x30, + 0xab, 0x64, 0xf4, 0x7c, 0x1b, 0xf3, 0xbb, 0x3a, 0xb7, 0x92, 0x3d, 0x9f, 0x8d, 0x44, 0x78, 0xdd, + 0xb7, 0xf1, 0x96, 0x4d, 0xea, 0xf7, 0x35, 0x58, 0xda, 0xc4, 0xd4, 0xe8, 0xb5, 0x14, 0x3b, 0xa2, + 0x9d, 0x88, 0xae, 0x98, 0x6d, 0x28, 0x70, 0x6d, 0xa8, 0x94, 0x9a, 0x7e, 0x95, 0xc7, 0x7a, 0x12, + 0x26, 0x5f, 0x8c, 0x1f, 0xd7, 0x9a, 0x21, 0x79, 0x30, 0xe7, 0x57, 0xdd, 0x07, 0x73, 0x78, 0x55, + 0x55, 0x4a, 0x18, 0xab, 0x01, 0xea, 0x1f, 0x67, 0xa0, 0x36, 0x4c, 0x24, 0x69, 0xab, 0xef, 0x42, + 0x59, 0xe4, 0x12, 0xd9, 0xfb, 0x28, 0xd9, 0x6e, 0x8d, 0x95, 0xee, 0x47, 0x33, 0x17, 0x97, 0xb0, + 0x82, 0x5e, 0xf7, 0x68, 0x78, 0x60, 0x88, 0xba, 0x48, 0xc1, 0xaa, 0x07, 0xa0, 0x0f, 0x22, 0xe9, + 0xb3, 0x90, 0xbd, 0x83, 0x0f, 0x64, 0x6e, 0x63, 0x3f, 0xf5, 0x1d, 0xc8, 0x77, 0x91, 0xdb, 0xc1, + 0x32, 0x84, 0x5f, 0x38, 0xa6, 0xe6, 0x22, 0xc9, 0x04, 0x97, 0x97, 0x32, 0x97, 0xb5, 0xfa, 0x1f, + 0x35, 0x38, 0xb7, 0x89, 0x69, 0x54, 0x2c, 0x8d, 0x30, 0xdc, 0x8b, 0x70, 0xc6, 0x45, 0x7c, 0x50, + 0x41, 0x43, 0x07, 0x77, 0x71, 0xa4, 0x2d, 0x95, 0x81, 0xb3, 0xc6, 0x69, 0x86, 0x60, 0xa8, 0x75, + 0xc9, 0x60, 0xcb, 0x8e, 0x48, 0x83, 0xd0, 0xb7, 0x30, 0x21, 0x49, 0xd2, 0x4c, 0x8f, 0xf4, 0x4d, + 0xb5, 0xde, 0x23, 0xed, 0x37, 0x70, 0x76, 0xd0, 0xc0, 0xdf, 0xe3, 0xb9, 0x72, 0xf4, 0x11, 0xa4, + 0xa1, 0x77, 0xa1, 0x18, 0x33, 0xf1, 0x43, 0x29, 0x31, 0x62, 0x54, 0xff, 0x00, 0x56, 0x36, 0x31, + 0xbd, 0xb6, 0xfd, 0xd6, 0x08, 0xe5, 0xdd, 0x92, 0x55, 0x0f, 0xab, 0xe0, 0x94, 0x77, 0x1d, 0x77, + 0x6b, 0x76, 0x43, 0x88, 0x62, 0x8e, 0xca, 0x5f, 0xa4, 0xfe, 0x63, 0x0d, 0x9e, 0x1c, 0xb1, 0xb9, + 0x3c, 0xf6, 0x7b, 0x30, 0x17, 0x63, 0x6b, 0xc6, 0x2b, 0x9a, 0xe7, 0xff, 0x0b, 0x21, 0x8c, 0xd9, + 0x30, 0x09, 0x20, 0xf5, 0xbf, 0x68, 0x70, 0xca, 0xc0, 0x28, 0x08, 0xdc, 0x03, 0x9e, 0x8c, 0xc9, + 0xb0, 0xdb, 0x29, 0x37, 0x78, 0x3b, 0xa5, 0x77, 0x28, 0x99, 0x87, 0xef, 0x50, 0xf4, 0xcb, 0x50, + 0xe0, 0x57, 0x06, 0x91, 0x79, 0xf0, 0xe8, 0x94, 0x2a, 0xf1, 0x65, 0xc2, 0x5f, 0x80, 0xf9, 0xbe, + 0x43, 0xc9, 0xfb, 0xf9, 0xdf, 0x19, 0xa8, 0xae, 0xdb, 0xf6, 0x2e, 0x46, 0xa1, 0xb5, 0xbf, 0x4e, + 0x69, 0xe8, 0x34, 0x3b, 0xb4, 0x67, 0xed, 0x1f, 0x6a, 0x30, 0x47, 0xf8, 0x9a, 0x89, 0xa2, 0x45, + 0xa9, 0xf0, 0xb7, 0xc7, 0xca, 0x29, 0xc3, 0x99, 0x37, 0xfa, 0xe1, 0x22, 0xa5, 0xcc, 0x92, 0x3e, + 0x30, 0x2b, 0x8f, 0x1d, 0xcf, 0xc6, 0xf7, 0xe2, 0x89, 0xb1, 0xc4, 0x21, 0x2c, 0x54, 0xf4, 0x67, + 0x41, 0x27, 0x77, 0x9c, 0xc0, 0x24, 0xd6, 0x3e, 0x6e, 0x23, 0xb3, 0x13, 0xd8, 0xaa, 0xd7, 0x2e, + 0x1a, 0xb3, 0x6c, 0x65, 0x97, 0x2f, 0xbc, 0xcd, 0xe1, 0xc9, 0x1e, 0x33, 0xd7, 0xd7, 0x63, 0x56, + 0x5d, 0x98, 0x4f, 0x95, 0x2a, 0x9e, 0xc3, 0x4a, 0x22, 0x87, 0x5d, 0x89, 0xe7, 0xb0, 0xf2, 0xda, + 0x33, 0x49, 0x8b, 0x44, 0x15, 0xd9, 0x16, 0x93, 0x13, 0xdb, 0xb7, 0x18, 0x2a, 0xaf, 0x33, 0x63, + 0x39, 0x6b, 0x09, 0x16, 0x53, 0xd5, 0x23, 0x6d, 0xf3, 0x53, 0x0d, 0x96, 0x44, 0x49, 0x35, 0xcc, + 0x3c, 0xff, 0x37, 0xcc, 0x3a, 0xa5, 0xe3, 0xab, 0x71, 0xa4, 0x62, 0xea, 0x2b, 0x50, 0x1b, 0x26, + 0x8a, 0x94, 0xf6, 0x3b, 0x50, 0x65, 0xfd, 0xde, 0x10, 0x49, 0x93, 0x9b, 0x6b, 0xc7, 0xdb, 0xfc, + 0xe3, 0x02, 0x2c, 0xa6, 0xf2, 0x96, 0x59, 0xe1, 0x43, 0x0d, 0xe6, 0xac, 0x0e, 0xa1, 0x7e, 0x7b, + 0xd0, 0x4b, 0xc7, 0xbe, 0xf9, 0x86, 0x71, 0x6f, 0x6c, 0x70, 0xce, 0x03, 0x6e, 0x6a, 0xf5, 0x81, + 0xb9, 0x14, 0xe4, 0x80, 0x50, 0x9c, 0x90, 0x22, 0xf3, 0x88, 0xa4, 0xd8, 0xe5, 0x9c, 0x07, 0x83, + 0xa5, 0x0f, 0xac, 0xb7, 0x60, 0xa2, 0x8d, 0x82, 0xc0, 0xf1, 0x5a, 0x95, 0x2c, 0xdf, 0x7a, 0xe7, + 0xa1, 0xb7, 0xde, 0x11, 0xfc, 0xc4, 0x8e, 0x8a, 0xbb, 0xee, 0xc1, 0x22, 0xb2, 0x6d, 0x73, 0x30, + 0xe1, 0x89, 0xe6, 0x5e, 0xb4, 0x11, 0xab, 0xc9, 0xa8, 0x50, 0xc8, 0xa9, 0x79, 0x8f, 0xdf, 0x08, + 0x15, 0x64, 0xdb, 0xa9, 0x2b, 0x2c, 0x34, 0x53, 0x2d, 0xf1, 0x58, 0x42, 0x93, 0x27, 0x82, 0x34, + 0x8d, 0x3f, 0x9e, 0xdd, 0x5e, 0x82, 0xa9, 0xb8, 0x92, 0x53, 0x36, 0x39, 0x15, 0xdf, 0xa4, 0x14, + 0x4f, 0x22, 0x2f, 0xc3, 0x69, 0x35, 0xbb, 0xda, 0x10, 0xb5, 0x44, 0xec, 0xc6, 0x4a, 0x54, 0x1c, + 0xda, 0x60, 0xc5, 0xf1, 0x9b, 0x02, 0x2c, 0x0c, 0x50, 0xcb, 0xa8, 0xfa, 0x3e, 0xcc, 0x91, 0x4e, + 0x10, 0xf8, 0x21, 0xc5, 0xb6, 0x69, 0xb9, 0x0e, 0xbf, 0x7e, 0x44, 0x50, 0x19, 0x63, 0xf9, 0xd4, + 0x10, 0xc6, 0x8d, 0x5d, 0xc5, 0x75, 0x43, 0x30, 0x55, 0xae, 0xdc, 0x07, 0xd6, 0x9f, 0x86, 0xb2, + 0xe0, 0x1e, 0x35, 0x4a, 0xe2, 0xf0, 0xd3, 0x02, 0xaa, 0xda, 0xa4, 0xdb, 0x30, 0xd3, 0xc6, 0xed, + 0x26, 0x0e, 0xc9, 0xbe, 0x13, 0x08, 0xe7, 0x1b, 0xd5, 0x2c, 0xa8, 0xe7, 0x8c, 0xee, 0xa5, 0xc6, + 0x4e, 0x44, 0x26, 0xa6, 0x6a, 0xed, 0xc4, 0x37, 0xcb, 0x59, 0x4a, 0x7f, 0xd1, 0x7d, 0x5f, 0x92, + 0x90, 0x94, 0x82, 0x2e, 0x3f, 0xa0, 0x5e, 0xd6, 0x3f, 0xaa, 0x76, 0x43, 0x94, 0xe5, 0x96, 0xdf, + 0xf1, 0x28, 0xef, 0xf7, 0xf2, 0xc6, 0x9c, 0x5c, 0xe2, 0x15, 0xf3, 0x06, 0x5b, 0x60, 0xf9, 0x3c, + 0x36, 0xf8, 0x32, 0xd9, 0xb2, 0xe8, 0xf8, 0x4a, 0xc6, 0x6c, 0x6c, 0x61, 0x97, 0xc1, 0xf5, 0x0b, + 0x30, 0x1b, 0xeb, 0xdd, 0x05, 0x6e, 0x91, 0xe3, 0xc6, 0x7a, 0x7a, 0x81, 0xba, 0x09, 0x53, 0xaa, + 0x9f, 0xe2, 0xfa, 0x29, 0x71, 0xfd, 0x9c, 0x4d, 0x7a, 0xaa, 0xc4, 0x88, 0x75, 0x51, 0x5c, 0x2b, + 0x93, 0xdd, 0xde, 0x87, 0xfe, 0x4d, 0xa8, 0xee, 0x21, 0xc7, 0xf5, 0x63, 0x46, 0x31, 0x1d, 0xcf, + 0x0a, 0x71, 0x1b, 0x7b, 0xb4, 0x02, 0xbc, 0x00, 0xae, 0x28, 0x8c, 0x88, 0x8b, 0x5c, 0xd7, 0x2f, + 0x43, 0xc5, 0xf1, 0x1c, 0xea, 0x20, 0xd7, 0xec, 0xe7, 0x52, 0x99, 0x14, 0xc5, 0xb3, 0x5c, 0x7f, + 0x35, 0xc9, 0x42, 0xbf, 0x02, 0x8b, 0x0e, 0x31, 0x5b, 0xae, 0xdf, 0x44, 0xae, 0xd9, 0x2b, 0xc3, + 0xb0, 0x87, 0x9a, 0x2e, 0xb6, 0x2b, 0x53, 0xfc, 0xb2, 0xaf, 0x38, 0x64, 0x93, 0x63, 0x44, 0x15, + 0xf4, 0x75, 0xb1, 0x5e, 0xdd, 0x80, 0xf9, 0x54, 0xa7, 0x3b, 0x56, 0xa0, 0xbd, 0x03, 0x27, 0xb7, + 0x1d, 0x42, 0xa5, 0x37, 0x47, 0x37, 0xdb, 0x22, 0x94, 0x7a, 0xdd, 0xb9, 0xe8, 0x71, 0x8a, 0xc1, + 0x88, 0xb6, 0x3c, 0x75, 0x68, 0xf6, 0x73, 0x0d, 0x4e, 0x25, 0x99, 0xcb, 0x20, 0x7c, 0x03, 0x8a, + 0xd2, 0xa1, 0x46, 0xd7, 0xb9, 0x7d, 0xf3, 0x52, 0xc9, 0x67, 0x47, 0xbe, 0x63, 0x19, 0x11, 0x93, + 0xb1, 0x25, 0xfa, 0xa5, 0x06, 0xcb, 0xeb, 0xb6, 0xfd, 0x46, 0x28, 0xea, 0x26, 0x76, 0xf9, 0xd3, + 0xfe, 0x04, 0x73, 0x01, 0x66, 0xf7, 0x42, 0xdf, 0xa3, 0xd8, 0xb3, 0xfb, 0x26, 0xfe, 0x33, 0x0a, + 0xae, 0xa6, 0xfe, 0x9b, 0xb0, 0x22, 0x8c, 0x65, 0x86, 0x9c, 0x93, 0xa9, 0x42, 0xc7, 0xf2, 0x3d, + 0x0f, 0x5b, 0x51, 0xa1, 0x5c, 0x34, 0x96, 0x04, 0x5e, 0x62, 0xc3, 0x8d, 0x08, 0xa9, 0x5e, 0x87, + 0x95, 0xe1, 0x62, 0xc9, 0x52, 0xe4, 0x15, 0xa8, 0x8a, 0x62, 0x25, 0x55, 0xea, 0x31, 0xd2, 0x22, + 0x7f, 0xc4, 0x4a, 0x61, 0xd0, 0x1b, 0x6a, 0x9d, 0x89, 0x59, 0x4b, 0xa6, 0x11, 0xc5, 0x7f, 0x17, + 0xe6, 0x79, 0x8f, 0xb8, 0x8f, 0x51, 0x48, 0x9b, 0x18, 0x51, 0xf3, 0xae, 0x43, 0xf7, 0x1d, 0x4f, + 0xf6, 0x69, 0x67, 0x06, 0x26, 0x6b, 0xd7, 0xe4, 0x53, 0xf6, 0xd5, 0xdc, 0x47, 0x9f, 0x2d, 0x6b, + 0xc6, 0x49, 0x46, 0x7d, 0x43, 0x11, 0xdf, 0xe6, 0xb4, 0xfa, 0x32, 0x4c, 0x86, 0x81, 0x15, 0x69, + 0x59, 0x4e, 0x4a, 0xc3, 0xc0, 0x52, 0x0a, 0x5e, 0x80, 0x09, 0xfe, 0xf2, 0x12, 0x8d, 0x4a, 0x0b, + 0xec, 0x93, 0x8f, 0x44, 0x73, 0xa1, 0xef, 0x8a, 0xaa, 0xaa, 0x1c, 0xbf, 0x90, 0xd3, 0xe6, 0x87, + 0x89, 0x13, 0x19, 0xbe, 0x8b, 0x0d, 0x4e, 0xac, 0xbf, 0x0b, 0x55, 0x82, 0x09, 0x0f, 0x77, 0x3e, + 0xf5, 0xc2, 0xb6, 0x89, 0xf6, 0x98, 0x06, 0xf9, 0xc8, 0x30, 0x3f, 0xe6, 0xc8, 0x70, 0x41, 0xf2, + 0xd8, 0x15, 0x2c, 0xd6, 0x19, 0x07, 0x3e, 0x32, 0x4d, 0xc4, 0x50, 0xe1, 0xe8, 0x18, 0x9a, 0x48, + 0xf3, 0xd8, 0x8f, 0x35, 0xa8, 0xa6, 0x59, 0x45, 0x46, 0xd2, 0x4d, 0x28, 0x23, 0x8b, 0x3a, 0x5d, + 0x6c, 0xca, 0x34, 0x2f, 0xe3, 0xe9, 0xb9, 0xa3, 0x6e, 0x89, 0xa4, 0x4e, 0xa6, 0x05, 0x13, 0xc9, + 0x7d, 0xec, 0x70, 0xfa, 0x5d, 0x06, 0xe6, 0x45, 0x7b, 0xdb, 0xdf, 0x50, 0x5f, 0x87, 0x1c, 0x9f, + 0x56, 0x6b, 0xdc, 0x3e, 0x97, 0x46, 0xdb, 0xe7, 0x1a, 0x46, 0xf6, 0x36, 0xa6, 0x14, 0x87, 0x6f, + 0x75, 0xb0, 0xac, 0x23, 0x38, 0xf9, 0xa8, 0x67, 0x35, 0x76, 0x8f, 0xfa, 0x9d, 0xd0, 0x8a, 0x82, + 0x4e, 0x7a, 0xc8, 0xb4, 0x80, 0xca, 0xf3, 0xe9, 0x2f, 0xb0, 0xec, 0xcc, 0x30, 0x98, 0x8e, 0x58, + 0x48, 0xc7, 0x46, 0x1b, 0x62, 0xe2, 0x39, 0x1f, 0xad, 0x5f, 0xf7, 0x62, 0x93, 0x8d, 0xd4, 0x39, + 0x65, 0x7e, 0xec, 0x39, 0x65, 0x21, 0x4d, 0x5f, 0xff, 0xd2, 0xe0, 0x74, 0xbf, 0xbe, 0xa4, 0x21, + 0x1f, 0x91, 0xc2, 0x52, 0x47, 0x09, 0x99, 0x47, 0x38, 0x4a, 0x48, 0x3b, 0x6b, 0x36, 0xed, 0xac, + 0x7f, 0xd3, 0x60, 0xe1, 0xcd, 0x4e, 0xd8, 0xc2, 0x5f, 0x45, 0xef, 0xa8, 0x57, 0xa1, 0x32, 0x78, + 0x38, 0x99, 0x48, 0x7f, 0x9f, 0x81, 0x85, 0x1d, 0xfc, 0x15, 0x3d, 0xf9, 0x63, 0x89, 0x8b, 0xab, + 0x50, 0x19, 0x54, 0xd8, 0xf1, 0x06, 0xf5, 0xac, 0xd8, 0x58, 0x34, 0xf0, 0x5e, 0x88, 0xc9, 0xbe, + 0x6a, 0xb5, 0x12, 0x6f, 0xa7, 0xfd, 0x93, 0xae, 0xec, 0xe3, 0x7b, 0x87, 0x91, 0xe3, 0xa9, 0x1a, + 0x3c, 0x91, 0x2e, 0x50, 0xcf, 0x4f, 0x96, 0x0c, 0x4c, 0xb0, 0x67, 0xf7, 0x45, 0xdd, 0x50, 0x99, + 0x1f, 0xe1, 0x63, 0xe3, 0xd3, 0x50, 0x4e, 0xd6, 0x2c, 0xb2, 0x15, 0x98, 0x0e, 0xe3, 0xc5, 0x41, + 0xca, 0x8b, 0x52, 0x3e, 0xe5, 0x45, 0xe9, 0x29, 0x98, 0x16, 0x58, 0xc9, 0xb7, 0x1f, 0x81, 0x34, + 0xec, 0x19, 0x69, 0x62, 0xe0, 0x19, 0x69, 0x19, 0x26, 0x19, 0x86, 0x62, 0x52, 0x8c, 0x10, 0x24, + 0x0b, 0x31, 0xaf, 0x49, 0x57, 0x98, 0xd4, 0xe9, 0x6f, 0x33, 0x50, 0xd9, 0xc4, 0x94, 0x01, 0x45, + 0xcc, 0xc4, 0xd5, 0x39, 0xfa, 0x6f, 0x38, 0x4b, 0x72, 0x06, 0xcc, 0xff, 0x11, 0xa7, 0x26, 0x49, + 0x54, 0x31, 0xd2, 0xb7, 0x61, 0xa6, 0xb7, 0x2c, 0x9e, 0x62, 0xb3, 0x3c, 0x88, 0xcf, 0x0e, 0x69, + 0x8d, 0x7b, 0x32, 0xb0, 0xb8, 0x9d, 0xa6, 0xf1, 0x4f, 0xbd, 0x06, 0x93, 0x6d, 0x47, 0xe4, 0xe7, + 0x5e, 0xc4, 0x95, 0xda, 0x8e, 0x98, 0x22, 0xdb, 0x7c, 0x1d, 0xdd, 0x8b, 0xd6, 0xf3, 0x72, 0x1d, + 0xdd, 0x93, 0xeb, 0xc9, 0xc7, 0xf5, 0xc2, 0x18, 0x8f, 0xeb, 0xa9, 0xd5, 0xc5, 0x7d, 0x0d, 0xce, + 0xa4, 0xa8, 0x4b, 0x86, 0xde, 0xb7, 0x92, 0xaf, 0xeb, 0x5f, 0x1f, 0xa7, 0x46, 0x5f, 0x77, 0x5d, + 0xdf, 0x42, 0x14, 0xdb, 0xd1, 0x38, 0xfc, 0x98, 0x2f, 0xed, 0x3f, 0xd1, 0xa0, 0x76, 0x0d, 0xbb, + 0x98, 0xe2, 0xc1, 0x10, 0xfb, 0x72, 0xff, 0x4e, 0x75, 0x05, 0x96, 0x87, 0x0a, 0x22, 0x35, 0x54, + 0x85, 0xe2, 0x5d, 0x14, 0x7a, 0x8e, 0xd7, 0x52, 0x13, 0xca, 0xe8, 0xfb, 0xaa, 0xfb, 0xc9, 0xe7, + 0xb5, 0x13, 0x9f, 0x7e, 0x5e, 0x3b, 0xf1, 0xc5, 0xe7, 0x35, 0xed, 0x07, 0x87, 0x35, 0xed, 0xd7, + 0x87, 0x35, 0xed, 0x4f, 0x87, 0x35, 0xed, 0x93, 0xc3, 0x9a, 0xf6, 0x8f, 0xc3, 0x9a, 0xf6, 0xcf, + 0xc3, 0xda, 0x89, 0x2f, 0x0e, 0x6b, 0xda, 0xfd, 0x07, 0xb5, 0x13, 0x9f, 0x3c, 0xa8, 0x9d, 0xf8, + 0xf4, 0x41, 0xed, 0xc4, 0x3b, 0xdf, 0x68, 0xf9, 0x3d, 0x61, 0x1d, 0x7f, 0xc4, 0x5f, 0x53, 0x5f, + 0x8e, 0x7f, 0x37, 0x0b, 0xbc, 0x3e, 0x7d, 0xfe, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa7, 0x2b, + 0xbb, 0xf1, 0xd5, 0x2a, 0x00, 0x00, } func (this *RebuildMutableStateRequest) Equal(that interface{}) bool { @@ -4198,6 +4223,9 @@ func (this *AddSearchAttributesRequest) Equal(that interface{}) bool { if this.SkipSchemaUpdate != that1.SkipSchemaUpdate { return false } + if this.Namespace != that1.Namespace { + return false + } return true } func (this *AddSearchAttributesResponse) Equal(that interface{}) bool { @@ -4251,6 +4279,9 @@ func (this *RemoveSearchAttributesRequest) Equal(that interface{}) bool { if this.IndexName != that1.IndexName { return false } + if this.Namespace != that1.Namespace { + return false + } return true } func (this *RemoveSearchAttributesResponse) Equal(that interface{}) bool { @@ -4296,6 +4327,9 @@ func (this *GetSearchAttributesRequest) Equal(that interface{}) bool { if this.IndexName != that1.IndexName { return false } + if this.Namespace != that1.Namespace { + return false + } return true } func (this *GetSearchAttributesResponse) Equal(that interface{}) bool { @@ -5441,7 +5475,7 @@ func (this *AddSearchAttributesRequest) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 7) + s := make([]string, 0, 8) s = append(s, "&adminservice.AddSearchAttributesRequest{") keysForSearchAttributes := make([]string, 0, len(this.SearchAttributes)) for k, _ := range this.SearchAttributes { @@ -5458,6 +5492,7 @@ func (this *AddSearchAttributesRequest) GoString() string { } s = append(s, "IndexName: "+fmt.Sprintf("%#v", this.IndexName)+",\n") s = append(s, "SkipSchemaUpdate: "+fmt.Sprintf("%#v", this.SkipSchemaUpdate)+",\n") + s = append(s, "Namespace: "+fmt.Sprintf("%#v", this.Namespace)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -5474,10 +5509,11 @@ func (this *RemoveSearchAttributesRequest) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 6) + s := make([]string, 0, 7) s = append(s, "&adminservice.RemoveSearchAttributesRequest{") s = append(s, "SearchAttributes: "+fmt.Sprintf("%#v", this.SearchAttributes)+",\n") s = append(s, "IndexName: "+fmt.Sprintf("%#v", this.IndexName)+",\n") + s = append(s, "Namespace: "+fmt.Sprintf("%#v", this.Namespace)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -5494,9 +5530,10 @@ func (this *GetSearchAttributesRequest) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 5) + s := make([]string, 0, 6) s = append(s, "&adminservice.GetSearchAttributesRequest{") s = append(s, "IndexName: "+fmt.Sprintf("%#v", this.IndexName)+",\n") + s = append(s, "Namespace: "+fmt.Sprintf("%#v", this.Namespace)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -7003,6 +7040,13 @@ func (m *AddSearchAttributesRequest) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l + if len(m.Namespace) > 0 { + i -= len(m.Namespace) + copy(dAtA[i:], m.Namespace) + i = encodeVarintRequestResponse(dAtA, i, uint64(len(m.Namespace))) + i-- + dAtA[i] = 0x22 + } if m.SkipSchemaUpdate { i-- if m.SkipSchemaUpdate { @@ -7083,6 +7127,13 @@ func (m *RemoveSearchAttributesRequest) MarshalToSizedBuffer(dAtA []byte) (int, _ = i var l int _ = l + if len(m.Namespace) > 0 { + i -= len(m.Namespace) + copy(dAtA[i:], m.Namespace) + i = encodeVarintRequestResponse(dAtA, i, uint64(len(m.Namespace))) + i-- + dAtA[i] = 0x22 + } if len(m.IndexName) > 0 { i -= len(m.IndexName) copy(dAtA[i:], m.IndexName) @@ -7145,6 +7196,13 @@ func (m *GetSearchAttributesRequest) MarshalToSizedBuffer(dAtA []byte) (int, err _ = i var l int _ = l + if len(m.Namespace) > 0 { + i -= len(m.Namespace) + copy(dAtA[i:], m.Namespace) + i = encodeVarintRequestResponse(dAtA, i, uint64(len(m.Namespace))) + i-- + dAtA[i] = 0x22 + } if len(m.IndexName) > 0 { i -= len(m.IndexName) copy(dAtA[i:], m.IndexName) @@ -8820,6 +8878,10 @@ func (m *AddSearchAttributesRequest) Size() (n int) { if m.SkipSchemaUpdate { n += 2 } + l = len(m.Namespace) + if l > 0 { + n += 1 + l + sovRequestResponse(uint64(l)) + } return n } @@ -8848,6 +8910,10 @@ func (m *RemoveSearchAttributesRequest) Size() (n int) { if l > 0 { n += 1 + l + sovRequestResponse(uint64(l)) } + l = len(m.Namespace) + if l > 0 { + n += 1 + l + sovRequestResponse(uint64(l)) + } return n } @@ -8870,6 +8936,10 @@ func (m *GetSearchAttributesRequest) Size() (n int) { if l > 0 { n += 1 + l + sovRequestResponse(uint64(l)) } + l = len(m.Namespace) + if l > 0 { + n += 1 + l + sovRequestResponse(uint64(l)) + } return n } @@ -9741,6 +9811,7 @@ func (this *AddSearchAttributesRequest) String() string { `SearchAttributes:` + mapStringForSearchAttributes + `,`, `IndexName:` + fmt.Sprintf("%v", this.IndexName) + `,`, `SkipSchemaUpdate:` + fmt.Sprintf("%v", this.SkipSchemaUpdate) + `,`, + `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `}`, }, "") return s @@ -9761,6 +9832,7 @@ func (this *RemoveSearchAttributesRequest) String() string { s := strings.Join([]string{`&RemoveSearchAttributesRequest{`, `SearchAttributes:` + fmt.Sprintf("%v", this.SearchAttributes) + `,`, `IndexName:` + fmt.Sprintf("%v", this.IndexName) + `,`, + `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `}`, }, "") return s @@ -9780,6 +9852,7 @@ func (this *GetSearchAttributesRequest) String() string { } s := strings.Join([]string{`&GetSearchAttributesRequest{`, `IndexName:` + fmt.Sprintf("%v", this.IndexName) + `,`, + `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `}`, }, "") return s @@ -13612,6 +13685,38 @@ func (m *AddSearchAttributesRequest) Unmarshal(dAtA []byte) error { } } m.SkipSchemaUpdate = bool(v != 0) + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRequestResponse + } + 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 ErrInvalidLengthRequestResponse + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRequestResponse + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Namespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRequestResponse(dAtA[iNdEx:]) @@ -13782,6 +13887,38 @@ func (m *RemoveSearchAttributesRequest) Unmarshal(dAtA []byte) error { } m.IndexName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRequestResponse + } + 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 ErrInvalidLengthRequestResponse + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRequestResponse + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Namespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRequestResponse(dAtA[iNdEx:]) @@ -13920,6 +14057,38 @@ func (m *GetSearchAttributesRequest) Unmarshal(dAtA []byte) error { } m.IndexName = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Namespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRequestResponse + } + 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 ErrInvalidLengthRequestResponse + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthRequestResponse + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Namespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipRequestResponse(dAtA[iNdEx:]) diff --git a/proto/internal/temporal/server/api/adminservice/v1/request_response.proto b/proto/internal/temporal/server/api/adminservice/v1/request_response.proto index 593d06d569f..dd987dbd570 100644 --- a/proto/internal/temporal/server/api/adminservice/v1/request_response.proto +++ b/proto/internal/temporal/server/api/adminservice/v1/request_response.proto @@ -200,6 +200,7 @@ message AddSearchAttributesRequest { map search_attributes = 1; string index_name = 2; bool skip_schema_update = 3; + string namespace = 4; } message AddSearchAttributesResponse { @@ -208,6 +209,7 @@ message AddSearchAttributesResponse { message RemoveSearchAttributesRequest { repeated string search_attributes = 1; string index_name = 2; + string namespace = 4; } message RemoveSearchAttributesResponse { @@ -215,6 +217,7 @@ message RemoveSearchAttributesResponse { message GetSearchAttributesRequest { string index_name = 1; + string namespace = 4; } message GetSearchAttributesResponse { @@ -371,4 +374,4 @@ message DeleteWorkflowExecutionRequest { message DeleteWorkflowExecutionResponse { repeated string warnings = 1; -} \ No newline at end of file +} diff --git a/service/frontend/adminHandler.go b/service/frontend/adminHandler.go index 92b0b5df842..1b9707ebbf7 100644 --- a/service/frontend/adminHandler.go +++ b/service/frontend/adminHandler.go @@ -35,13 +35,16 @@ import ( "go.temporal.io/server/common/clock" "go.temporal.io/server/common/primitives" + "go.temporal.io/server/common/util" "github.com/pborman/uuid" commonpb "go.temporal.io/api/common/v1" enumspb "go.temporal.io/api/enums/v1" historypb "go.temporal.io/api/history/v1" + namespacepb "go.temporal.io/api/namespace/v1" "go.temporal.io/api/serviceerror" workflowpb "go.temporal.io/api/workflow/v1" + "go.temporal.io/api/workflowservice/v1" sdkclient "go.temporal.io/sdk/client" "golang.org/x/exp/maps" "google.golang.org/grpc/health" @@ -57,6 +60,7 @@ import ( tokenspb "go.temporal.io/server/api/token/v1" serverClient "go.temporal.io/server/client" "go.temporal.io/server/client/admin" + "go.temporal.io/server/client/frontend" "go.temporal.io/server/common" "go.temporal.io/server/common/archiver" "go.temporal.io/server/common/archiver/provider" @@ -73,6 +77,7 @@ import ( "go.temporal.io/server/common/persistence/serialization" "go.temporal.io/server/common/persistence/versionhistory" "go.temporal.io/server/common/persistence/visibility/manager" + "go.temporal.io/server/common/persistence/visibility/store/elasticsearch" esclient "go.temporal.io/server/common/persistence/visibility/store/elasticsearch/client" "go.temporal.io/server/common/persistence/visibility/store/standard/cassandra" "go.temporal.io/server/common/primitives/timestamp" @@ -228,7 +233,10 @@ func (adh *AdminHandler) Stop() { } // AddSearchAttributes add search attribute to the cluster. -func (adh *AdminHandler) AddSearchAttributes(ctx context.Context, request *adminservice.AddSearchAttributesRequest) (_ *adminservice.AddSearchAttributesResponse, retError error) { +func (adh *AdminHandler) AddSearchAttributes( + ctx context.Context, + request *adminservice.AddSearchAttributesRequest, +) (_ *adminservice.AddSearchAttributesResponse, retError error) { defer log.CapturePanic(adh.logger, &retError) // validate request @@ -262,6 +270,23 @@ func (adh *AdminHandler) AddSearchAttributes(ctx context.Context, request *admin } } + if adh.visibilityMgr.GetName() == elasticsearch.PersistenceName { + err = adh.addSearchAttributesElasticsearch(ctx, request, indexName) + } else { + err = adh.addSearchAttributesSQL(ctx, request, currentSearchAttributes) + } + + if err != nil { + return nil, err + } + return &adminservice.AddSearchAttributesResponse{}, nil +} + +func (adh *AdminHandler) addSearchAttributesElasticsearch( + ctx context.Context, + request *adminservice.AddSearchAttributesRequest, + indexName string, +) error { // Execute workflow. wfParams := addsearchattributes.WorkflowParams{ CustomAttributesToAdd: request.GetSearchAttributes(), @@ -280,20 +305,88 @@ func (adh *AdminHandler) AddSearchAttributes(ctx context.Context, request *admin wfParams, ) if err != nil { - return nil, serviceerror.NewUnavailable(fmt.Sprintf(errUnableToStartWorkflowMessage, addsearchattributes.WorkflowName, err)) + return serviceerror.NewUnavailable( + fmt.Sprintf(errUnableToStartWorkflowMessage, addsearchattributes.WorkflowName, err), + ) } // Wait for workflow to complete. err = run.Get(ctx, nil) if err != nil { - return nil, serviceerror.NewUnavailable(fmt.Sprintf(errWorkflowReturnedErrorMessage, addsearchattributes.WorkflowName, err)) + return serviceerror.NewUnavailable( + fmt.Sprintf(errWorkflowReturnedErrorMessage, addsearchattributes.WorkflowName, err), + ) } + return nil +} - return &adminservice.AddSearchAttributesResponse{}, nil +func (adh *AdminHandler) addSearchAttributesSQL( + ctx context.Context, + request *adminservice.AddSearchAttributesRequest, + currentSearchAttributes searchattribute.NameTypeMap, +) error { + client, err := adh.clientFactory.NewLocalFrontendClientWithTimeout( + frontend.DefaultTimeout, + frontend.DefaultLongPollTimeout, + ) + if err != nil { + return serviceerror.NewUnavailable(fmt.Sprintf(errUnableToCreateFrontendClientMessage, err)) + } + + nsName := request.GetNamespace() + if nsName == "" { + return errNamespaceNotSet + } + ns, err := adh.namespaceRegistry.GetNamespace(namespace.Name(nsName)) + if err != nil { + return serviceerror.NewUnavailable(fmt.Sprintf(errUnableToGetNamespaceInfoMessage, nsName)) + } + + customSearchAttributes := currentSearchAttributes.Custom() + mapper := ns.CustomSearchAttributesMapper() + fieldToAliasMap := util.CloneMapNonNil(mapper.FieldToAliasMap()) + for saName, saType := range request.GetSearchAttributes() { + // check if alias is already in use + if _, err := mapper.GetFieldName(saName, nsName); err == nil { + return serviceerror.NewAlreadyExist( + fmt.Sprintf(errSearchAttributeAlreadyExistsMessage, saName), + ) + } + // find the first available field for the given type + targetFieldName := "" + cntUsed := 0 + for fieldName, fieldType := range customSearchAttributes { + if fieldType != saType { + continue + } + if _, ok := fieldToAliasMap[fieldName]; !ok { + targetFieldName = fieldName + break + } + cntUsed++ + } + if targetFieldName == "" { + return serviceerror.NewInvalidArgument( + fmt.Sprintf(errTooManySearchAttributesMessage, cntUsed, saType.String()), + ) + } + fieldToAliasMap[targetFieldName] = saName + } + + _, err = client.UpdateNamespace(ctx, &workflowservice.UpdateNamespaceRequest{ + Namespace: nsName, + Config: &namespacepb.NamespaceConfig{ + CustomSearchAttributeAliases: fieldToAliasMap, + }, + }) + return err } // RemoveSearchAttributes remove search attribute from the cluster. -func (adh *AdminHandler) RemoveSearchAttributes(ctx context.Context, request *adminservice.RemoveSearchAttributesRequest) (_ *adminservice.RemoveSearchAttributesResponse, retError error) { +func (adh *AdminHandler) RemoveSearchAttributes( + ctx context.Context, + request *adminservice.RemoveSearchAttributesRequest, +) (_ *adminservice.RemoveSearchAttributesResponse, retError error) { defer log.CapturePanic(adh.logger, &retError) // validate request @@ -310,32 +403,91 @@ func (adh *AdminHandler) RemoveSearchAttributes(ctx context.Context, request *ad indexName = adh.visibilityMgr.GetIndexName() } + var err error + if adh.visibilityMgr.GetName() == elasticsearch.PersistenceName { + err = adh.removeSearchAttributesElasticsearch(ctx, request, indexName) + } else { + err = adh.removeSearchAttributesSQL(ctx, request) + } + + if err != nil { + return nil, err + } + return &adminservice.RemoveSearchAttributesResponse{}, nil +} + +func (adh *AdminHandler) removeSearchAttributesElasticsearch( + ctx context.Context, + request *adminservice.RemoveSearchAttributesRequest, + indexName string, +) error { currentSearchAttributes, err := adh.saProvider.GetSearchAttributes(indexName, true) if err != nil { - return nil, serviceerror.NewUnavailable(fmt.Sprintf(errUnableToGetSearchAttributesMessage, err)) + return serviceerror.NewUnavailable(fmt.Sprintf(errUnableToGetSearchAttributesMessage, err)) } newCustomSearchAttributes := maps.Clone(currentSearchAttributes.Custom()) - for _, saName := range request.GetSearchAttributes() { if !currentSearchAttributes.IsDefined(saName) { - return nil, serviceerror.NewInvalidArgument(fmt.Sprintf(errSearchAttributeDoesntExistMessage, saName)) + return serviceerror.NewInvalidArgument(fmt.Sprintf(errSearchAttributeDoesntExistMessage, saName)) } if _, ok := newCustomSearchAttributes[saName]; !ok { - return nil, serviceerror.NewInvalidArgument(fmt.Sprintf(errUnableToRemoveNonCustomSearchAttributesMessage, saName)) + return serviceerror.NewInvalidArgument(fmt.Sprintf(errUnableToRemoveNonCustomSearchAttributesMessage, saName)) } delete(newCustomSearchAttributes, saName) } err = adh.saManager.SaveSearchAttributes(ctx, indexName, newCustomSearchAttributes) if err != nil { - return nil, serviceerror.NewUnavailable(fmt.Sprintf(errUnableToSaveSearchAttributesMessage, err)) + return serviceerror.NewUnavailable(fmt.Sprintf(errUnableToSaveSearchAttributesMessage, err)) } + return nil +} - return &adminservice.RemoveSearchAttributesResponse{}, nil +func (adh *AdminHandler) removeSearchAttributesSQL( + ctx context.Context, + request *adminservice.RemoveSearchAttributesRequest, +) error { + client, err := adh.clientFactory.NewLocalFrontendClientWithTimeout( + frontend.DefaultTimeout, + frontend.DefaultLongPollTimeout, + ) + if err != nil { + return serviceerror.NewUnavailable(fmt.Sprintf(errUnableToCreateFrontendClientMessage, err)) + } + + nsName := request.GetNamespace() + if nsName == "" { + return errNamespaceNotSet + } + ns, err := adh.namespaceRegistry.GetNamespace(namespace.Name(nsName)) + if err != nil { + return serviceerror.NewUnavailable(fmt.Sprintf(errUnableToGetNamespaceInfoMessage, nsName)) + } + + mapper := ns.CustomSearchAttributesMapper() + fieldToAliasMap := maps.Clone(mapper.FieldToAliasMap()) + for _, saName := range request.GetSearchAttributes() { + fieldName, err := mapper.GetFieldName(saName, nsName) + if err != nil { + return serviceerror.NewNotFound(fmt.Sprintf(errSearchAttributeDoesntExistMessage, saName)) + } + delete(fieldToAliasMap, fieldName) + } + + _, err = client.UpdateNamespace(ctx, &workflowservice.UpdateNamespaceRequest{ + Namespace: nsName, + Config: &namespacepb.NamespaceConfig{ + CustomSearchAttributeAliases: fieldToAliasMap, + }, + }) + return err } -func (adh *AdminHandler) GetSearchAttributes(ctx context.Context, request *adminservice.GetSearchAttributesRequest) (_ *adminservice.GetSearchAttributesResponse, retError error) { +func (adh *AdminHandler) GetSearchAttributes( + ctx context.Context, + request *adminservice.GetSearchAttributesRequest, +) (_ *adminservice.GetSearchAttributesResponse, retError error) { defer log.CapturePanic(adh.logger, &retError) if request == nil { @@ -347,19 +499,27 @@ func (adh *AdminHandler) GetSearchAttributes(ctx context.Context, request *admin indexName = adh.visibilityMgr.GetIndexName() } - resp, err := adh.getSearchAttributes(ctx, indexName, "") + searchAttributes, err := adh.saProvider.GetSearchAttributes(indexName, true) if err != nil { - return nil, err + adh.logger.Error("getSearchAttributes error", tag.Error(err)) + return nil, serviceerror.NewUnavailable(fmt.Sprintf(errUnableToGetSearchAttributesMessage, err)) } - return resp, nil + if adh.visibilityMgr.GetName() == elasticsearch.PersistenceName { + return adh.getSearchAttributesElasticsearch(ctx, indexName, searchAttributes) + } + return adh.getSearchAttributesSQL(request, searchAttributes) } -func (adh *AdminHandler) getSearchAttributes(ctx context.Context, indexName string, runID string) (*adminservice.GetSearchAttributesResponse, error) { +func (adh *AdminHandler) getSearchAttributesElasticsearch( + ctx context.Context, + indexName string, + searchAttributes searchattribute.NameTypeMap, +) (*adminservice.GetSearchAttributesResponse, error) { var lastErr error sdkClient := adh.sdkClientFactory.GetSystemClient() - descResp, err := sdkClient.DescribeWorkflowExecution(ctx, addsearchattributes.WorkflowName, runID) + descResp, err := sdkClient.DescribeWorkflowExecution(ctx, addsearchattributes.WorkflowName, "") var wfInfo *workflowpb.WorkflowExecutionInfo if err != nil { // NotFound can happen when no search attributes were added and the workflow has never been executed. @@ -380,18 +540,42 @@ func (adh *AdminHandler) getSearchAttributes(ctx context.Context, indexName stri } } - searchAttributes, err := adh.saProvider.GetSearchAttributes(indexName, true) - if err != nil { - lastErr = serviceerror.NewUnavailable(fmt.Sprintf("unable to read custom search attributes: %v", err)) - adh.logger.Error("getSearchAttributes error", tag.Error(lastErr)) + if lastErr != nil { + return nil, lastErr } - return &adminservice.GetSearchAttributesResponse{ CustomAttributes: searchAttributes.Custom(), SystemAttributes: searchAttributes.System(), Mapping: esMapping, AddWorkflowExecutionInfo: wfInfo, - }, lastErr + }, nil +} + +func (adh *AdminHandler) getSearchAttributesSQL( + request *adminservice.GetSearchAttributesRequest, + searchAttributes searchattribute.NameTypeMap, +) (*adminservice.GetSearchAttributesResponse, error) { + nsName := request.GetNamespace() + if nsName == "" { + return nil, errNamespaceNotSet + } + ns, err := adh.namespaceRegistry.GetNamespace(namespace.Name(nsName)) + if err != nil { + return nil, serviceerror.NewUnavailable( + fmt.Sprintf(errUnableToGetNamespaceInfoMessage, nsName), + ) + } + mapper := ns.CustomSearchAttributesMapper() + customSearchAttributes := make(map[string]enumspb.IndexedValueType) + for field, tp := range searchAttributes.Custom() { + if alias, err := mapper.GetAlias(field, nsName); err == nil { + customSearchAttributes[alias] = tp + } + } + return &adminservice.GetSearchAttributesResponse{ + CustomAttributes: customSearchAttributes, + SystemAttributes: searchAttributes.System(), + }, nil } func (adh *AdminHandler) RebuildMutableState(ctx context.Context, request *adminservice.RebuildMutableStateRequest) (_ *adminservice.RebuildMutableStateResponse, retError error) { diff --git a/service/frontend/adminHandler_test.go b/service/frontend/adminHandler_test.go index f774fc098be..c685191532c 100644 --- a/service/frontend/adminHandler_test.go +++ b/service/frontend/adminHandler_test.go @@ -67,6 +67,7 @@ import ( "go.temporal.io/server/common/persistence/serialization" "go.temporal.io/server/common/persistence/versionhistory" "go.temporal.io/server/common/persistence/visibility/manager" + "go.temporal.io/server/common/persistence/visibility/store/elasticsearch" "go.temporal.io/server/common/searchattribute" ) @@ -552,6 +553,7 @@ func (s *adminHandlerSuite) Test_AddSearchAttributes() { mockSdkClient := mocksdk.NewMockClient(s.controller) s.mockResource.SDKClientFactory.EXPECT().GetSystemClient().Return(mockSdkClient).AnyTimes() + s.mockVisibilityMgr.EXPECT().GetName().Return(elasticsearch.PersistenceName).AnyTimes() // Start workflow failed. mockSdkClient.EXPECT().ExecuteWorkflow(gomock.Any(), gomock.Any(), "temporal-sys-add-search-attributes-workflow", gomock.Any()).Return(nil, errors.New("start failed")) @@ -601,15 +603,17 @@ func (s *adminHandlerSuite) Test_GetSearchAttributes_EmptyIndexName() { mockSdkClient := mocksdk.NewMockClient(s.controller) s.mockResource.SDKClientFactory.EXPECT().GetSystemClient().Return(mockSdkClient).AnyTimes() + s.mockNamespaceCache.EXPECT().GetNamespace(s.namespace).Return(s.namespaceEntry, nil).AnyTimes() // Elasticsearch is not configured + s.mockVisibilityMgr.EXPECT().GetName().Return(elasticsearch.PersistenceName).AnyTimes() s.mockVisibilityMgr.EXPECT().GetIndexName().Return("").AnyTimes() mockSdkClient.EXPECT().DescribeWorkflowExecution(gomock.Any(), "temporal-sys-add-search-attributes-workflow", "").Return( &workflowservice.DescribeWorkflowExecutionResponse{}, nil) s.mockResource.ESClient.EXPECT().GetMapping(gomock.Any(), "").Return(map[string]string{"col": "type"}, nil) s.mockResource.SearchAttributesProvider.EXPECT().GetSearchAttributes("", true).Return(searchattribute.TestNameTypeMap, nil).AnyTimes() - resp, err = handler.GetSearchAttributes(ctx, &adminservice.GetSearchAttributesRequest{}) + resp, err = handler.GetSearchAttributes(ctx, &adminservice.GetSearchAttributesRequest{Namespace: s.namespace.String()}) s.NoError(err) s.NotNil(resp) } @@ -622,6 +626,7 @@ func (s *adminHandlerSuite) Test_GetSearchAttributes_NonEmptyIndexName() { s.mockResource.SDKClientFactory.EXPECT().GetSystemClient().Return(mockSdkClient).AnyTimes() // Configure Elasticsearch: add advanced visibility store config with index name. + s.mockVisibilityMgr.EXPECT().GetName().Return(elasticsearch.PersistenceName).AnyTimes() s.mockVisibilityMgr.EXPECT().GetIndexName().Return("random-index-name").AnyTimes() mockSdkClient.EXPECT().DescribeWorkflowExecution(gomock.Any(), "temporal-sys-add-search-attributes-workflow", "").Return( @@ -644,7 +649,7 @@ func (s *adminHandlerSuite) Test_GetSearchAttributes_NonEmptyIndexName() { nil, errors.New("random error")) s.mockResource.ESClient.EXPECT().GetMapping(gomock.Any(), "random-index-name").Return(map[string]string{"col": "type"}, nil) s.mockResource.SearchAttributesProvider.EXPECT().GetSearchAttributes("random-index-name", true).Return(searchattribute.TestNameTypeMap, nil).AnyTimes() - resp, err = handler.GetSearchAttributes(ctx, &adminservice.GetSearchAttributesRequest{}) + resp, err = handler.GetSearchAttributes(ctx, &adminservice.GetSearchAttributesRequest{Namespace: s.namespace.String()}) s.Error(err) s.Nil(resp) } @@ -680,6 +685,7 @@ func (s *adminHandlerSuite) Test_RemoveSearchAttributes_EmptyIndexName() { } // Elasticsearch is not configured + s.mockVisibilityMgr.EXPECT().GetName().Return(elasticsearch.PersistenceName).AnyTimes() s.mockVisibilityMgr.EXPECT().GetIndexName().Return("").AnyTimes() s.mockResource.SearchAttributesProvider.EXPECT().GetSearchAttributes("", true).Return(searchattribute.TestNameTypeMap, nil).AnyTimes() testCases2 := []test{ @@ -742,6 +748,7 @@ func (s *adminHandlerSuite) Test_RemoveSearchAttributes_NonEmptyIndexName() { } // Configure Elasticsearch: add advanced visibility store config with index name. + s.mockVisibilityMgr.EXPECT().GetName().Return(elasticsearch.PersistenceName).AnyTimes() s.mockVisibilityMgr.EXPECT().GetIndexName().Return("random-index-name").AnyTimes() s.mockResource.SearchAttributesProvider.EXPECT().GetSearchAttributes("random-index-name", true).Return(searchattribute.TestNameTypeMap, nil).AnyTimes() for _, testCase := range testCases {