From d4735d6abf5d8196326cf27d6dcfd733f10f8ea4 Mon Sep 17 00:00:00 2001 From: Samar Abbas Date: Wed, 29 Jul 2020 11:35:03 -0700 Subject: [PATCH 1/2] Routing logic to take both NamespaceID and workflowID into account Update the routing logic to use both NamespaceID and workflowID to compute the hash used for routing logic. --- api/adminservice/v1/request_response.pb.go | 302 ++++++---- api/historyservice/v1/request_response.pb.go | 550 ++++++++++-------- client/history/client.go | 68 +-- common/util.go | 7 +- host/archival_test.go | 4 +- .../adminservice/v1/request_response.proto | 3 +- .../historyservice/v1/request_response.proto | 3 +- service/frontend/adminHandler.go | 18 +- service/frontend/workflowHandler.go | 4 +- service/frontend/workflowHandler_test.go | 2 +- service/history/handler.go | 59 +- service/history/historyEventNotifier.go | 8 +- service/history/service.go | 6 +- service/history/shardController.go | 4 +- service/worker/indexer/esProcessor.go | 7 +- tools/cli/admin.go | 6 +- tools/cli/adminCommands.go | 5 +- tools/cli/adminKafkaCommands.go | 4 +- 18 files changed, 599 insertions(+), 461 deletions(-) diff --git a/api/adminservice/v1/request_response.pb.go b/api/adminservice/v1/request_response.pb.go index 4cade869600..01e3100a24d 100644 --- a/api/adminservice/v1/request_response.pb.go +++ b/api/adminservice/v1/request_response.pb.go @@ -158,7 +158,8 @@ type DescribeHistoryHostRequest struct { //ip:port HostAddress string `protobuf:"bytes,1,opt,name=host_address,json=hostAddress,proto3" json:"host_address,omitempty"` ShardIdForHost int32 `protobuf:"varint,2,opt,name=shard_id_for_host,json=shardIdForHost,proto3" json:"shard_id_for_host,omitempty"` - ExecutionForHost *v1.WorkflowExecution `protobuf:"bytes,3,opt,name=execution_for_host,json=executionForHost,proto3" json:"execution_for_host,omitempty"` + Namespace string `protobuf:"bytes,3,opt,name=namespace,proto3" json:"namespace,omitempty"` + ExecutionForHost *v1.WorkflowExecution `protobuf:"bytes,4,opt,name=execution_for_host,json=executionForHost,proto3" json:"execution_for_host,omitempty"` } func (m *DescribeHistoryHostRequest) Reset() { *m = DescribeHistoryHostRequest{} } @@ -207,6 +208,13 @@ func (m *DescribeHistoryHostRequest) GetShardIdForHost() int32 { return 0 } +func (m *DescribeHistoryHostRequest) GetNamespace() string { + if m != nil { + return m.Namespace + } + return "" +} + func (m *DescribeHistoryHostRequest) GetExecutionForHost() *v1.WorkflowExecution { if m != nil { return m.ExecutionForHost @@ -1978,127 +1986,127 @@ func init() { } var fileDescriptor_cc07c1a2abe7cb51 = []byte{ - // 1911 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcd, 0x6f, 0x1b, 0xd7, - 0x11, 0xd7, 0x92, 0xa1, 0x3e, 0x86, 0x16, 0x25, 0xae, 0xf5, 0x41, 0xd1, 0x0e, 0x43, 0x6f, 0xe2, - 0x58, 0x0e, 0x5a, 0xaa, 0x92, 0x8b, 0x7c, 0x15, 0x3d, 0x58, 0x1f, 0x71, 0x88, 0xda, 0xad, 0xb3, - 0x34, 0xec, 0xa0, 0x40, 0xb1, 0x59, 0x72, 0x87, 0xd2, 0x42, 0xdc, 0x5d, 0xf6, 0xbd, 0x47, 0xca, - 0x74, 0x81, 0xa0, 0x87, 0x14, 0x68, 0xd1, 0x4b, 0x2e, 0xfd, 0x0f, 0x7a, 0xe8, 0xa1, 0x45, 0xff, - 0x86, 0xb6, 0x97, 0x1c, 0xdd, 0x9e, 0x02, 0x14, 0x05, 0x6a, 0xf9, 0xd2, 0xde, 0x72, 0xea, 0xb9, - 0x78, 0x5f, 0xcb, 0x25, 0xb9, 0xa2, 0xe5, 0x26, 0x71, 0x81, 0xdc, 0xb4, 0x33, 0xbf, 0x99, 0x37, - 0x5f, 0x6f, 0x66, 0x1e, 0x05, 0xef, 0x32, 0x0c, 0xba, 0x11, 0x71, 0x3b, 0x5b, 0x14, 0x49, 0x1f, - 0xc9, 0x96, 0xdb, 0xf5, 0xb7, 0x5c, 0x2f, 0xf0, 0x43, 0xfe, 0xed, 0xb7, 0x70, 0xab, 0xbf, 0xbd, - 0x45, 0xf0, 0xa7, 0x3d, 0xa4, 0xcc, 0x21, 0x48, 0xbb, 0x51, 0x48, 0xb1, 0xd6, 0x25, 0x11, 0x8b, - 0xcc, 0x57, 0xb5, 0x6c, 0x4d, 0xca, 0xd6, 0xdc, 0xae, 0x5f, 0x4b, 0xca, 0xd6, 0xfa, 0xdb, 0x65, - 0x2b, 0x3e, 0x80, 0x6b, 0xc6, 0xb0, 0x17, 0x50, 0xae, 0xb2, 0x15, 0x05, 0x41, 0x14, 0x4a, 0x45, - 0xe5, 0xd7, 0x46, 0x30, 0x92, 0xc5, 0x41, 0x01, 0x52, 0xea, 0x1e, 0xaa, 0xe3, 0xca, 0x57, 0x47, - 0x50, 0x7d, 0x24, 0xd4, 0x4f, 0x83, 0x7d, 0x2b, 0xcd, 0xa3, 0x56, 0xa7, 0x47, 0x19, 0x92, 0x49, - 0xf4, 0xf5, 0x34, 0x74, 0xba, 0x95, 0xd7, 0xa6, 0x42, 0x99, 0x4b, 0x8f, 0x15, 0xb0, 0x96, 0x06, - 0x0c, 0xdd, 0x00, 0x69, 0xd7, 0x95, 0x01, 0x3d, 0x87, 0xc5, 0x47, 0x3e, 0x65, 0x11, 0x19, 0x4c, - 0xa2, 0xbf, 0x93, 0x86, 0x26, 0xd8, 0xed, 0xf8, 0x2d, 0x97, 0xa5, 0x45, 0xc4, 0xfa, 0x95, 0x01, - 0xd5, 0x7d, 0xa4, 0x2d, 0xe2, 0x37, 0xf1, 0x41, 0x44, 0x8e, 0xdb, 0x9d, 0xe8, 0xe4, 0xe0, 0x21, - 0xb6, 0x7a, 0x1c, 0x6e, 0xcb, 0xdc, 0x9a, 0x97, 0x61, 0x21, 0x36, 0xb1, 0x64, 0x54, 0x8d, 0xcd, - 0x05, 0x7b, 0x48, 0x30, 0x6f, 0xc1, 0x02, 0x6a, 0x89, 0x52, 0xa6, 0x6a, 0x6c, 0xe6, 0x77, 0xae, - 0xc7, 0x6e, 0x8a, 0xbc, 0xab, 0x50, 0xf5, 0xb7, 0x6b, 0x93, 0x47, 0x0c, 0x65, 0xad, 0xbf, 0x1a, - 0x70, 0x65, 0x8a, 0x2d, 0xb2, 0xbe, 0xcc, 0x0d, 0x98, 0xa7, 0x47, 0x2e, 0xf1, 0x1c, 0xdf, 0x53, - 0xb6, 0xcc, 0x89, 0xef, 0xba, 0x67, 0x5e, 0x81, 0x0b, 0x2a, 0x34, 0x8e, 0xeb, 0x79, 0x44, 0x18, - 0xb3, 0x60, 0xe7, 0x15, 0xed, 0xa6, 0xe7, 0x11, 0xf3, 0x06, 0xac, 0x05, 0x3d, 0xe6, 0x36, 0x3b, - 0xe8, 0x50, 0xe6, 0x32, 0x74, 0xfc, 0xd0, 0x69, 0xb9, 0xad, 0x23, 0x2c, 0x65, 0x05, 0xf8, 0xa2, - 0xe2, 0x36, 0x38, 0xb3, 0x1e, 0xee, 0x71, 0x96, 0xf9, 0x0e, 0x6c, 0x4c, 0x08, 0x79, 0x2e, 0x73, - 0x9b, 0x2e, 0xc5, 0xd2, 0x4b, 0x42, 0x6e, 0x6d, 0x54, 0x6e, 0x5f, 0x71, 0xad, 0xbf, 0x18, 0x50, - 0xd6, 0x3e, 0xbd, 0x2f, 0xed, 0x78, 0x3f, 0xa2, 0x4c, 0x47, 0x96, 0x5b, 0x1c, 0x51, 0x26, 0xcc, - 0x45, 0x4a, 0x95, 0x43, 0x79, 0x4e, 0xbb, 0x29, 0x49, 0xe6, 0x75, 0x28, 0x6a, 0x7f, 0x9d, 0x76, - 0x44, 0x1c, 0xce, 0x13, 0x9e, 0xe5, 0xec, 0x82, 0x72, 0xfc, 0xbd, 0x88, 0x70, 0xa5, 0xe6, 0x03, - 0x30, 0xe3, 0x68, 0x0e, 0xb1, 0xd9, 0xe7, 0x4d, 0xc9, 0x72, 0xac, 0x44, 0x29, 0xb6, 0x7e, 0x93, - 0x81, 0x4b, 0xa9, 0x5e, 0xa8, 0x9c, 0x6c, 0xc2, 0x72, 0xd8, 0x0b, 0x9a, 0x48, 0x9c, 0xa8, 0xed, - 0x08, 0xa3, 0xa4, 0x2b, 0x39, 0xbb, 0x20, 0xe9, 0x3f, 0x6a, 0x37, 0x04, 0xd5, 0xbc, 0x04, 0x0b, - 0xda, 0x1b, 0x5a, 0xca, 0x54, 0xb3, 0x9b, 0x39, 0x7b, 0x5e, 0x79, 0x41, 0xcd, 0x9f, 0xc0, 0x52, - 0x5c, 0x56, 0x89, 0xac, 0xe4, 0x77, 0xbe, 0x5b, 0x4b, 0x6b, 0x27, 0x31, 0x96, 0xbb, 0xf1, 0x43, - 0xfd, 0x21, 0x52, 0x56, 0x0f, 0xdb, 0x91, 0x5d, 0x08, 0x47, 0x68, 0xe6, 0x9b, 0xb0, 0x2e, 0xcf, - 0x6e, 0x45, 0x21, 0x23, 0x51, 0xa7, 0x83, 0x44, 0xe4, 0xb3, 0x47, 0x55, 0x12, 0x57, 0x05, 0x7b, - 0x2f, 0xe6, 0x36, 0x04, 0xd3, 0x2c, 0xc1, 0x9c, 0xce, 0x4f, 0x4e, 0x16, 0x9c, 0xfa, 0xb4, 0x6a, - 0x50, 0xdc, 0xeb, 0x44, 0x14, 0x85, 0x73, 0x3a, 0xa7, 0xe3, 0x05, 0x9a, 0x8b, 0x0b, 0xd4, 0x5a, - 0x01, 0x33, 0x89, 0x97, 0xd1, 0xb3, 0xfe, 0x6c, 0x40, 0xd1, 0xc6, 0x20, 0xea, 0xe3, 0x3d, 0x97, - 0x1e, 0x3f, 0x5b, 0x8d, 0xf9, 0x1e, 0xcc, 0xb7, 0x5c, 0x86, 0x87, 0x11, 0x19, 0x88, 0x4a, 0x28, - 0xec, 0xbc, 0x91, 0x1a, 0x20, 0xd1, 0x80, 0x78, 0x70, 0xb8, 0xde, 0x3d, 0x25, 0x61, 0xc7, 0xb2, - 0xe6, 0x3a, 0xcc, 0xf1, 0xd6, 0xc4, 0x4f, 0xe0, 0x71, 0xce, 0xda, 0xb3, 0xfc, 0xb3, 0xee, 0x99, - 0xdb, 0xb0, 0xd2, 0xf7, 0xa9, 0xdf, 0xf4, 0x3b, 0x3e, 0x1b, 0x38, 0xcc, 0x0f, 0x90, 0x32, 0x37, - 0xe8, 0x8a, 0x30, 0x65, 0xed, 0x8b, 0x43, 0xde, 0x3d, 0xcd, 0xe2, 0xae, 0x25, 0x7d, 0x50, 0xae, - 0xfd, 0x3e, 0x03, 0x57, 0x6f, 0x21, 0x9b, 0xac, 0x31, 0xf7, 0x44, 0xd5, 0xd1, 0x8b, 0xed, 0x31, - 0xe6, 0x6b, 0x50, 0x68, 0xfb, 0x84, 0x32, 0x07, 0xfb, 0x18, 0xb2, 0xa1, 0xe7, 0x17, 0x04, 0xf5, - 0x80, 0x13, 0xeb, 0x9e, 0x69, 0xc1, 0x62, 0x88, 0x0f, 0x13, 0x20, 0xe9, 0x78, 0x9e, 0x13, 0x35, - 0xe6, 0x0d, 0x28, 0x06, 0xee, 0x43, 0x3f, 0xe8, 0x05, 0x4e, 0xd7, 0x3d, 0x44, 0x87, 0xfa, 0x8f, - 0x50, 0xd4, 0x47, 0xce, 0x5e, 0x52, 0x8c, 0xbb, 0xee, 0x21, 0x36, 0xfc, 0x47, 0x68, 0xbe, 0x0e, - 0x4b, 0x42, 0x9f, 0x00, 0xb2, 0xe8, 0x18, 0xc3, 0xd2, 0x6c, 0xd5, 0xd8, 0xbc, 0x60, 0x8b, 0x63, - 0x38, 0xec, 0x1e, 0x27, 0x5a, 0x7f, 0xcb, 0xc2, 0xeb, 0xcf, 0x0a, 0x97, 0xba, 0x72, 0x29, 0x2a, - 0x8d, 0x14, 0x95, 0x66, 0x1d, 0x96, 0x74, 0x4f, 0x6c, 0xba, 0xac, 0x75, 0x84, 0xf2, 0xda, 0xe5, - 0x77, 0xaa, 0x67, 0xc5, 0x8f, 0xf7, 0xae, 0xdd, 0x4e, 0xd4, 0xb4, 0x0b, 0x4a, 0x70, 0x57, 0xca, - 0x99, 0xbf, 0x36, 0x60, 0x39, 0x31, 0x4c, 0x1c, 0x3f, 0x6c, 0x47, 0xa5, 0xac, 0x50, 0xf6, 0x51, - 0xed, 0x1c, 0xf3, 0xbe, 0x76, 0x3e, 0xd7, 0x6a, 0xf6, 0xf0, 0x0c, 0x7e, 0x8f, 0x0f, 0x42, 0x46, - 0x06, 0xf6, 0x12, 0x19, 0xa5, 0x9a, 0x35, 0xb8, 0x28, 0xd3, 0xc3, 0x85, 0xd1, 0x51, 0x33, 0x5f, - 0x64, 0x2a, 0x67, 0x17, 0x05, 0xab, 0xc1, 0x39, 0xf7, 0x25, 0xa3, 0x7c, 0x02, 0x2b, 0x69, 0x8a, - 0xcd, 0x65, 0xc8, 0x1e, 0xe3, 0x40, 0x95, 0x1c, 0xff, 0xd3, 0xac, 0x43, 0xae, 0xef, 0x76, 0x7a, - 0xa8, 0x0a, 0xed, 0x46, 0xaa, 0x6f, 0x09, 0x73, 0xb8, 0x6b, 0x63, 0xaa, 0x6d, 0xa9, 0xe1, 0xdd, - 0xcc, 0xdb, 0x86, 0xf5, 0xcb, 0x2c, 0x5c, 0x9b, 0xee, 0xf9, 0xfd, 0x9d, 0x17, 0x7f, 0x0b, 0x28, - 0x73, 0xc9, 0xe4, 0x2d, 0x10, 0x54, 0x5d, 0xe1, 0x35, 0xb8, 0x98, 0x44, 0x25, 0x23, 0x9c, 0xb5, - 0x8b, 0x43, 0xa8, 0x8a, 0xb0, 0x59, 0x85, 0x0b, 0x18, 0x7a, 0x43, 0x9d, 0x39, 0x01, 0x04, 0x0c, - 0xbd, 0xc4, 0x9d, 0x19, 0x22, 0xb4, 0xbe, 0x59, 0x01, 0x5b, 0xd2, 0x30, 0xad, 0x2d, 0xf5, 0x7e, - 0xcd, 0x9d, 0xfb, 0x7e, 0xcd, 0xa7, 0xdd, 0xaf, 0xff, 0x18, 0xb0, 0xf9, 0xec, 0x54, 0xfc, 0xff, - 0x6e, 0xd8, 0x03, 0x58, 0x52, 0x51, 0x71, 0x14, 0x47, 0x0d, 0xc0, 0x5a, 0x6a, 0x0d, 0x2a, 0x0c, - 0x57, 0xa9, 0xa2, 0xa6, 0xaf, 0x52, 0xa1, 0x3f, 0xf2, 0x6d, 0x7d, 0x6a, 0xc0, 0xcb, 0xb7, 0x90, - 0x25, 0xaa, 0xf4, 0x8e, 0x5c, 0x03, 0xa9, 0xae, 0xbc, 0xdb, 0x30, 0x2b, 0x7c, 0xe4, 0x83, 0x3b, - 0x7b, 0xe6, 0xc8, 0x3d, 0xbb, 0xea, 0x45, 0x2c, 0x6c, 0xa5, 0x83, 0xef, 0x35, 0x6a, 0xad, 0x76, - 0x78, 0xf9, 0xea, 0x4d, 0x4c, 0xd1, 0xf8, 0xac, 0xb6, 0x7e, 0x9b, 0x81, 0xca, 0x59, 0x26, 0xa9, - 0x0c, 0x7c, 0x62, 0x40, 0x51, 0xad, 0xab, 0xd4, 0x69, 0x0e, 0xe4, 0x66, 0xa1, 0xec, 0xfb, 0xf0, - 0xbc, 0x1d, 0x67, 0xca, 0x01, 0x35, 0x4d, 0xd8, 0x1d, 0x88, 0x89, 0xac, 0x3a, 0x4d, 0x30, 0x4a, - 0x2d, 0xff, 0x0c, 0x56, 0xd2, 0x80, 0xc9, 0xce, 0x91, 0x93, 0x9d, 0xe3, 0xce, 0x68, 0xe7, 0x78, - 0xeb, 0x39, 0x63, 0x18, 0xdb, 0x97, 0xe8, 0x1e, 0x7f, 0x32, 0xc4, 0x48, 0x88, 0xd7, 0x9b, 0x29, - 0x29, 0x7c, 0x07, 0x36, 0x3a, 0xae, 0x78, 0x8a, 0x31, 0xe2, 0x63, 0x1f, 0x3d, 0x47, 0x79, 0xa2, - 0x57, 0x88, 0xac, 0xbd, 0xc6, 0x01, 0xb6, 0xe6, 0x2b, 0x05, 0x75, 0x2f, 0x16, 0xed, 0x92, 0xa8, - 0x85, 0x94, 0x8e, 0x8a, 0x66, 0x86, 0xa2, 0x77, 0x35, 0x7f, 0x28, 0x3a, 0x9e, 0xea, 0xec, 0x64, - 0xaa, 0x3f, 0x16, 0x0d, 0x70, 0xba, 0x0b, 0x2a, 0xe5, 0x0d, 0x98, 0xd7, 0xe1, 0x17, 0x26, 0x7f, - 0x89, 0x20, 0xc6, 0x8a, 0xac, 0x47, 0x50, 0xbd, 0x85, 0x6c, 0xff, 0xf6, 0x07, 0x53, 0x82, 0x77, - 0x1f, 0x40, 0xee, 0x42, 0x61, 0x3b, 0xd2, 0x77, 0xe0, 0x79, 0x8f, 0xe6, 0xab, 0x8f, 0xe8, 0xfe, - 0x0b, 0x4c, 0xfd, 0x45, 0xad, 0x5f, 0x18, 0x70, 0x65, 0xca, 0xe1, 0xca, 0xed, 0x8f, 0xa0, 0x98, - 0x9c, 0xac, 0x5c, 0x5c, 0x1b, 0x71, 0xe3, 0x7f, 0x30, 0xc2, 0x4e, 0xce, 0x69, 0x4e, 0xa0, 0xd6, - 0x67, 0x06, 0x9f, 0x7f, 0x6e, 0xb7, 0xdb, 0x19, 0x88, 0x36, 0x4b, 0xcf, 0x37, 0x72, 0x3e, 0x04, - 0xf3, 0x44, 0x75, 0x4b, 0xe7, 0x4b, 0xcc, 0x9e, 0xe2, 0xc9, 0x38, 0xc9, 0x7c, 0x1b, 0x66, 0xc5, - 0x1c, 0xa0, 0xaa, 0xc5, 0x3d, 0xbb, 0x5b, 0x2a, 0xbc, 0xb5, 0x0e, 0xab, 0x63, 0x9e, 0xa8, 0x6d, - 0xf3, 0x8f, 0x19, 0xd8, 0xb8, 0xe9, 0x79, 0x0d, 0x74, 0x49, 0xeb, 0xe8, 0x26, 0x63, 0xc4, 0x6f, - 0xf6, 0x18, 0x6a, 0x47, 0x3f, 0x86, 0x65, 0x2a, 0x38, 0x8e, 0xab, 0x59, 0x2a, 0xc4, 0x8d, 0x73, - 0xf5, 0x92, 0x33, 0x35, 0xd7, 0xc6, 0xc8, 0xaa, 0x8d, 0xd0, 0x51, 0xaa, 0x79, 0x15, 0x0a, 0x14, - 0x5b, 0x3d, 0x22, 0x56, 0x6a, 0x31, 0x4e, 0x64, 0x57, 0x5c, 0xd4, 0x54, 0xd1, 0x42, 0xcb, 0xc7, - 0xb0, 0x92, 0xa6, 0x2f, 0x65, 0x4f, 0xf9, 0x7e, 0xb2, 0xdb, 0x14, 0x76, 0xae, 0x8d, 0x06, 0x30, - 0x5e, 0xfe, 0xeb, 0xa1, 0x87, 0x0f, 0xd1, 0xbb, 0xcf, 0xa1, 0xf7, 0x06, 0x5d, 0x4c, 0x76, 0x97, - 0xcb, 0x50, 0x4e, 0x73, 0x4b, 0xc5, 0xb3, 0x04, 0x6b, 0xfa, 0xd5, 0xb7, 0x27, 0xaf, 0xb3, 0xf2, - 0xd8, 0xfa, 0x87, 0x01, 0xeb, 0x13, 0x2c, 0x55, 0xcb, 0x3e, 0x6c, 0xd0, 0x5e, 0xb7, 0x1b, 0x11, - 0x86, 0x9e, 0xd3, 0xea, 0xf8, 0x89, 0x59, 0xaf, 0xef, 0xf4, 0xb7, 0x47, 0x4d, 0x55, 0x5c, 0x6e, - 0x6c, 0x43, 0x4b, 0x36, 0xf6, 0x7f, 0xa0, 0x66, 0x1a, 0xb5, 0xd7, 0x63, 0x7d, 0x7b, 0x42, 0x9d, - 0x66, 0xf0, 0x79, 0x19, 0x20, 0x7f, 0x5f, 0xd2, 0x23, 0xbf, 0x2b, 0xf7, 0xd1, 0xcc, 0x94, 0x79, - 0xa9, 0x7a, 0x12, 0x3f, 0xe7, 0x4e, 0x2c, 0x26, 0x9f, 0x8a, 0xc1, 0xc8, 0xb7, 0xf5, 0x87, 0x0c, - 0xac, 0xca, 0x5b, 0x3b, 0xde, 0x27, 0x0e, 0xe0, 0x25, 0x36, 0xe8, 0xca, 0x9b, 0x52, 0xd8, 0xd9, - 0x9e, 0xfe, 0xee, 0xda, 0x47, 0xd7, 0xbb, 0x8d, 0x8c, 0x21, 0xf9, 0xa0, 0x87, 0x2a, 0xfa, 0x42, - 0x7c, 0xe4, 0x75, 0x97, 0x19, 0x7d, 0xdd, 0xf1, 0x3a, 0x89, 0x7a, 0x84, 0x3f, 0x81, 0xa5, 0xbd, - 0xaa, 0xa5, 0x2e, 0x4a, 0xaa, 0x0a, 0xb7, 0xf9, 0x16, 0x94, 0xfc, 0x90, 0x23, 0xfc, 0x3e, 0x3a, - 0x7c, 0xab, 0x4a, 0x74, 0x6c, 0xb9, 0xa2, 0xad, 0xc6, 0xfc, 0x83, 0x30, 0xd1, 0xb0, 0xbf, 0x8e, - 0x87, 0xcb, 0xbf, 0x0d, 0x58, 0x1b, 0x8f, 0x97, 0x2a, 0x87, 0xaf, 0x28, 0x60, 0xa9, 0x1d, 0x32, - 0xf3, 0x15, 0x76, 0xc8, 0x34, 0x5f, 0xb3, 0x69, 0xbe, 0xfe, 0xdd, 0x80, 0xf5, 0xbb, 0x3d, 0x72, - 0x88, 0xdf, 0xc4, 0xea, 0xb0, 0xca, 0x50, 0x9a, 0x74, 0x6e, 0xd8, 0x5f, 0xd7, 0xef, 0xe0, 0x37, - 0xd4, 0xf3, 0xaf, 0xe5, 0x5e, 0xec, 0x42, 0x69, 0x32, 0x60, 0xcf, 0xf7, 0xbe, 0xb0, 0x3e, 0x31, - 0xe0, 0x92, 0x8d, 0x6d, 0x82, 0xf4, 0x48, 0x0f, 0x56, 0x51, 0xb0, 0x2f, 0xf8, 0xd7, 0xd9, 0x0a, - 0x5c, 0x4e, 0xb7, 0x62, 0x58, 0x1c, 0x2f, 0xdb, 0x48, 0x31, 0xf4, 0xc6, 0xae, 0x1a, 0x4d, 0xfc, - 0xd8, 0x39, 0xfc, 0x79, 0x2f, 0xfe, 0xf5, 0x36, 0x1f, 0xd3, 0xea, 0x9e, 0xf9, 0x0a, 0xe4, 0xe3, - 0x75, 0x43, 0x55, 0xc0, 0x82, 0x0d, 0x9a, 0x54, 0xf7, 0xcc, 0x55, 0x98, 0x25, 0xbd, 0x50, 0xbf, - 0x58, 0x17, 0xec, 0x1c, 0xe9, 0x85, 0xb2, 0x36, 0x08, 0x06, 0x11, 0x1b, 0xd6, 0x86, 0xfc, 0x45, - 0x6f, 0x51, 0x52, 0x75, 0x6d, 0x4c, 0xbe, 0x7b, 0x73, 0x29, 0xef, 0xde, 0x57, 0x61, 0x51, 0xa2, - 0x46, 0x5f, 0xa8, 0x12, 0x74, 0xd6, 0x63, 0x77, 0x6e, 0xe2, 0xb1, 0xfb, 0x0a, 0xe4, 0x39, 0x42, - 0x2b, 0x99, 0x8f, 0x01, 0x4a, 0x85, 0x55, 0x85, 0xca, 0x59, 0x01, 0x93, 0x31, 0xdd, 0xed, 0x3c, - 0x7e, 0x52, 0x99, 0xf9, 0xfc, 0x49, 0x65, 0xe6, 0x8b, 0x27, 0x15, 0xe3, 0xe7, 0xa7, 0x15, 0xe3, - 0x77, 0xa7, 0x15, 0xe3, 0xb3, 0xd3, 0x8a, 0xf1, 0xf8, 0xb4, 0x62, 0xfc, 0xf3, 0xb4, 0x62, 0xfc, - 0xeb, 0xb4, 0x32, 0xf3, 0xc5, 0x69, 0xc5, 0xf8, 0xf4, 0x69, 0x65, 0xe6, 0xf1, 0xd3, 0xca, 0xcc, - 0xe7, 0x4f, 0x2b, 0x33, 0x3f, 0x7e, 0xf3, 0x30, 0x1a, 0x66, 0xd8, 0x8f, 0xa6, 0xfc, 0xf7, 0xe6, - 0x7b, 0xc9, 0xef, 0xe6, 0xac, 0xf8, 0x97, 0xc0, 0x8d, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x19, - 0x0c, 0x60, 0x3c, 0xf8, 0x19, 0x00, 0x00, + // 1917 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x4b, 0x6f, 0x1b, 0xd7, + 0xf5, 0xd7, 0x90, 0xa6, 0x1e, 0x87, 0x16, 0x25, 0x8e, 0xf5, 0xa0, 0x68, 0x87, 0xa1, 0x27, 0x71, + 0x2c, 0x07, 0xff, 0x3f, 0x55, 0xc9, 0x45, 0x5e, 0x45, 0x17, 0xd6, 0x23, 0x0e, 0x51, 0xbb, 0x75, + 0x86, 0x86, 0x1d, 0x14, 0x28, 0x26, 0x43, 0xce, 0xa1, 0x34, 0x10, 0x67, 0x86, 0xbd, 0xf7, 0x92, + 0x32, 0x5d, 0x20, 0xe8, 0x22, 0x05, 0x5a, 0x74, 0x93, 0x4d, 0xbf, 0x41, 0x17, 0x5d, 0xb4, 0xe8, + 0x67, 0x68, 0x57, 0x59, 0xba, 0x5d, 0x05, 0x28, 0x0a, 0xd4, 0xf2, 0xa6, 0xdd, 0x65, 0xd5, 0x75, + 0x71, 0x5f, 0xc3, 0x21, 0x39, 0xa2, 0xe5, 0x26, 0x71, 0x81, 0xec, 0x34, 0xe7, 0x75, 0xcf, 0xef, + 0x9c, 0x73, 0xcf, 0x39, 0x97, 0x82, 0xf7, 0x18, 0x06, 0xdd, 0x88, 0xb8, 0x9d, 0x2d, 0x8a, 0xa4, + 0x8f, 0x64, 0xcb, 0xed, 0xfa, 0x5b, 0xae, 0x17, 0xf8, 0x21, 0xff, 0xf6, 0x5b, 0xb8, 0xd5, 0xdf, + 0xde, 0x22, 0xf8, 0xd3, 0x1e, 0x52, 0xe6, 0x10, 0xa4, 0xdd, 0x28, 0xa4, 0x58, 0xeb, 0x92, 0x88, + 0x45, 0xe6, 0x6b, 0x5a, 0xb7, 0x26, 0x75, 0x6b, 0x6e, 0xd7, 0xaf, 0x25, 0x75, 0x6b, 0xfd, 0xed, + 0xb2, 0x15, 0x1f, 0xc0, 0x2d, 0x63, 0xd8, 0x0b, 0x28, 0x37, 0xd9, 0x8a, 0x82, 0x20, 0x0a, 0xa5, + 0xa1, 0xf2, 0xeb, 0x23, 0x32, 0x92, 0xc5, 0x85, 0x02, 0xa4, 0xd4, 0x3d, 0x54, 0xc7, 0x95, 0xaf, + 0x8d, 0x48, 0xf5, 0x91, 0x50, 0x3f, 0x4d, 0xec, 0xff, 0xd2, 0x10, 0xb5, 0x3a, 0x3d, 0xca, 0x90, + 0x4c, 0x4a, 0xdf, 0x48, 0x93, 0x4e, 0xf7, 0xf2, 0xfa, 0x54, 0x51, 0xe6, 0xd2, 0x63, 0x25, 0x58, + 0x4b, 0x13, 0x0c, 0xdd, 0x00, 0x69, 0xd7, 0x95, 0x01, 0x3d, 0x87, 0xc7, 0x47, 0x3e, 0x65, 0x11, + 0x19, 0x4c, 0x4a, 0x7f, 0x27, 0x4d, 0x9a, 0x60, 0xb7, 0xe3, 0xb7, 0x5c, 0x96, 0x16, 0x11, 0xeb, + 0x57, 0x06, 0x54, 0xf7, 0x91, 0xb6, 0x88, 0xdf, 0xc4, 0x87, 0x11, 0x39, 0x6e, 0x77, 0xa2, 0x93, + 0x83, 0x47, 0xd8, 0xea, 0x71, 0x71, 0x5b, 0xe6, 0xd6, 0xbc, 0x02, 0x0b, 0xb1, 0x8b, 0x25, 0xa3, + 0x6a, 0x6c, 0x2e, 0xd8, 0x43, 0x82, 0x79, 0x1b, 0x16, 0x50, 0x6b, 0x94, 0x32, 0x55, 0x63, 0x33, + 0xbf, 0x73, 0x23, 0x86, 0x29, 0xf2, 0xae, 0x42, 0xd5, 0xdf, 0xae, 0x4d, 0x1e, 0x31, 0xd4, 0xb5, + 0xfe, 0x62, 0xc0, 0xd5, 0x29, 0xbe, 0xc8, 0xfa, 0x32, 0x37, 0x60, 0x9e, 0x1e, 0xb9, 0xc4, 0x73, + 0x7c, 0x4f, 0xf9, 0x32, 0x27, 0xbe, 0xeb, 0x9e, 0x79, 0x15, 0x2e, 0xaa, 0xd0, 0x38, 0xae, 0xe7, + 0x11, 0xe1, 0xcc, 0x82, 0x9d, 0x57, 0xb4, 0x5b, 0x9e, 0x47, 0xcc, 0x9b, 0xb0, 0x16, 0xf4, 0x98, + 0xdb, 0xec, 0xa0, 0x43, 0x99, 0xcb, 0xd0, 0xf1, 0x43, 0xa7, 0xe5, 0xb6, 0x8e, 0xb0, 0x94, 0x15, + 0xc2, 0x97, 0x14, 0xb7, 0xc1, 0x99, 0xf5, 0x70, 0x8f, 0xb3, 0xcc, 0x77, 0x61, 0x63, 0x42, 0xc9, + 0x73, 0x99, 0xdb, 0x74, 0x29, 0x96, 0x2e, 0x08, 0xbd, 0xb5, 0x51, 0xbd, 0x7d, 0xc5, 0xb5, 0x9e, + 0x1a, 0x50, 0xd6, 0x98, 0x3e, 0x90, 0x7e, 0x7c, 0x10, 0x51, 0xa6, 0x23, 0xcb, 0x3d, 0x8e, 0x28, + 0x13, 0xee, 0x22, 0xa5, 0x0a, 0x50, 0x9e, 0xd3, 0x6e, 0x49, 0x92, 0x79, 0x03, 0x8a, 0x1a, 0xaf, + 0xd3, 0x8e, 0x88, 0xc3, 0x79, 0x02, 0x59, 0xce, 0x2e, 0x28, 0xe0, 0xef, 0x47, 0x84, 0x1b, 0x1d, + 0xcd, 0x53, 0x76, 0x3c, 0x4f, 0x0f, 0xc1, 0x8c, 0x63, 0x3d, 0xb4, 0x74, 0xe1, 0x45, 0x13, 0xb6, + 0x1c, 0x1b, 0x51, 0xc7, 0x5a, 0xbf, 0xc9, 0xc0, 0xe5, 0x54, 0x8c, 0x2a, 0x63, 0x9b, 0xb0, 0x1c, + 0xf6, 0x82, 0x26, 0x12, 0x27, 0x6a, 0x3b, 0xc2, 0x65, 0x09, 0x34, 0x67, 0x17, 0x24, 0xfd, 0x47, + 0xed, 0x86, 0xa0, 0x9a, 0x97, 0x61, 0x41, 0x63, 0xa5, 0xa5, 0x4c, 0x35, 0xbb, 0x99, 0xb3, 0xe7, + 0x15, 0x46, 0x6a, 0xfe, 0x04, 0x96, 0x62, 0x30, 0x89, 0x9c, 0xe5, 0x77, 0xbe, 0x5b, 0x4b, 0x6b, + 0x36, 0xb1, 0x2c, 0x87, 0xf1, 0x43, 0xfd, 0x21, 0x12, 0x5a, 0x0f, 0xdb, 0x91, 0x5d, 0x08, 0x47, + 0x68, 0xe6, 0x5b, 0xb0, 0x2e, 0xcf, 0x6e, 0x45, 0x21, 0x23, 0x51, 0xa7, 0x83, 0x44, 0x64, 0xbb, + 0x47, 0x55, 0x8a, 0x57, 0x05, 0x7b, 0x2f, 0xe6, 0x36, 0x04, 0xd3, 0x2c, 0xc1, 0x9c, 0xce, 0x5e, + 0x4e, 0x96, 0xa3, 0xfa, 0xb4, 0x6a, 0x50, 0xdc, 0xeb, 0x44, 0x14, 0x05, 0x38, 0x9d, 0xf1, 0xf1, + 0xf2, 0xcd, 0xc5, 0xe5, 0x6b, 0xad, 0x80, 0x99, 0x94, 0x97, 0xd1, 0xb3, 0xfe, 0x6c, 0x40, 0xd1, + 0xc6, 0x20, 0xea, 0xe3, 0x7d, 0x97, 0x1e, 0x3f, 0xdf, 0x8c, 0xf9, 0x3e, 0xcc, 0xb7, 0x5c, 0x86, + 0x87, 0x11, 0x19, 0x88, 0x3a, 0x29, 0xec, 0xbc, 0x99, 0x1a, 0x20, 0xd1, 0x9e, 0x78, 0x70, 0xb8, + 0xdd, 0x3d, 0xa5, 0x61, 0xc7, 0xba, 0xe6, 0x3a, 0xcc, 0xf1, 0xc6, 0xc5, 0x4f, 0xe0, 0x71, 0xce, + 0xda, 0xb3, 0xfc, 0xb3, 0xee, 0x99, 0xdb, 0xb0, 0xd2, 0xf7, 0xa9, 0xdf, 0xf4, 0x3b, 0x3e, 0x1b, + 0x38, 0xcc, 0x0f, 0x90, 0x32, 0x37, 0xe8, 0x8a, 0x30, 0x65, 0xed, 0x4b, 0x43, 0xde, 0x7d, 0xcd, + 0xe2, 0xd0, 0x92, 0x18, 0x14, 0xb4, 0xdf, 0x67, 0xe0, 0xda, 0x6d, 0x64, 0x93, 0x35, 0xe6, 0x9e, + 0xa8, 0x3a, 0x7a, 0xb9, 0x1d, 0xc8, 0x7c, 0x1d, 0x0a, 0x6d, 0x9f, 0x50, 0xe6, 0x60, 0x1f, 0x43, + 0x36, 0x44, 0x7e, 0x51, 0x50, 0x0f, 0x38, 0xb1, 0xee, 0x99, 0x16, 0x2c, 0x86, 0xf8, 0x28, 0x21, + 0x24, 0x81, 0xe7, 0x39, 0x51, 0xcb, 0xbc, 0x09, 0xc5, 0xc0, 0x7d, 0xe4, 0x07, 0xbd, 0xc0, 0xe9, + 0xba, 0x87, 0xe8, 0x50, 0xff, 0x31, 0x8a, 0xfa, 0xc8, 0xd9, 0x4b, 0x8a, 0x71, 0xcf, 0x3d, 0xc4, + 0x86, 0xff, 0x18, 0xcd, 0x37, 0x60, 0x49, 0xd8, 0x13, 0x82, 0x2c, 0x3a, 0xc6, 0xb0, 0x34, 0x5b, + 0x35, 0x36, 0x2f, 0xda, 0xe2, 0x18, 0x2e, 0x76, 0x9f, 0x13, 0xad, 0xbf, 0x66, 0xe1, 0x8d, 0xe7, + 0x85, 0x4b, 0x5d, 0xb9, 0x14, 0x93, 0x46, 0x8a, 0x49, 0xb3, 0x0e, 0x4b, 0xba, 0x63, 0x36, 0x5d, + 0xd6, 0x3a, 0x42, 0x79, 0xed, 0xf2, 0x3b, 0xd5, 0xb3, 0xe2, 0xc7, 0x3b, 0xdb, 0x6e, 0x27, 0x6a, + 0xda, 0x05, 0xa5, 0xb8, 0x2b, 0xf5, 0xcc, 0x5f, 0x1b, 0xb0, 0x9c, 0x18, 0x35, 0x8e, 0x1f, 0xb6, + 0xa3, 0x52, 0x56, 0x18, 0xfb, 0xb8, 0x76, 0x8e, 0x6d, 0xa0, 0x76, 0x3e, 0x68, 0x35, 0x7b, 0x78, + 0x06, 0xbf, 0xc7, 0x07, 0x21, 0x23, 0x03, 0x7b, 0x89, 0x8c, 0x52, 0xcd, 0x1a, 0x5c, 0x92, 0xe9, + 0xe1, 0xca, 0xe8, 0xa8, 0x8d, 0x40, 0x64, 0x2a, 0x67, 0x17, 0x05, 0xab, 0xc1, 0x39, 0x0f, 0x24, + 0xa3, 0x7c, 0x02, 0x2b, 0x69, 0x86, 0xcd, 0x65, 0xc8, 0x1e, 0xe3, 0x40, 0x95, 0x1c, 0xff, 0xd3, + 0xac, 0x43, 0xae, 0xef, 0x76, 0x7a, 0xa8, 0x0a, 0xed, 0x66, 0x2a, 0xb6, 0x84, 0x3b, 0x1c, 0xda, + 0x98, 0x69, 0x5b, 0x5a, 0x78, 0x2f, 0xf3, 0x8e, 0x61, 0xfd, 0x32, 0x0b, 0xd7, 0xa7, 0x23, 0x7f, + 0xb0, 0xf3, 0xf2, 0x6f, 0x01, 0x65, 0x2e, 0x99, 0xbc, 0x05, 0x82, 0xaa, 0x2b, 0xbc, 0x06, 0x97, + 0x92, 0x52, 0xc9, 0x08, 0x67, 0xed, 0xe2, 0x50, 0x54, 0x45, 0xd8, 0xac, 0xc2, 0x45, 0x0c, 0xbd, + 0xa1, 0xcd, 0x9c, 0x10, 0x04, 0x0c, 0xbd, 0xc4, 0x9d, 0x19, 0x4a, 0x68, 0x7b, 0xb3, 0x42, 0x6c, + 0x49, 0x8b, 0x69, 0x6b, 0xa9, 0xf7, 0x6b, 0xee, 0xdc, 0xf7, 0x6b, 0x3e, 0xed, 0x7e, 0xfd, 0xdb, + 0x80, 0xcd, 0xe7, 0xa7, 0xe2, 0x7f, 0x77, 0xc3, 0x1e, 0xc2, 0x92, 0x8a, 0x8a, 0xa3, 0x38, 0x6a, + 0x00, 0xd6, 0x52, 0x6b, 0x50, 0xc9, 0x70, 0x93, 0x2a, 0x6a, 0xfa, 0x2a, 0x15, 0xfa, 0x23, 0xdf, + 0xd6, 0x67, 0x06, 0xbc, 0x72, 0x1b, 0x59, 0xa2, 0x4a, 0xef, 0xca, 0x25, 0x91, 0xea, 0xca, 0xbb, + 0x03, 0xb3, 0x02, 0x23, 0x1f, 0xdc, 0xd9, 0x33, 0x47, 0xee, 0xd9, 0x55, 0x2f, 0x62, 0x61, 0x2b, + 0x1b, 0x7c, 0xeb, 0x51, 0x4b, 0xb7, 0xc3, 0xcb, 0x57, 0xef, 0x69, 0x8a, 0xc6, 0x67, 0xb5, 0xf5, + 0xdb, 0x0c, 0x54, 0xce, 0x72, 0x49, 0x65, 0xe0, 0x53, 0x03, 0x8a, 0x6a, 0x99, 0xa5, 0x4e, 0x73, + 0x20, 0x37, 0x0b, 0xe5, 0xdf, 0x47, 0xe7, 0xed, 0x38, 0x53, 0x0e, 0xa8, 0x69, 0xc2, 0xee, 0x40, + 0x4c, 0x64, 0xd5, 0x69, 0x82, 0x51, 0x6a, 0xf9, 0x67, 0xb0, 0x92, 0x26, 0x98, 0xec, 0x1c, 0x39, + 0xd9, 0x39, 0xee, 0x8e, 0x76, 0x8e, 0xb7, 0x5f, 0x30, 0x86, 0xb1, 0x7f, 0x89, 0xee, 0xf1, 0x27, + 0x43, 0x8c, 0x84, 0x78, 0xbd, 0x99, 0x92, 0xc2, 0x77, 0x61, 0xa3, 0xe3, 0x8a, 0x87, 0x1a, 0x23, + 0x3e, 0xf6, 0xd1, 0x73, 0x14, 0x12, 0xbd, 0x42, 0x64, 0xed, 0x35, 0x2e, 0x60, 0x6b, 0xbe, 0x32, + 0x50, 0xf7, 0x62, 0xd5, 0x2e, 0x89, 0x5a, 0x48, 0xe9, 0xa8, 0x6a, 0x66, 0xa8, 0x7a, 0x4f, 0xf3, + 0x87, 0xaa, 0xe3, 0xa9, 0xce, 0x4e, 0xa6, 0xfa, 0x13, 0xd1, 0x00, 0xa7, 0x43, 0x50, 0x29, 0x6f, + 0xc0, 0xbc, 0x0e, 0xbf, 0x70, 0xf9, 0x2b, 0x04, 0x31, 0x36, 0x64, 0x3d, 0x86, 0xea, 0x6d, 0x64, + 0xfb, 0x77, 0x3e, 0x9c, 0x12, 0xbc, 0x07, 0x00, 0x72, 0x17, 0x0a, 0xdb, 0x91, 0xbe, 0x03, 0x2f, + 0x7a, 0x34, 0x5f, 0x7d, 0x44, 0xf7, 0x5f, 0x60, 0xea, 0x2f, 0x6a, 0xfd, 0xc2, 0x80, 0xab, 0x53, + 0x0e, 0x57, 0xb0, 0x3f, 0x86, 0x62, 0x72, 0xb2, 0x72, 0x75, 0xed, 0xc4, 0xcd, 0xff, 0xc2, 0x09, + 0x3b, 0x39, 0xa7, 0x39, 0x81, 0x5a, 0x9f, 0x1b, 0x7c, 0xfe, 0xb9, 0xdd, 0x6e, 0x67, 0x20, 0xda, + 0x2c, 0x3d, 0xdf, 0xc8, 0xf9, 0x08, 0xcc, 0x13, 0xd5, 0x2d, 0x9d, 0xaf, 0x30, 0x7b, 0x8a, 0x27, + 0xe3, 0x24, 0xf3, 0x1d, 0x98, 0x15, 0x73, 0x80, 0xaa, 0x16, 0xf7, 0xfc, 0x6e, 0xa9, 0xe4, 0xad, + 0x75, 0x58, 0x1d, 0x43, 0xa2, 0xb6, 0xcd, 0x3f, 0x66, 0x60, 0xe3, 0x96, 0xe7, 0x35, 0xd0, 0x25, + 0xad, 0xa3, 0x5b, 0x8c, 0x11, 0xbf, 0xd9, 0x63, 0xa8, 0x81, 0x7e, 0x02, 0xcb, 0x54, 0x70, 0x1c, + 0x57, 0xb3, 0x54, 0x88, 0x1b, 0xe7, 0xea, 0x25, 0x67, 0x5a, 0xae, 0x8d, 0x91, 0x55, 0x1b, 0xa1, + 0xa3, 0x54, 0xf3, 0x1a, 0x14, 0x28, 0xb6, 0x7a, 0x44, 0xac, 0xd4, 0x62, 0x9c, 0xc8, 0xae, 0xb8, + 0xa8, 0xa9, 0xa2, 0x85, 0x96, 0x8f, 0x61, 0x25, 0xcd, 0x5e, 0xca, 0x9e, 0xf2, 0xfd, 0x64, 0xb7, + 0x29, 0xec, 0x5c, 0x1f, 0x0d, 0x60, 0xbc, 0xfc, 0xd7, 0x43, 0x0f, 0x1f, 0xa1, 0xf7, 0x80, 0x8b, + 0xde, 0x1f, 0x74, 0x31, 0xd9, 0x5d, 0xae, 0x40, 0x39, 0x0d, 0x96, 0x8a, 0x67, 0x09, 0xd6, 0xf4, + 0xab, 0x6f, 0x4f, 0x5e, 0x67, 0x85, 0xd8, 0xfa, 0xbb, 0x01, 0xeb, 0x13, 0x2c, 0x55, 0xcb, 0x3e, + 0x6c, 0xd0, 0x5e, 0xb7, 0x1b, 0x11, 0x86, 0x9e, 0xd3, 0xea, 0xf8, 0x89, 0x59, 0xaf, 0xef, 0xf4, + 0xff, 0x8f, 0xba, 0xaa, 0xb8, 0xdc, 0xd9, 0x86, 0xd6, 0x6c, 0xec, 0xff, 0x40, 0xcd, 0x34, 0x6a, + 0xaf, 0xc7, 0xf6, 0xf6, 0x84, 0x39, 0xcd, 0xe0, 0xf3, 0x32, 0x40, 0xfe, 0xbe, 0xa4, 0x47, 0x7e, + 0x57, 0xee, 0xa3, 0x99, 0x29, 0xf3, 0x52, 0xf5, 0x24, 0x7e, 0xce, 0xdd, 0x58, 0x4d, 0x3e, 0x15, + 0x83, 0x91, 0x6f, 0xeb, 0x0f, 0x19, 0x58, 0x95, 0xb7, 0x76, 0xbc, 0x4f, 0x1c, 0xc0, 0x05, 0x36, + 0xe8, 0xca, 0x9b, 0x52, 0xd8, 0xd9, 0x9e, 0xfe, 0xee, 0xda, 0x47, 0xd7, 0xbb, 0x83, 0x8c, 0x21, + 0xf9, 0xb0, 0x87, 0x2a, 0xfa, 0x42, 0x7d, 0xe4, 0x75, 0x97, 0x19, 0x7d, 0xdd, 0xf1, 0x3a, 0x89, + 0x7a, 0x84, 0x3f, 0x81, 0xa5, 0xbf, 0xaa, 0xa5, 0x2e, 0x4a, 0xaa, 0x0a, 0xb7, 0xf9, 0x36, 0x94, + 0xfc, 0x90, 0x4b, 0xf8, 0x7d, 0x74, 0xf8, 0x56, 0x95, 0xe8, 0xd8, 0x72, 0x45, 0x5b, 0x8d, 0xf9, + 0x07, 0x61, 0xa2, 0x61, 0x7f, 0x13, 0x0f, 0x97, 0x7f, 0x19, 0xb0, 0x36, 0x1e, 0x2f, 0x55, 0x0e, + 0x5f, 0x53, 0xc0, 0x52, 0x3b, 0x64, 0xe6, 0x6b, 0xec, 0x90, 0x69, 0x58, 0xb3, 0x69, 0x58, 0xff, + 0x66, 0xc0, 0xfa, 0xbd, 0x1e, 0x39, 0xc4, 0x6f, 0x63, 0x75, 0x58, 0x65, 0x28, 0x4d, 0x82, 0x1b, + 0xf6, 0xd7, 0xf5, 0xbb, 0xf8, 0x2d, 0x45, 0xfe, 0x8d, 0xdc, 0x8b, 0x5d, 0x28, 0x4d, 0x06, 0xec, + 0xc5, 0xde, 0x17, 0xd6, 0xa7, 0x06, 0x5c, 0xb6, 0xb1, 0x4d, 0x90, 0x1e, 0xe9, 0xc1, 0x2a, 0x0a, + 0xf6, 0x25, 0xff, 0x76, 0x5b, 0x81, 0x2b, 0xe9, 0x5e, 0x0c, 0x8b, 0xe3, 0x15, 0x1b, 0x29, 0x86, + 0xde, 0xd8, 0x55, 0xa3, 0x89, 0x9f, 0x42, 0x87, 0x3f, 0xef, 0xc5, 0xbf, 0xed, 0xe6, 0x63, 0x5a, + 0xdd, 0x33, 0x5f, 0x85, 0x7c, 0xbc, 0x6e, 0xa8, 0x0a, 0x58, 0xb0, 0x41, 0x93, 0xea, 0x9e, 0xb9, + 0x0a, 0xb3, 0xa4, 0x17, 0xea, 0x17, 0xeb, 0x82, 0x9d, 0x23, 0xbd, 0x50, 0xd6, 0x06, 0xc1, 0x20, + 0x62, 0xc3, 0xda, 0x90, 0xbf, 0xe8, 0x2d, 0x4a, 0xaa, 0xae, 0x8d, 0xc9, 0x77, 0x6f, 0x2e, 0xe5, + 0xdd, 0xfb, 0x1a, 0x2c, 0x4a, 0xa9, 0xd1, 0x17, 0xaa, 0x14, 0x3a, 0xeb, 0xb1, 0x3b, 0x37, 0xf1, + 0xd8, 0x7d, 0x15, 0xf2, 0x5c, 0x42, 0x1b, 0x99, 0x8f, 0x05, 0x94, 0x09, 0xab, 0x0a, 0x95, 0xb3, + 0x02, 0x26, 0x63, 0xba, 0xdb, 0x79, 0xf2, 0xb4, 0x32, 0xf3, 0xc5, 0xd3, 0xca, 0xcc, 0x97, 0x4f, + 0x2b, 0xc6, 0xcf, 0x4f, 0x2b, 0xc6, 0xef, 0x4e, 0x2b, 0xc6, 0xe7, 0xa7, 0x15, 0xe3, 0xc9, 0x69, + 0xc5, 0xf8, 0xc7, 0x69, 0xc5, 0xf8, 0xe7, 0x69, 0x65, 0xe6, 0xcb, 0xd3, 0x8a, 0xf1, 0xd9, 0xb3, + 0xca, 0xcc, 0x93, 0x67, 0x95, 0x99, 0x2f, 0x9e, 0x55, 0x66, 0x7e, 0xfc, 0xd6, 0x61, 0x34, 0xcc, + 0xb0, 0x1f, 0x4d, 0xf9, 0xdf, 0xce, 0xf7, 0x92, 0xdf, 0xcd, 0x59, 0xf1, 0x0f, 0x83, 0x9b, 0xff, + 0x09, 0x00, 0x00, 0xff, 0xff, 0xe1, 0xba, 0x3e, 0x82, 0x16, 0x1a, 0x00, 0x00, } func (this *DescribeWorkflowExecutionRequest) Equal(that interface{}) bool { @@ -2186,6 +2194,9 @@ func (this *DescribeHistoryHostRequest) Equal(that interface{}) bool { if this.ShardIdForHost != that1.ShardIdForHost { return false } + if this.Namespace != that1.Namespace { + return false + } if !this.ExecutionForHost.Equal(that1.ExecutionForHost) { return false } @@ -3153,10 +3164,11 @@ func (this *DescribeHistoryHostRequest) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 7) + s := make([]string, 0, 8) s = append(s, "&adminservice.DescribeHistoryHostRequest{") s = append(s, "HostAddress: "+fmt.Sprintf("%#v", this.HostAddress)+",\n") s = append(s, "ShardIdForHost: "+fmt.Sprintf("%#v", this.ShardIdForHost)+",\n") + s = append(s, "Namespace: "+fmt.Sprintf("%#v", this.Namespace)+",\n") if this.ExecutionForHost != nil { s = append(s, "ExecutionForHost: "+fmt.Sprintf("%#v", this.ExecutionForHost)+",\n") } @@ -3718,6 +3730,13 @@ func (m *DescribeHistoryHostRequest) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintRequestResponse(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x22 + } + 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] = 0x1a } if m.ShardIdForHost != 0 { @@ -5137,6 +5156,10 @@ func (m *DescribeHistoryHostRequest) Size() (n int) { if m.ShardIdForHost != 0 { n += 1 + sovRequestResponse(uint64(m.ShardIdForHost)) } + l = len(m.Namespace) + if l > 0 { + n += 1 + l + sovRequestResponse(uint64(l)) + } if m.ExecutionForHost != nil { l = m.ExecutionForHost.Size() n += 1 + l + sovRequestResponse(uint64(l)) @@ -5772,6 +5795,7 @@ func (this *DescribeHistoryHostRequest) String() string { s := strings.Join([]string{`&DescribeHistoryHostRequest{`, `HostAddress:` + fmt.Sprintf("%v", this.HostAddress) + `,`, `ShardIdForHost:` + fmt.Sprintf("%v", this.ShardIdForHost) + `,`, + `Namespace:` + fmt.Sprintf("%v", this.Namespace) + `,`, `ExecutionForHost:` + strings.Replace(fmt.Sprintf("%v", this.ExecutionForHost), "WorkflowExecution", "v1.WorkflowExecution", 1) + `,`, `}`, }, "") @@ -6584,6 +6608,38 @@ func (m *DescribeHistoryHostRequest) Unmarshal(dAtA []byte) error { } } case 3: + 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 + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ExecutionForHost", wireType) } diff --git a/api/historyservice/v1/request_response.pb.go b/api/historyservice/v1/request_response.pb.go index 18edadcf876..a2968f5e15a 100644 --- a/api/historyservice/v1/request_response.pb.go +++ b/api/historyservice/v1/request_response.pb.go @@ -3408,7 +3408,8 @@ type DescribeHistoryHostRequest struct { //ip:port HostAddress string `protobuf:"bytes,1,opt,name=host_address,json=hostAddress,proto3" json:"host_address,omitempty"` ShardIdForHost int32 `protobuf:"varint,2,opt,name=shard_id_for_host,json=shardIdForHost,proto3" json:"shard_id_for_host,omitempty"` - ExecutionForHost *v14.WorkflowExecution `protobuf:"bytes,3,opt,name=execution_for_host,json=executionForHost,proto3" json:"execution_for_host,omitempty"` + NamespaceId string `protobuf:"bytes,3,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"` + ExecutionForHost *v14.WorkflowExecution `protobuf:"bytes,4,opt,name=execution_for_host,json=executionForHost,proto3" json:"execution_for_host,omitempty"` } func (m *DescribeHistoryHostRequest) Reset() { *m = DescribeHistoryHostRequest{} } @@ -3457,6 +3458,13 @@ func (m *DescribeHistoryHostRequest) GetShardIdForHost() int32 { return 0 } +func (m *DescribeHistoryHostRequest) GetNamespaceId() string { + if m != nil { + return m.NamespaceId + } + return "" +} + func (m *DescribeHistoryHostRequest) GetExecutionForHost() *v14.WorkflowExecution { if m != nil { return m.ExecutionForHost @@ -4625,256 +4633,256 @@ func init() { } var fileDescriptor_b8c78c1d460a3711 = []byte{ - // 3977 bytes of a gzipped FileDescriptorProto + // 3983 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x3c, 0x4b, 0x70, 0x1c, 0xe9, 0x59, 0x6e, 0x8d, 0x5e, 0xf3, 0x69, 0x34, 0x9a, 0x69, 0xbd, 0x46, 0xb2, 0x3d, 0x96, 0xda, 0xd6, 0x5a, 0x9b, 0x8d, 0xc7, 0x6b, 0x3b, 0xec, 0xc3, 0x24, 0x01, 0x4b, 0x96, 0xd6, 0x53, 0x65, 0x7b, 0xb5, 0x2d, 0x65, 0x4d, 0x39, 0x09, 0xbd, 0xad, 0xee, 0x7f, 0x34, 0x8d, 0x7a, 0xba, 0x67, 0xfb, 0xef, 0x91, 0x34, 0x4b, 0x01, 0xa1, 0x52, 0x50, 0x84, 0x03, 0x95, 0x2a, 0x8a, 0x13, 0x9c, 0x38, - 0x40, 0x2e, 0x14, 0x07, 0x0e, 0x54, 0x0e, 0x5c, 0xa0, 0x8a, 0xe2, 0x96, 0x85, 0x53, 0x0a, 0x2e, - 0xac, 0xf7, 0x02, 0x95, 0x1c, 0x72, 0xe0, 0x4a, 0x15, 0xf5, 0xbf, 0xfa, 0x31, 0xdd, 0x3d, 0x0f, - 0xcb, 0x8b, 0x93, 0xcd, 0xde, 0x34, 0xff, 0xf7, 0xf8, 0xff, 0xef, 0xfd, 0x3f, 0xbe, 0x16, 0x7c, - 0xd5, 0x47, 0xad, 0xb6, 0xeb, 0xe9, 0xf6, 0x4d, 0x8c, 0xbc, 0x13, 0xe4, 0xdd, 0xd4, 0xdb, 0xd6, - 0xcd, 0xa6, 0x85, 0x7d, 0xd7, 0xeb, 0x92, 0x11, 0xcb, 0x40, 0x37, 0x4f, 0x6e, 0xdd, 0xf4, 0xd0, - 0x87, 0x1d, 0x84, 0x7d, 0xcd, 0x43, 0xb8, 0xed, 0x3a, 0x18, 0xd5, 0xda, 0x9e, 0xeb, 0xbb, 0xf2, - 0x86, 0xa0, 0xae, 0x31, 0xea, 0x9a, 0xde, 0xb6, 0x6a, 0x71, 0xea, 0xda, 0xc9, 0xad, 0xd5, 0x6b, - 0xc1, 0x24, 0x84, 0xbb, 0xe1, 0xb6, 0x5a, 0xae, 0x43, 0xb8, 0xb6, 0x10, 0xc6, 0xfa, 0x11, 0x67, - 0xb6, 0xba, 0x11, 0xc3, 0xe2, 0x5c, 0x92, 0x68, 0xd7, 0x63, 0x68, 0xbe, 0x8e, 0x8f, 0x3f, 0xec, - 0xa0, 0x0e, 0x4a, 0x22, 0xc6, 0x67, 0x45, 0x4e, 0xa7, 0x85, 0x09, 0xd2, 0xa9, 0xeb, 0x1d, 0x37, - 0x6c, 0xf7, 0x94, 0x63, 0xbd, 0x12, 0xc3, 0x12, 0xc0, 0x24, 0xb7, 0xab, 0x31, 0xbc, 0x0f, 0x3b, - 0x28, 0x6d, 0x6d, 0x71, 0x11, 0x1a, 0xba, 0x65, 0x77, 0xbc, 0x94, 0x95, 0x7d, 0xb9, 0x8f, 0xd2, - 0x93, 0xd8, 0xaf, 0xa6, 0x61, 0x07, 0xe2, 0x30, 0x6d, 0x72, 0xd4, 0xd7, 0xfa, 0xa2, 0xf6, 0x48, - 0x7e, 0xbd, 0x2f, 0x32, 0x51, 0x2c, 0x47, 0xbc, 0x91, 0x86, 0x98, 0xad, 0xa9, 0x5a, 0x1a, 0xba, - 0xa3, 0xb7, 0x10, 0x6e, 0xeb, 0x46, 0x8a, 0x36, 0x5e, 0x4f, 0xc3, 0xf7, 0x50, 0xdb, 0xb6, 0x0c, - 0xdd, 0xb7, 0xd2, 0x3c, 0xe5, 0x8d, 0x54, 0x9b, 0x0d, 0x74, 0xd7, 0xd5, 0xbb, 0x69, 0x33, 0xe9, - 0x66, 0xcb, 0x72, 0x06, 0xd2, 0x2a, 0x9f, 0x4c, 0xc0, 0xe5, 0x7d, 0x5f, 0xf7, 0xfc, 0x27, 0x7c, - 0xba, 0x9d, 0x33, 0x64, 0x74, 0xc8, 0xfa, 0x54, 0x46, 0x20, 0xaf, 0x43, 0x21, 0x90, 0x52, 0xb3, - 0xcc, 0x8a, 0xb4, 0x26, 0x6d, 0xe6, 0xd5, 0x99, 0x60, 0xac, 0x6e, 0xca, 0x06, 0xcc, 0x62, 0xc2, - 0x43, 0xe3, 0x93, 0x54, 0xc6, 0xd6, 0xa4, 0xcd, 0x99, 0xdb, 0x5f, 0x0f, 0x54, 0x46, 0x03, 0xa8, - 0x47, 0xa0, 0xda, 0xc9, 0xad, 0x5a, 0xdf, 0x99, 0xd5, 0x02, 0x65, 0x2a, 0xd6, 0xd1, 0x84, 0xc5, - 0xb6, 0xee, 0x21, 0xc7, 0xd7, 0x90, 0x40, 0xd4, 0x2c, 0xa7, 0xe1, 0x56, 0x72, 0x74, 0xb2, 0xaf, - 0xd4, 0xd2, 0x82, 0x36, 0xf0, 0x8d, 0x93, 0x5b, 0xb5, 0x3d, 0x4a, 0x1d, 0xcc, 0x52, 0x77, 0x1a, - 0xae, 0x3a, 0xdf, 0x4e, 0x0e, 0xca, 0x15, 0x98, 0xd2, 0x7d, 0xc2, 0xcd, 0xaf, 0x8c, 0xaf, 0x49, - 0x9b, 0x13, 0xaa, 0xf8, 0x29, 0x7f, 0x03, 0xae, 0x0b, 0x8e, 0x91, 0x55, 0xa0, 0xb3, 0xb6, 0xe5, - 0x51, 0x9b, 0x6a, 0xbe, 0xd5, 0x42, 0xd8, 0xd7, 0x5b, 0xed, 0xca, 0xc4, 0x9a, 0xb4, 0x99, 0x53, - 0xaf, 0x9d, 0xf6, 0x0a, 0xb7, 0x13, 0x20, 0x1f, 0x08, 0x5c, 0xb9, 0x09, 0x2b, 0x86, 0xeb, 0xf8, - 0x96, 0xd3, 0x41, 0x9a, 0x8e, 0x35, 0x07, 0x9d, 0x6a, 0x96, 0x63, 0xf9, 0x96, 0xee, 0xbb, 0x5e, - 0x65, 0x72, 0x4d, 0xda, 0x2c, 0xde, 0xbe, 0x11, 0xd7, 0x25, 0xf5, 0x67, 0x22, 0xd4, 0x36, 0xa7, - 0xbb, 0x87, 0x1f, 0xa3, 0xd3, 0xba, 0x20, 0x52, 0x97, 0x8c, 0xd4, 0x71, 0xf9, 0x11, 0x94, 0x05, - 0xc4, 0xd4, 0x78, 0x20, 0x57, 0xa6, 0xa8, 0x02, 0xd7, 0xe2, 0x33, 0x70, 0x20, 0x99, 0x63, 0x97, - 0xfd, 0xa9, 0x96, 0x02, 0x52, 0x3e, 0x22, 0xbf, 0x0f, 0x4b, 0xb6, 0x8e, 0x7d, 0xcd, 0x70, 0x5b, - 0x6d, 0x1b, 0x51, 0x0d, 0x78, 0x08, 0x77, 0x6c, 0xbf, 0x32, 0x9d, 0xc6, 0x93, 0x07, 0x35, 0xb5, - 0x45, 0xd7, 0x76, 0x75, 0x13, 0xab, 0x0b, 0x84, 0x7e, 0x3b, 0x20, 0x57, 0x29, 0xb5, 0xfc, 0x10, - 0xae, 0x36, 0x2c, 0x0f, 0xfb, 0x5a, 0xa0, 0x6d, 0x12, 0xb7, 0xda, 0xa1, 0x6e, 0x1c, 0xbb, 0x8d, - 0x86, 0x86, 0x91, 0xe1, 0x3a, 0x26, 0xae, 0xe4, 0xa9, 0x75, 0xae, 0x50, 0x54, 0xe1, 0x45, 0x07, - 0x3a, 0x3e, 0xde, 0x62, 0x78, 0xfb, 0x0c, 0x4d, 0x79, 0x13, 0xaa, 0x59, 0x8e, 0xc6, 0x62, 0x41, - 0x5e, 0x84, 0x49, 0xaf, 0xe3, 0x84, 0xde, 0x3d, 0xe1, 0x75, 0x9c, 0xba, 0xa9, 0xfc, 0x44, 0x82, - 0xa5, 0x77, 0x90, 0xff, 0xa8, 0xe3, 0xeb, 0x87, 0x36, 0xda, 0xf7, 0x75, 0x1f, 0x8d, 0x10, 0x15, - 0xef, 0x40, 0x3e, 0xf0, 0x11, 0x1e, 0x11, 0xaf, 0x66, 0xe9, 0x23, 0xb9, 0xb4, 0x90, 0x56, 0xbe, - 0x03, 0x4b, 0xe8, 0xac, 0x8d, 0x0c, 0x1f, 0x99, 0x9a, 0x83, 0xce, 0x7c, 0x0d, 0x9d, 0x90, 0x30, - 0xb0, 0x4c, 0xea, 0xfa, 0x39, 0x75, 0x5e, 0x40, 0x1f, 0xa3, 0x33, 0x7f, 0x87, 0xc0, 0xea, 0xa6, - 0xfc, 0x3a, 0x2c, 0x18, 0x1d, 0x8f, 0xc6, 0xcb, 0xa1, 0xa7, 0x3b, 0x46, 0x53, 0xf3, 0xdd, 0x63, - 0xe4, 0x50, 0x8f, 0x2e, 0xa8, 0x32, 0x87, 0x6d, 0x51, 0xd0, 0x01, 0x81, 0x28, 0x3f, 0x01, 0x58, - 0x4e, 0x48, 0xcb, 0x15, 0x14, 0x93, 0x45, 0x3a, 0x87, 0x2c, 0x75, 0x98, 0x0d, 0x6d, 0xda, 0x6d, - 0x23, 0xae, 0x98, 0x6b, 0x83, 0x98, 0x1d, 0x74, 0xdb, 0x48, 0x2d, 0x9c, 0x46, 0x7e, 0xc9, 0x0a, - 0xcc, 0xa6, 0x69, 0x63, 0xc6, 0x89, 0x68, 0xe1, 0x6d, 0x58, 0x69, 0x7b, 0xe8, 0xc4, 0x72, 0x3b, - 0x58, 0xa3, 0xd9, 0x04, 0x99, 0x21, 0xfe, 0x38, 0xc5, 0x5f, 0x12, 0x08, 0xfb, 0x0c, 0x2e, 0x48, - 0x6f, 0xc0, 0x3c, 0xf5, 0x6d, 0xe6, 0x88, 0x01, 0x11, 0x8b, 0xeb, 0x12, 0x01, 0xed, 0x12, 0x88, - 0x40, 0xdf, 0x06, 0xa0, 0x3e, 0x4a, 0xab, 0x36, 0x0d, 0xda, 0x84, 0x54, 0x41, 0x51, 0x27, 0x82, - 0x11, 0x3f, 0x7d, 0x8f, 0xfc, 0x50, 0xf3, 0xbe, 0xf8, 0x53, 0xde, 0x83, 0x32, 0xf6, 0x2d, 0xe3, - 0xb8, 0xab, 0x45, 0x78, 0x4d, 0x8d, 0xc0, 0x6b, 0x8e, 0x91, 0x07, 0x03, 0xf2, 0x57, 0x60, 0xc9, - 0xb0, 0x2d, 0xb2, 0x76, 0xdb, 0x3a, 0xf4, 0x74, 0xaf, 0xab, 0x9d, 0x20, 0x0f, 0x13, 0x2b, 0x4e, - 0x53, 0x8f, 0x5d, 0x60, 0xd0, 0x87, 0x0c, 0xf8, 0x3e, 0x83, 0x45, 0xa8, 0x1a, 0x48, 0xf7, 0x3b, - 0x1e, 0x0a, 0xa8, 0xf2, 0x51, 0xaa, 0x5d, 0x06, 0x14, 0x54, 0x57, 0x60, 0x86, 0x53, 0x59, 0xad, - 0xb6, 0x5d, 0x01, 0x8a, 0x0a, 0x6c, 0xa8, 0xde, 0x6a, 0xdb, 0xf2, 0x53, 0x78, 0x2d, 0x21, 0x9e, - 0x86, 0x8d, 0x26, 0x32, 0x3b, 0x36, 0xd2, 0x7c, 0x97, 0x99, 0x88, 0x26, 0x51, 0xb7, 0xe3, 0x57, - 0x66, 0x68, 0x78, 0x6f, 0xf4, 0x88, 0xb4, 0xcf, 0xf1, 0x0f, 0x5c, 0x6a, 0xb0, 0x03, 0x86, 0x2c, - 0xd7, 0x60, 0x9e, 0xd9, 0x88, 0x6c, 0x37, 0xc2, 0xf5, 0x16, 0x28, 0x8f, 0x32, 0x05, 0xed, 0x13, - 0x88, 0x58, 0x6c, 0x56, 0x7c, 0xcc, 0x66, 0xc5, 0x87, 0xfc, 0xbb, 0x50, 0x8a, 0x94, 0x6f, 0x56, - 0x7b, 0x8a, 0x6b, 0xb9, 0xcd, 0x99, 0xdb, 0xfb, 0xb5, 0xa1, 0x36, 0x8c, 0xb5, 0x8c, 0xe8, 0xaa, - 0xa9, 0x21, 0x5b, 0x52, 0x80, 0x76, 0x1c, 0xdf, 0xeb, 0xaa, 0x73, 0x5e, 0x7c, 0x54, 0xfe, 0x26, - 0x14, 0x83, 0xd0, 0xc1, 0x84, 0xbe, 0x32, 0x47, 0x4b, 0x43, 0x7a, 0xe5, 0x0b, 0x2a, 0x44, 0x22, - 0x1c, 0xd9, 0xdc, 0x41, 0x18, 0xd2, 0x9f, 0xf2, 0x13, 0x98, 0x8b, 0x31, 0xef, 0xe0, 0x4a, 0x89, - 0x72, 0xaf, 0x65, 0x14, 0x9e, 0x54, 0xb6, 0x1d, 0xac, 0x16, 0xa3, 0x7c, 0x3b, 0x58, 0xfe, 0x36, - 0x94, 0xb9, 0x2d, 0x34, 0xa6, 0x10, 0x0b, 0xe1, 0x4a, 0x99, 0xba, 0xf4, 0xeb, 0xfd, 0xd4, 0x46, - 0xe6, 0xe0, 0xb6, 0x7a, 0x20, 0xe8, 0xd4, 0xd2, 0x49, 0xcf, 0x88, 0xfc, 0x75, 0xb8, 0x64, 0x91, - 0xd0, 0xee, 0xf5, 0x2a, 0xe4, 0x10, 0x35, 0x9b, 0x15, 0x79, 0x4d, 0xda, 0x9c, 0x56, 0x2b, 0x16, - 0xde, 0x8f, 0x7b, 0xd1, 0x0e, 0x83, 0xaf, 0x9e, 0xc2, 0x42, 0x9a, 0xf6, 0xe5, 0x12, 0xe4, 0x8e, - 0x51, 0x97, 0xa7, 0x75, 0xf2, 0xa7, 0x5c, 0x87, 0x89, 0x13, 0xdd, 0xee, 0x88, 0x8c, 0x75, 0x27, - 0x75, 0xf1, 0x11, 0x9b, 0x11, 0x01, 0x7a, 0x58, 0xab, 0x8c, 0xc3, 0xdd, 0xb1, 0xb7, 0x24, 0xe5, - 0xa7, 0x12, 0x2c, 0xef, 0xb9, 0xb6, 0xfd, 0x4b, 0x52, 0x5c, 0xfe, 0x37, 0x0f, 0x95, 0xa4, 0xb8, - 0x5f, 0x54, 0x97, 0x2f, 0xaa, 0xcb, 0x2f, 0x44, 0x75, 0xc9, 0x72, 0xf8, 0x42, 0x66, 0xb5, 0xf8, - 0xbd, 0x94, 0x6a, 0x31, 0x4b, 0xab, 0xc5, 0xc1, 0x90, 0xd5, 0x22, 0x2b, 0x5c, 0x86, 0x2c, 0x17, - 0xa9, 0x89, 0xb7, 0xf8, 0xc2, 0x12, 0xef, 0x2f, 0x64, 0x35, 0x7a, 0x79, 0xe9, 0xfe, 0x7b, 0x12, - 0x5c, 0x54, 0x11, 0x46, 0x7e, 0x4f, 0x1d, 0x7a, 0x09, 0x29, 0x5f, 0xa9, 0xc2, 0xa5, 0xf4, 0xa5, - 0x30, 0xff, 0x52, 0xfe, 0x7d, 0x0c, 0xd6, 0x54, 0x64, 0xb8, 0x9e, 0x19, 0x3d, 0x54, 0xf1, 0x04, - 0x36, 0xc2, 0x82, 0x7f, 0x03, 0xe4, 0xe4, 0x69, 0x79, 0xf4, 0x95, 0x97, 0x13, 0x67, 0x68, 0x92, - 0x0b, 0x82, 0xc0, 0x0e, 0x52, 0x33, 0x88, 0xa1, 0xba, 0x29, 0x2f, 0xc3, 0x14, 0x4d, 0x02, 0x41, - 0x1e, 0x9e, 0x24, 0x3f, 0xeb, 0xa6, 0x7c, 0x19, 0x40, 0xdc, 0x84, 0xf0, 0x74, 0x9b, 0x57, 0xf3, - 0x7c, 0xa4, 0x6e, 0xca, 0x1f, 0x40, 0xa1, 0xed, 0xda, 0x76, 0x70, 0x91, 0xc1, 0x32, 0xed, 0xd7, - 0x06, 0x5e, 0x64, 0x90, 0x58, 0x8d, 0x2a, 0x2b, 0x6a, 0x5b, 0x75, 0x86, 0xb0, 0xe4, 0x3f, 0x94, - 0x1f, 0x4d, 0xc1, 0x7a, 0x1f, 0xe5, 0xf2, 0x8a, 0x98, 0x28, 0x64, 0xd2, 0x73, 0x17, 0xb2, 0xbe, - 0x45, 0x6a, 0xac, 0x6f, 0x91, 0xfa, 0x32, 0xc8, 0x42, 0xa7, 0x66, 0x6f, 0x21, 0x2c, 0x05, 0x10, - 0x81, 0xbd, 0x09, 0xa5, 0x8c, 0x22, 0x58, 0xc4, 0x71, 0xbe, 0x89, 0xda, 0x3a, 0x91, 0xac, 0xad, - 0x91, 0x4b, 0x98, 0x49, 0x0a, 0x0d, 0x2e, 0x61, 0xde, 0x82, 0x0a, 0xcf, 0xf3, 0x91, 0x2b, 0x18, - 0xbe, 0xdd, 0x9b, 0xa2, 0xdb, 0xbd, 0x25, 0x06, 0x0f, 0xef, 0x5c, 0x18, 0x54, 0x3e, 0x8a, 0x38, - 0x24, 0x73, 0x0f, 0x92, 0x95, 0xd9, 0x55, 0xc5, 0xdb, 0x83, 0x72, 0xe2, 0x81, 0xa7, 0x3b, 0x98, - 0x14, 0x9b, 0xa8, 0xdd, 0x68, 0x98, 0x97, 0x4e, 0x7b, 0x46, 0xe4, 0x23, 0xb8, 0x9c, 0x72, 0x4f, - 0x14, 0xa9, 0xba, 0xf9, 0x11, 0xaa, 0xee, 0x6a, 0xc2, 0xff, 0xc3, 0x02, 0x9c, 0x71, 0xea, 0x81, - 0xac, 0x53, 0xcf, 0x3a, 0x14, 0x62, 0xf5, 0x6b, 0x86, 0xd6, 0xaf, 0x99, 0xc3, 0x48, 0xe1, 0xba, - 0x09, 0xf3, 0xa1, 0xd1, 0xc3, 0xfb, 0xac, 0x02, 0x35, 0x42, 0xe8, 0x0f, 0xe1, 0xed, 0xd5, 0x6b, - 0x64, 0x5b, 0xc1, 0xec, 0x1e, 0xa2, 0xcf, 0x72, 0x27, 0x61, 0x80, 0x10, 0xd9, 0x85, 0xa9, 0x0f, - 0x3b, 0x88, 0xd7, 0x22, 0x52, 0x0d, 0xbf, 0x31, 0x64, 0x35, 0x1c, 0x18, 0x33, 0xb5, 0xf7, 0x18, - 0x5f, 0x56, 0x0e, 0xc5, 0x2c, 0xab, 0x1f, 0x40, 0x21, 0x0a, 0x48, 0xc9, 0xf4, 0x77, 0xe3, 0x99, - 0xbe, 0xc7, 0x28, 0xf4, 0x4a, 0x3c, 0x1a, 0x62, 0x84, 0x5b, 0x37, 0x9a, 0xda, 0xc3, 0x74, 0x79, - 0xcf, 0xf0, 0xad, 0x13, 0xcb, 0xef, 0x7e, 0x91, 0x2e, 0x87, 0x48, 0x97, 0x51, 0x65, 0x65, 0xa7, - 0xcb, 0x7f, 0xcd, 0x89, 0x74, 0x99, 0xaa, 0x5c, 0x9e, 0x2e, 0x1f, 0xc3, 0x5c, 0x4f, 0xa2, 0xe2, - 0x09, 0x73, 0x23, 0xbe, 0x94, 0x48, 0x38, 0xb3, 0x9d, 0x4c, 0x97, 0xa6, 0x1b, 0xb5, 0x18, 0x4f, - 0x66, 0xe9, 0x2e, 0x3d, 0x96, 0xe1, 0xd2, 0x91, 0x4c, 0x95, 0x8b, 0x67, 0xaa, 0x87, 0x70, 0x35, - 0x25, 0x94, 0x34, 0xb7, 0xa1, 0xf9, 0x4d, 0x0b, 0x6b, 0xd1, 0x4b, 0xe6, 0x9c, 0x7a, 0x25, 0x19, - 0x5a, 0xef, 0x36, 0x0e, 0x9a, 0x16, 0xbe, 0xc7, 0xb9, 0x3d, 0x82, 0x72, 0x13, 0xe9, 0x9e, 0x7f, - 0x88, 0x74, 0x5f, 0x33, 0x91, 0xaf, 0x5b, 0x36, 0xa6, 0x26, 0x19, 0xe6, 0x9e, 0xb5, 0x14, 0x90, - 0xde, 0x67, 0x94, 0xc9, 0x12, 0x33, 0xf9, 0xdc, 0x25, 0xe6, 0x46, 0xc4, 0x73, 0x03, 0x8f, 0xa6, - 0xb9, 0x38, 0x1f, 0xba, 0xe3, 0x63, 0x01, 0x50, 0x7e, 0x28, 0xc1, 0x55, 0x66, 0xba, 0x58, 0x3c, - 0xf3, 0x5b, 0xe0, 0x91, 0x62, 0xc6, 0x85, 0x12, 0xbf, 0x7b, 0x46, 0x3d, 0x8f, 0x0f, 0xf7, 0x07, - 0x3a, 0xe1, 0x10, 0x4b, 0x50, 0xe7, 0x04, 0x77, 0xe1, 0x8f, 0x7f, 0x2e, 0xc1, 0xb5, 0xfe, 0x84, - 0xdc, 0x25, 0x71, 0x58, 0x0d, 0xc5, 0x93, 0x0b, 0xf7, 0xc9, 0x07, 0x2f, 0x2a, 0xe3, 0x91, 0xf3, - 0x58, 0x6c, 0x40, 0xf9, 0x5b, 0x89, 0xa4, 0xa2, 0xc4, 0xea, 0x76, 0x75, 0xcb, 0x1e, 0x49, 0xad, - 0x4d, 0x28, 0x36, 0x28, 0x4d, 0x8f, 0x52, 0xef, 0x3d, 0x8f, 0x52, 0x63, 0xb3, 0xab, 0xb3, 0x8d, - 0xe8, 0x4f, 0xe5, 0x2a, 0x09, 0xef, 0x4c, 0x12, 0x2e, 0xd6, 0x0f, 0x25, 0x50, 0x92, 0x49, 0xe0, - 0x81, 0xf0, 0xe8, 0x11, 0x04, 0x6b, 0x47, 0x63, 0x28, 0x2e, 0xdb, 0xf6, 0x10, 0xb2, 0x0d, 0x5a, - 0x42, 0x24, 0xcc, 0x84, 0x80, 0x7b, 0xc4, 0xd7, 0xfb, 0xd0, 0x71, 0x77, 0x79, 0x15, 0x4a, 0x86, - 0xee, 0x18, 0x28, 0xc8, 0xa5, 0x88, 0xad, 0x7f, 0x5a, 0x9d, 0x63, 0xe3, 0xaa, 0x18, 0x8e, 0x86, - 0x4f, 0x94, 0xe7, 0x4b, 0x0a, 0x9f, 0x7e, 0x4b, 0x48, 0x86, 0xcf, 0x2b, 0x41, 0xf4, 0x64, 0xd0, - 0x25, 0x1d, 0x39, 0x8a, 0xf8, 0xff, 0xef, 0xc8, 0x99, 0xb3, 0x67, 0x3b, 0x72, 0x1a, 0x09, 0x17, - 0xeb, 0xef, 0xa8, 0x23, 0x27, 0xe5, 0xa7, 0x16, 0x1e, 0x49, 0xb0, 0xdf, 0x82, 0x62, 0xdc, 0x5f, - 0x46, 0xf0, 0xe2, 0x41, 0xf3, 0xab, 0xb3, 0x31, 0x97, 0x53, 0x36, 0xd2, 0xfd, 0x2d, 0x20, 0xe2, - 0xc2, 0xfd, 0xf3, 0x18, 0x54, 0xf7, 0xad, 0x23, 0x47, 0xb7, 0xcf, 0xf3, 0x96, 0xdc, 0x80, 0x22, - 0xa6, 0x4c, 0x7a, 0x04, 0xfb, 0xb5, 0xc1, 0x8f, 0xc9, 0x7d, 0xe7, 0x56, 0x67, 0x19, 0x5b, 0xb1, - 0x14, 0x0b, 0x2e, 0xa2, 0x33, 0x1f, 0x79, 0x64, 0xa6, 0x94, 0x6d, 0x57, 0x6e, 0xd4, 0x6d, 0xd7, - 0x8a, 0xe0, 0x96, 0x00, 0x91, 0x4d, 0xba, 0xd1, 0xb4, 0x6c, 0x33, 0x9c, 0xc7, 0x75, 0xec, 0x2e, - 0x2d, 0xfb, 0xd3, 0x6a, 0x99, 0x82, 0x04, 0xd1, 0xbb, 0x8e, 0xdd, 0x55, 0xd6, 0xe1, 0x4a, 0xa6, - 0x2c, 0x5c, 0xd7, 0xff, 0x26, 0xc1, 0x75, 0x8e, 0x63, 0xf9, 0xcd, 0x73, 0x3f, 0xe0, 0x7f, 0x57, - 0x82, 0x15, 0xae, 0xf5, 0x53, 0xcb, 0x6f, 0x6a, 0x69, 0xaf, 0xf9, 0x0f, 0x86, 0x35, 0xc0, 0xa0, - 0x05, 0xa9, 0x4b, 0x38, 0x8e, 0x28, 0xfc, 0xec, 0x1e, 0x6c, 0x0e, 0x66, 0xd1, 0xff, 0xc5, 0xf6, - 0x1f, 0x24, 0xb8, 0xa2, 0xa2, 0x96, 0x7b, 0x82, 0x18, 0xa7, 0xe7, 0xbc, 0x5d, 0xff, 0xec, 0xb6, - 0xe2, 0xf1, 0x0d, 0x75, 0xae, 0x67, 0x43, 0xad, 0x28, 0x24, 0xed, 0x65, 0x2d, 0x9f, 0xdb, 0xfe, - 0xef, 0x25, 0x58, 0x3f, 0x40, 0x5e, 0xcb, 0x72, 0x74, 0x1f, 0x9d, 0xc7, 0xea, 0x2e, 0x94, 0x7d, - 0xc1, 0xa7, 0xc7, 0xd8, 0x5b, 0x03, 0x8d, 0x3d, 0x70, 0x05, 0x6a, 0x29, 0x60, 0x2e, 0x0c, 0x7c, - 0x0d, 0x94, 0x7e, 0x64, 0x5c, 0xbe, 0xbf, 0x96, 0xe0, 0x32, 0xbd, 0x9f, 0x3a, 0x67, 0x4b, 0x8a, - 0x47, 0x78, 0x8c, 0xdc, 0x92, 0xd2, 0x77, 0x66, 0xb5, 0x40, 0x99, 0x0a, 0x79, 0xde, 0x84, 0x6a, - 0x16, 0x7a, 0x7f, 0x37, 0xfd, 0xd3, 0x1c, 0x6c, 0x70, 0x26, 0x2c, 0x8d, 0x9e, 0x47, 0xd4, 0x56, - 0x46, 0x29, 0xd8, 0x1d, 0x42, 0xd6, 0x21, 0x96, 0xd0, 0x53, 0x0d, 0xe4, 0xaf, 0x45, 0x12, 0x27, - 0xef, 0x52, 0x49, 0xde, 0x0e, 0x55, 0x04, 0x4a, 0x5d, 0x60, 0x88, 0x7b, 0x9d, 0x01, 0x79, 0x77, - 0xfc, 0xb3, 0xcf, 0xbb, 0x13, 0x59, 0x79, 0x77, 0x13, 0x5e, 0x19, 0xa4, 0x11, 0xee, 0xa2, 0x3f, - 0x92, 0xe0, 0xa2, 0x78, 0x29, 0x88, 0xee, 0x5b, 0x7f, 0x2e, 0x52, 0xcc, 0x1d, 0x58, 0xb2, 0xb0, - 0x96, 0xd2, 0x3f, 0x43, 0x6d, 0x33, 0xad, 0xce, 0x5b, 0x78, 0xb7, 0xb7, 0x63, 0x46, 0xa9, 0xc2, - 0xa5, 0x74, 0x81, 0xb8, 0xc4, 0xff, 0x33, 0x46, 0x76, 0x6e, 0x64, 0x1f, 0xbb, 0x4d, 0xf4, 0x16, - 0xcc, 0xf6, 0x3c, 0xbb, 0xce, 0xcf, 0x4e, 0xf4, 0x75, 0x28, 0x84, 0x2e, 0x19, 0xbe, 0xd9, 0x05, - 0x63, 0x75, 0x53, 0x7e, 0x0a, 0xf3, 0x62, 0x53, 0x6a, 0x9e, 0xc7, 0xef, 0xe4, 0x80, 0x4b, 0x38, - 0xfd, 0x5e, 0xb0, 0x9d, 0xa6, 0x77, 0x92, 0xf4, 0x1e, 0x62, 0x62, 0x94, 0x7b, 0x88, 0xb9, 0x90, - 0x9c, 0x0e, 0x28, 0xd7, 0x49, 0x9e, 0xe8, 0xab, 0x75, 0x6e, 0x9f, 0xbf, 0x94, 0x60, 0xed, 0x3e, - 0xc2, 0x86, 0x67, 0x1d, 0x9e, 0xab, 0x26, 0x7c, 0x13, 0xa6, 0x46, 0xdd, 0x29, 0x0f, 0x9a, 0x56, - 0x15, 0x1c, 0x95, 0x1f, 0xe4, 0x60, 0xbd, 0x0f, 0x36, 0xcf, 0x99, 0xdf, 0x82, 0x52, 0x78, 0x67, - 0x6a, 0xb8, 0x4e, 0xc3, 0x3a, 0xe2, 0x27, 0xe7, 0x5b, 0xe9, 0x6b, 0x49, 0x35, 0xd0, 0x36, 0x25, - 0x54, 0xe7, 0x50, 0x7c, 0x40, 0x3e, 0x82, 0xe5, 0x94, 0xab, 0x59, 0x7a, 0x11, 0xcc, 0x04, 0xbe, - 0x39, 0xc2, 0x24, 0xf4, 0xfa, 0x77, 0xf1, 0x34, 0x6d, 0x58, 0xfe, 0x16, 0xc8, 0x6d, 0xe4, 0x98, - 0x96, 0x73, 0xa4, 0xe9, 0x6c, 0xdb, 0x6c, 0x21, 0x5c, 0xc9, 0xd1, 0x4b, 0xcf, 0x1b, 0xd9, 0x73, - 0xec, 0x31, 0x1a, 0xb1, 0xd3, 0xa6, 0x33, 0x94, 0xdb, 0xb1, 0x41, 0x0b, 0x61, 0xf9, 0x37, 0xa1, - 0x24, 0xb8, 0xd3, 0x44, 0xe6, 0xd1, 0xd7, 0xf7, 0x5c, 0xfc, 0xa5, 0x2a, 0x83, 0x77, 0xdc, 0x97, - 0xe8, 0x0c, 0x73, 0xed, 0x08, 0xc8, 0x43, 0x8e, 0xf2, 0xdd, 0x29, 0x58, 0x12, 0xcf, 0x59, 0x88, - 0xfa, 0x22, 0x16, 0x5e, 0xb4, 0x01, 0x45, 0xec, 0x76, 0x3c, 0x03, 0x69, 0x86, 0xdd, 0xc1, 0x3e, - 0xf2, 0xb8, 0x1f, 0xcd, 0xb2, 0xd1, 0x6d, 0x36, 0x98, 0x70, 0xb6, 0xb1, 0x61, 0x13, 0x41, 0xee, - 0x05, 0x24, 0x82, 0x6b, 0x50, 0xec, 0x79, 0x59, 0x67, 0x97, 0x6c, 0x85, 0x46, 0xf4, 0x55, 0x7d, - 0xc8, 0x77, 0x08, 0x71, 0xab, 0xce, 0xdf, 0x21, 0xf8, 0x4f, 0xf9, 0x77, 0x52, 0x5e, 0x78, 0xa7, - 0xa8, 0x09, 0xd4, 0xa1, 0x6f, 0x78, 0xd2, 0x14, 0x3c, 0xe4, 0xfb, 0xee, 0x5d, 0x98, 0xe2, 0x1c, - 0xd3, 0x9b, 0x2d, 0x93, 0x39, 0x46, 0x15, 0x04, 0xf2, 0x03, 0x98, 0x73, 0xd0, 0xa9, 0x46, 0xb6, - 0x26, 0x82, 0x47, 0x7e, 0x48, 0x1e, 0xb3, 0x0e, 0x3a, 0x55, 0x3b, 0xfc, 0x21, 0xb8, 0x4b, 0x6a, - 0x6c, 0xc3, 0x25, 0xbe, 0x70, 0xd8, 0x69, 0x34, 0x90, 0xc7, 0x54, 0x89, 0xe9, 0x03, 0xc4, 0xb4, - 0x5a, 0xa6, 0xa0, 0x2d, 0x0a, 0x61, 0x22, 0x66, 0x3d, 0x58, 0xcc, 0x64, 0x3d, 0x58, 0x7c, 0x15, - 0x2e, 0x8a, 0x95, 0x66, 0xb7, 0x77, 0x2d, 0xb3, 0x35, 0xed, 0x24, 0xa8, 0x37, 0xa0, 0xc8, 0x76, - 0x81, 0xc2, 0x43, 0xe8, 0xbb, 0xc4, 0xb4, 0xca, 0xf6, 0x86, 0xc2, 0x93, 0xe4, 0x2a, 0xcc, 0x88, - 0x49, 0x1c, 0xd3, 0xa0, 0x8f, 0xe4, 0xd3, 0x6a, 0x9e, 0x31, 0x7d, 0x6c, 0x1a, 0x2f, 0xef, 0xd5, - 0x78, 0x05, 0x96, 0x13, 0x3e, 0xc2, 0x13, 0xfe, 0x1f, 0x4d, 0xc0, 0x4a, 0x00, 0x53, 0xf5, 0xd3, - 0x78, 0x8c, 0xbe, 0xd4, 0x2a, 0xfc, 0x1d, 0x29, 0x25, 0x32, 0x72, 0x23, 0xbe, 0xf6, 0x64, 0x48, - 0x36, 0x7a, 0x70, 0x8c, 0xf7, 0xbf, 0x21, 0xbf, 0xaf, 0xfb, 0xfa, 0x96, 0xed, 0x1e, 0xf6, 0x0d, - 0x8e, 0x89, 0x21, 0x79, 0x24, 0x83, 0x23, 0xcd, 0x69, 0x27, 0x9f, 0xd3, 0xd9, 0xa7, 0xfa, 0x3a, - 0xfb, 0xcb, 0xf3, 0xd2, 0x4b, 0xb0, 0x9a, 0x66, 0x2f, 0xee, 0xa8, 0xbf, 0x9f, 0x83, 0x4a, 0x8f, - 0x13, 0xbf, 0x7f, 0xfb, 0xe7, 0xc2, 0x4f, 0x1b, 0xb0, 0x18, 0xef, 0x90, 0xe9, 0x6a, 0x96, 0x8f, - 0x5a, 0xa2, 0x48, 0xdf, 0x1e, 0xa9, 0x4b, 0xa6, 0x5b, 0xf7, 0x51, 0x4b, 0x9d, 0x3f, 0x49, 0x8c, - 0x61, 0xf9, 0x2d, 0x98, 0xe4, 0x69, 0x71, 0x58, 0x5f, 0xe4, 0xf8, 0xf2, 0x2e, 0x14, 0x63, 0x0e, - 0x81, 0x87, 0xf6, 0xc4, 0x42, 0xc4, 0x4b, 0xb0, 0x72, 0x31, 0x92, 0x2b, 0x42, 0x13, 0x70, 0x03, - 0x9d, 0xc1, 0xd2, 0x7e, 0xd7, 0x31, 0xf6, 0x9b, 0xba, 0x67, 0xf2, 0xb6, 0x99, 0xd1, 0x2a, 0xfd, - 0x0a, 0x4c, 0x63, 0x42, 0x1c, 0x36, 0x14, 0x4c, 0xd1, 0xdf, 0x75, 0x53, 0xbe, 0x04, 0xf9, 0xf0, - 0x01, 0x8d, 0xed, 0xc6, 0xc3, 0x01, 0x92, 0xde, 0x12, 0x33, 0xf3, 0x45, 0xfd, 0x74, 0x1c, 0xe6, - 0x09, 0x4c, 0xec, 0x83, 0x46, 0x70, 0x98, 0x2b, 0x30, 0x13, 0x38, 0x4c, 0xb0, 0xef, 0x00, 0x31, - 0x54, 0x37, 0x23, 0x87, 0xf2, 0x5c, 0xe4, 0x50, 0x1e, 0xad, 0xf4, 0xe3, 0xf1, 0x4a, 0xbf, 0x0e, - 0x85, 0xf0, 0x1d, 0x2f, 0xdc, 0x26, 0x04, 0x63, 0x75, 0x93, 0xaa, 0x2a, 0xf6, 0xd4, 0xc7, 0x77, - 0x0b, 0xb3, 0xb1, 0x57, 0x3d, 0xf9, 0x32, 0x80, 0x78, 0x15, 0xb2, 0x58, 0xb7, 0x42, 0x4e, 0xcd, - 0xf3, 0x91, 0xba, 0x49, 0x27, 0x8a, 0xbc, 0x3b, 0xd2, 0xc2, 0x4e, 0x26, 0x0a, 0x9f, 0x1c, 0x49, - 0x4e, 0xa1, 0x8d, 0x83, 0xe1, 0x33, 0x06, 0xc5, 0xcc, 0x53, 0xcc, 0x32, 0x01, 0x05, 0x8f, 0x0b, - 0x14, 0xff, 0x2e, 0x4c, 0x89, 0xb7, 0x42, 0x18, 0xf2, 0xad, 0x50, 0x10, 0x44, 0x5f, 0x36, 0x67, - 0xe2, 0x1f, 0xc2, 0x6c, 0x43, 0x81, 0xb5, 0x2f, 0xf2, 0x4f, 0x48, 0x0a, 0x43, 0x7e, 0x42, 0x32, - 0x43, 0x3b, 0x1b, 0xf9, 0xd7, 0x23, 0xaf, 0x03, 0xfd, 0xfa, 0x83, 0x16, 0x67, 0xe4, 0x69, 0x96, - 0x89, 0x1c, 0xdf, 0xf2, 0xbb, 0xb4, 0x46, 0xe7, 0x55, 0x99, 0xc0, 0x9e, 0x50, 0x50, 0x9d, 0x43, - 0xe4, 0x27, 0x30, 0xd7, 0x13, 0xb1, 0xbc, 0xa3, 0xad, 0x36, 0x5a, 0xac, 0xaa, 0xc5, 0x78, 0x9c, - 0x2a, 0x4b, 0xb0, 0x10, 0xf7, 0x36, 0xee, 0x86, 0xdf, 0x93, 0xe0, 0xa2, 0x38, 0xb1, 0xbc, 0xe4, - 0x4e, 0x5d, 0xe5, 0x4f, 0x24, 0xb8, 0x94, 0xbe, 0x16, 0x7e, 0x70, 0xba, 0x03, 0x4b, 0x2d, 0x36, - 0xce, 0x3a, 0xf2, 0x34, 0xcb, 0xd1, 0x0c, 0xdd, 0x68, 0x22, 0xbe, 0xac, 0xf9, 0x56, 0x84, 0xaa, - 0xee, 0x6c, 0x13, 0x90, 0xfc, 0x36, 0xac, 0x24, 0x88, 0x4c, 0xdd, 0xd7, 0x0f, 0x75, 0x8c, 0x78, - 0xec, 0x2c, 0xc5, 0xe9, 0xee, 0x73, 0xa8, 0xf2, 0x4f, 0x12, 0xac, 0x8a, 0x05, 0x71, 0x45, 0x3e, - 0x70, 0x71, 0xf4, 0x39, 0xae, 0xe9, 0x62, 0x5f, 0xd3, 0x4d, 0xd3, 0x43, 0x18, 0x0b, 0xdd, 0x90, - 0xb1, 0x7b, 0x6c, 0x48, 0x7e, 0x15, 0xca, 0x22, 0x73, 0x68, 0x0d, 0xd7, 0xd3, 0x08, 0x8c, 0x4e, - 0x3a, 0xa1, 0x16, 0x79, 0x0a, 0xd9, 0x75, 0x3d, 0xc2, 0x54, 0x7e, 0x02, 0x72, 0x78, 0x5c, 0x0b, - 0x70, 0x47, 0x3e, 0x2b, 0x84, 0x47, 0x4b, 0xce, 0x58, 0xf9, 0xb3, 0xb1, 0xd0, 0xc4, 0x31, 0x29, - 0xb8, 0x56, 0x37, 0xa1, 0xe4, 0x74, 0x5a, 0x87, 0xc8, 0xd3, 0xdc, 0x86, 0x46, 0x17, 0xc5, 0x44, - 0x99, 0x50, 0x8b, 0x6c, 0xfc, 0xdd, 0x06, 0x4d, 0x60, 0x58, 0xbe, 0x08, 0x79, 0x21, 0x0d, 0xae, - 0x8c, 0xad, 0xe5, 0x36, 0x27, 0xd4, 0x69, 0x2e, 0x05, 0x96, 0xbf, 0x0d, 0x73, 0xa1, 0xa7, 0x30, - 0xab, 0xf4, 0xfb, 0x70, 0x2d, 0xc0, 0x25, 0x62, 0x04, 0x4f, 0xe7, 0xd4, 0x64, 0xb4, 0xfc, 0x16, - 0x9d, 0xd8, 0x98, 0xfc, 0x06, 0x2c, 0xb3, 0xb9, 0x0d, 0xd7, 0xf1, 0x3d, 0xd7, 0xb6, 0x91, 0x27, - 0x3a, 0x27, 0xc7, 0xa9, 0xde, 0x17, 0x29, 0x78, 0x3b, 0x80, 0xf2, 0xf6, 0x7c, 0x12, 0xe2, 0xdc, - 0x3e, 0xac, 0xbb, 0x43, 0xfc, 0x54, 0x6a, 0x50, 0xde, 0xb6, 0x5d, 0x8c, 0xa8, 0x70, 0xc2, 0xa6, - 0xd1, 0x54, 0xcf, 0x94, 0x20, 0x52, 0xbd, 0xb2, 0x00, 0x72, 0x14, 0x9f, 0x07, 0xd0, 0x3f, 0x4a, - 0x50, 0x66, 0x37, 0xda, 0xd1, 0xfb, 0xb1, 0x6c, 0x36, 0xf2, 0x2e, 0x4c, 0x93, 0x2a, 0x75, 0x44, - 0x62, 0x7b, 0x8c, 0xf6, 0x7c, 0x7e, 0xa9, 0x7f, 0x47, 0x29, 0x7b, 0x8b, 0x62, 0x14, 0x6a, 0x40, - 0x1b, 0x6d, 0x69, 0xc9, 0xc5, 0x5a, 0x5a, 0x6e, 0xc1, 0xc2, 0x89, 0x85, 0xad, 0x43, 0xcb, 0xb6, - 0xfc, 0x6e, 0xa4, 0xbd, 0x83, 0xe5, 0xfc, 0xf9, 0x10, 0x16, 0xb4, 0x61, 0x10, 0xd1, 0xa2, 0x32, - 0x70, 0xd1, 0xbe, 0x2f, 0xc1, 0xe5, 0x77, 0x90, 0x1f, 0xd9, 0x18, 0x3d, 0x62, 0x9f, 0x73, 0x06, - 0xf5, 0xf3, 0x21, 0x4c, 0xd2, 0x36, 0x2b, 0xe2, 0x30, 0xb9, 0x4c, 0x53, 0x67, 0x6f, 0xb4, 0x68, - 0x43, 0x96, 0xca, 0x79, 0x90, 0x78, 0xe2, 0x65, 0x98, 0x36, 0x59, 0x88, 0x03, 0x35, 0x1f, 0x23, - 0x3e, 0xa2, 0xfc, 0xd5, 0x18, 0x54, 0xb3, 0x96, 0xc4, 0xdd, 0xf9, 0x0f, 0x25, 0x28, 0xf3, 0xcf, - 0x4e, 0xb1, 0x76, 0xd8, 0x65, 0x1e, 0xcd, 0xd7, 0xf7, 0x74, 0xf8, 0xef, 0x58, 0xfa, 0x4c, 0x51, - 0x13, 0x03, 0x5b, 0x5d, 0xea, 0x0b, 0x7c, 0x8b, 0xde, 0x8a, 0x8f, 0xae, 0xfe, 0x36, 0x2c, 0xa4, - 0x21, 0x46, 0xb7, 0xab, 0x13, 0x6c, 0xbb, 0xfa, 0x28, 0xbe, 0x5d, 0x7d, 0x73, 0x44, 0x2d, 0x06, - 0xeb, 0x8b, 0x6c, 0x59, 0x3f, 0x82, 0xb5, 0x77, 0x90, 0x7f, 0xff, 0xe1, 0x7b, 0x7d, 0xac, 0xf7, - 0x3e, 0xef, 0xb9, 0x27, 0xc7, 0x17, 0x61, 0xc1, 0x51, 0xe7, 0x0e, 0x7a, 0x04, 0x69, 0x1b, 0x3e, - 0xf9, 0x0b, 0x2b, 0x7f, 0x20, 0xc1, 0x7a, 0x9f, 0xc9, 0xb9, 0x9d, 0x3e, 0x80, 0x72, 0xf4, 0x0c, - 0x45, 0xc8, 0xc5, 0x22, 0xee, 0x3c, 0xc7, 0x22, 0xd4, 0xe8, 0x89, 0x8c, 0x0c, 0x60, 0xe5, 0x8f, - 0x25, 0x58, 0xa0, 0xcd, 0x6c, 0x22, 0x4b, 0x8e, 0x50, 0xd4, 0xde, 0xed, 0xbd, 0x26, 0xfc, 0x95, - 0x81, 0xd7, 0x84, 0x69, 0x53, 0x85, 0x57, 0x83, 0xc7, 0xb0, 0xd8, 0x83, 0xc0, 0xf5, 0xa0, 0xc2, - 0x74, 0x4f, 0xff, 0xcc, 0x1b, 0xa3, 0x4e, 0xc5, 0xbb, 0x65, 0x02, 0x3e, 0xa4, 0x92, 0x2e, 0xa8, - 0x48, 0x6f, 0xb7, 0xed, 0xee, 0xc8, 0xc7, 0xe6, 0xfd, 0x5e, 0xc9, 0xd3, 0x1b, 0x47, 0xa3, 0x9f, - 0x5f, 0x33, 0x73, 0x24, 0xa7, 0x0b, 0xa5, 0x5f, 0x86, 0xc5, 0x1e, 0x04, 0xbe, 0xd2, 0xbf, 0x19, - 0x83, 0x45, 0xe6, 0x2b, 0xbd, 0xde, 0xb9, 0x03, 0xe3, 0x41, 0x63, 0x70, 0x31, 0x7a, 0x33, 0x9a, - 0x96, 0x23, 0xef, 0x23, 0xdd, 0x7c, 0x88, 0x7c, 0x1f, 0x79, 0xb4, 0xd3, 0x8e, 0xb6, 0x70, 0x51, - 0xf2, 0xc4, 0xde, 0x3d, 0x92, 0x89, 0x93, 0xbb, 0xff, 0x5c, 0xda, 0xee, 0xff, 0x4d, 0xa8, 0x58, - 0x0e, 0xc1, 0xb0, 0x4e, 0x90, 0x86, 0x1c, 0x53, 0xe3, 0x81, 0x1e, 0x5e, 0xba, 0x2d, 0x06, 0xf0, - 0x1d, 0xc7, 0xe4, 0x72, 0xd4, 0x4d, 0xf9, 0x4b, 0x50, 0x6e, 0xe9, 0x67, 0x56, 0xab, 0xd3, 0xd2, - 0xda, 0x04, 0x1f, 0x5b, 0x1f, 0x21, 0x5a, 0x84, 0x26, 0xd4, 0x39, 0x0e, 0xd8, 0xd3, 0x8f, 0xd0, - 0xbe, 0xf5, 0x11, 0x92, 0x5f, 0x21, 0x67, 0xf2, 0x33, 0x9f, 0x21, 0xb2, 0xd6, 0xd5, 0x49, 0xda, - 0xba, 0x4a, 0x2f, 0xf0, 0x08, 0x1a, 0xfb, 0xcc, 0xe8, 0xbf, 0xd9, 0x17, 0xbb, 0x31, 0x7d, 0x71, - 0x47, 0x7a, 0x41, 0x0a, 0x4b, 0x8d, 0xcb, 0xb1, 0x17, 0x18, 0x97, 0x69, 0xb2, 0xe6, 0xd2, 0x64, - 0xfd, 0x0f, 0x09, 0x96, 0xf7, 0x3a, 0xde, 0x11, 0xfa, 0x3c, 0x7a, 0x87, 0xb2, 0x0a, 0x95, 0xa4, - 0x70, 0xa2, 0x3b, 0x68, 0x0c, 0x96, 0x1f, 0xa1, 0xcf, 0xa9, 0xe4, 0x9f, 0x49, 0x5c, 0x6c, 0x41, - 0x25, 0xa9, 0x30, 0x1e, 0x18, 0x29, 0x3c, 0xa4, 0x34, 0x1e, 0x7f, 0x41, 0x3f, 0x61, 0x69, 0x78, - 0x08, 0x37, 0xa3, 0x4f, 0x84, 0xa3, 0x24, 0xcf, 0xa7, 0xbd, 0xc9, 0xf3, 0xd7, 0x87, 0x4c, 0x9e, - 0x99, 0xb3, 0x86, 0x39, 0x94, 0x7e, 0xd5, 0x92, 0x86, 0xc7, 0xc4, 0xdc, 0x6a, 0x7f, 0xfc, 0x49, - 0xf5, 0xc2, 0x8f, 0x3f, 0xa9, 0x5e, 0xf8, 0xd9, 0x27, 0x55, 0xe9, 0x3b, 0xcf, 0xaa, 0xd2, 0x0f, - 0x9e, 0x55, 0xa5, 0x7f, 0x79, 0x56, 0x95, 0x3e, 0x7e, 0x56, 0x95, 0xfe, 0xf3, 0x59, 0x55, 0xfa, - 0xaf, 0x67, 0xd5, 0x0b, 0x3f, 0x7b, 0x56, 0x95, 0xbe, 0xff, 0x69, 0xf5, 0xc2, 0xc7, 0x9f, 0x56, - 0x2f, 0xfc, 0xf8, 0xd3, 0xea, 0x85, 0xa7, 0x77, 0x8f, 0xdc, 0x70, 0x89, 0x96, 0xdb, 0xf7, 0xdf, - 0xc9, 0xfc, 0x6a, 0x7c, 0xe4, 0x70, 0x92, 0xfe, 0x8b, 0x8d, 0x3b, 0xff, 0x17, 0x00, 0x00, 0xff, - 0xff, 0xb0, 0x59, 0x36, 0x84, 0x8d, 0x46, 0x00, 0x00, + 0x40, 0x2e, 0x14, 0x07, 0x0e, 0x54, 0x0e, 0x5c, 0x38, 0x50, 0xdc, 0xb2, 0x70, 0x4a, 0xc1, 0x85, + 0xf5, 0x56, 0x51, 0x50, 0xc9, 0x21, 0x07, 0xae, 0x54, 0x51, 0xff, 0xab, 0x1f, 0xd3, 0xdd, 0xf3, + 0xb0, 0xbc, 0x38, 0xd9, 0xec, 0x4d, 0xf3, 0x7f, 0x8f, 0xff, 0xff, 0xde, 0xff, 0xe3, 0x6b, 0xc1, + 0x57, 0x7d, 0xd4, 0x6a, 0xbb, 0x9e, 0x6e, 0xdf, 0xc4, 0xc8, 0x3b, 0x41, 0xde, 0x4d, 0xbd, 0x6d, + 0xdd, 0x6c, 0x5a, 0xd8, 0x77, 0xbd, 0x2e, 0x19, 0xb1, 0x0c, 0x74, 0xf3, 0xe4, 0xd6, 0x4d, 0x0f, + 0x7d, 0xd8, 0x41, 0xd8, 0xd7, 0x3c, 0x84, 0xdb, 0xae, 0x83, 0x51, 0xad, 0xed, 0xb9, 0xbe, 0x2b, + 0x6f, 0x08, 0xea, 0x1a, 0xa3, 0xae, 0xe9, 0x6d, 0xab, 0x16, 0xa7, 0xae, 0x9d, 0xdc, 0x5a, 0xbd, + 0x16, 0x4c, 0x42, 0xb8, 0x1b, 0x6e, 0xab, 0xe5, 0x3a, 0x84, 0x6b, 0x0b, 0x61, 0xac, 0x1f, 0x71, + 0x66, 0xab, 0x1b, 0x31, 0x2c, 0xce, 0x25, 0x89, 0x76, 0x3d, 0x86, 0xe6, 0xeb, 0xf8, 0xf8, 0xc3, + 0x0e, 0xea, 0xa0, 0x24, 0x62, 0x7c, 0x56, 0xe4, 0x74, 0x5a, 0x98, 0x20, 0x9d, 0xba, 0xde, 0x71, + 0xc3, 0x76, 0x4f, 0x39, 0xd6, 0x2b, 0x31, 0x2c, 0x01, 0x4c, 0x72, 0xbb, 0x1a, 0xc3, 0xfb, 0xb0, + 0x83, 0xd2, 0xd6, 0x16, 0x17, 0xa1, 0xa1, 0x5b, 0x76, 0xc7, 0x4b, 0x59, 0xd9, 0x97, 0xfb, 0x28, + 0x3d, 0x89, 0xfd, 0x6a, 0x1a, 0x76, 0x20, 0x0e, 0xd3, 0x26, 0x47, 0x7d, 0xad, 0x2f, 0x6a, 0x8f, + 0xe4, 0xd7, 0xfb, 0x22, 0x13, 0xc5, 0x72, 0xc4, 0x1b, 0x69, 0x88, 0xd9, 0x9a, 0xaa, 0xa5, 0xa1, + 0x3b, 0x7a, 0x0b, 0xe1, 0xb6, 0x6e, 0xa4, 0x68, 0xe3, 0xf5, 0x34, 0x7c, 0x0f, 0xb5, 0x6d, 0xcb, + 0xd0, 0x7d, 0x2b, 0xcd, 0x53, 0xde, 0x48, 0xb5, 0xd9, 0x40, 0x77, 0x5d, 0xbd, 0x9b, 0x36, 0x93, + 0x6e, 0xb6, 0x2c, 0x67, 0x20, 0xad, 0xf2, 0xc9, 0x04, 0x5c, 0xde, 0xf7, 0x75, 0xcf, 0x7f, 0xc2, + 0xa7, 0xdb, 0x39, 0x43, 0x46, 0x87, 0xac, 0x4f, 0x65, 0x04, 0xf2, 0x3a, 0x14, 0x02, 0x29, 0x35, + 0xcb, 0xac, 0x48, 0x6b, 0xd2, 0x66, 0x5e, 0x9d, 0x09, 0xc6, 0xea, 0xa6, 0x6c, 0xc0, 0x2c, 0x26, + 0x3c, 0x34, 0x3e, 0x49, 0x65, 0x6c, 0x4d, 0xda, 0x9c, 0xb9, 0xfd, 0xf5, 0x40, 0x65, 0x34, 0x80, + 0x7a, 0x04, 0xaa, 0x9d, 0xdc, 0xaa, 0xf5, 0x9d, 0x59, 0x2d, 0x50, 0xa6, 0x62, 0x1d, 0x4d, 0x58, + 0x6c, 0xeb, 0x1e, 0x72, 0x7c, 0x0d, 0x09, 0x44, 0xcd, 0x72, 0x1a, 0x6e, 0x25, 0x47, 0x27, 0xfb, + 0x4a, 0x2d, 0x2d, 0x68, 0x03, 0xdf, 0x38, 0xb9, 0x55, 0xdb, 0xa3, 0xd4, 0xc1, 0x2c, 0x75, 0xa7, + 0xe1, 0xaa, 0xf3, 0xed, 0xe4, 0xa0, 0x5c, 0x81, 0x29, 0xdd, 0x27, 0xdc, 0xfc, 0xca, 0xf8, 0x9a, + 0xb4, 0x39, 0xa1, 0x8a, 0x9f, 0xf2, 0x37, 0xe0, 0xba, 0xe0, 0x18, 0x59, 0x05, 0x3a, 0x6b, 0x5b, + 0x1e, 0xb5, 0xa9, 0xe6, 0x5b, 0x2d, 0x84, 0x7d, 0xbd, 0xd5, 0xae, 0x4c, 0xac, 0x49, 0x9b, 0x39, + 0xf5, 0xda, 0x69, 0xaf, 0x70, 0x3b, 0x01, 0xf2, 0x81, 0xc0, 0x95, 0x9b, 0xb0, 0x62, 0xb8, 0x8e, + 0x6f, 0x39, 0x1d, 0xa4, 0xe9, 0x58, 0x73, 0xd0, 0xa9, 0x66, 0x39, 0x96, 0x6f, 0xe9, 0xbe, 0xeb, + 0x55, 0x26, 0xd7, 0xa4, 0xcd, 0xe2, 0xed, 0x1b, 0x71, 0x5d, 0x52, 0x7f, 0x26, 0x42, 0x6d, 0x73, + 0xba, 0x7b, 0xf8, 0x31, 0x3a, 0xad, 0x0b, 0x22, 0x75, 0xc9, 0x48, 0x1d, 0x97, 0x1f, 0x41, 0x59, + 0x40, 0x4c, 0x8d, 0x07, 0x72, 0x65, 0x8a, 0x2a, 0x70, 0x2d, 0x3e, 0x03, 0x07, 0x92, 0x39, 0x76, + 0xd9, 0x9f, 0x6a, 0x29, 0x20, 0xe5, 0x23, 0xf2, 0xfb, 0xb0, 0x64, 0xeb, 0xd8, 0xd7, 0x0c, 0xb7, + 0xd5, 0xb6, 0x11, 0xd5, 0x80, 0x87, 0x70, 0xc7, 0xf6, 0x2b, 0xd3, 0x69, 0x3c, 0x79, 0x50, 0x53, + 0x5b, 0x74, 0x6d, 0x57, 0x37, 0xb1, 0xba, 0x40, 0xe8, 0xb7, 0x03, 0x72, 0x95, 0x52, 0xcb, 0x0f, + 0xe1, 0x6a, 0xc3, 0xf2, 0xb0, 0xaf, 0x05, 0xda, 0x26, 0x71, 0xab, 0x1d, 0xea, 0xc6, 0xb1, 0xdb, + 0x68, 0x68, 0x18, 0x19, 0xae, 0x63, 0xe2, 0x4a, 0x9e, 0x5a, 0xe7, 0x0a, 0x45, 0x15, 0x5e, 0x74, + 0xa0, 0xe3, 0xe3, 0x2d, 0x86, 0xb7, 0xcf, 0xd0, 0x94, 0x37, 0xa1, 0x9a, 0xe5, 0x68, 0x2c, 0x16, + 0xe4, 0x45, 0x98, 0xf4, 0x3a, 0x4e, 0xe8, 0xdd, 0x13, 0x5e, 0xc7, 0xa9, 0x9b, 0xca, 0x4f, 0x24, + 0x58, 0x7a, 0x07, 0xf9, 0x8f, 0x3a, 0xbe, 0x7e, 0x68, 0xa3, 0x7d, 0x5f, 0xf7, 0xd1, 0x08, 0x51, + 0xf1, 0x0e, 0xe4, 0x03, 0x1f, 0xe1, 0x11, 0xf1, 0x6a, 0x96, 0x3e, 0x92, 0x4b, 0x0b, 0x69, 0xe5, + 0x3b, 0xb0, 0x84, 0xce, 0xda, 0xc8, 0xf0, 0x91, 0xa9, 0x39, 0xe8, 0xcc, 0xd7, 0xd0, 0x09, 0x09, + 0x03, 0xcb, 0xa4, 0xae, 0x9f, 0x53, 0xe7, 0x05, 0xf4, 0x31, 0x3a, 0xf3, 0x77, 0x08, 0xac, 0x6e, + 0xca, 0xaf, 0xc3, 0x82, 0xd1, 0xf1, 0x68, 0xbc, 0x1c, 0x7a, 0xba, 0x63, 0x34, 0x35, 0xdf, 0x3d, + 0x46, 0x0e, 0xf5, 0xe8, 0x82, 0x2a, 0x73, 0xd8, 0x16, 0x05, 0x1d, 0x10, 0x88, 0xf2, 0x13, 0x80, + 0xe5, 0x84, 0xb4, 0x5c, 0x41, 0x31, 0x59, 0xa4, 0x73, 0xc8, 0x52, 0x87, 0xd9, 0xd0, 0xa6, 0xdd, + 0x36, 0xe2, 0x8a, 0xb9, 0x36, 0x88, 0xd9, 0x41, 0xb7, 0x8d, 0xd4, 0xc2, 0x69, 0xe4, 0x97, 0xac, + 0xc0, 0x6c, 0x9a, 0x36, 0x66, 0x9c, 0x88, 0x16, 0xde, 0x86, 0x95, 0xb6, 0x87, 0x4e, 0x2c, 0xb7, + 0x83, 0x35, 0x9a, 0x4d, 0x90, 0x19, 0xe2, 0x8f, 0x53, 0xfc, 0x25, 0x81, 0xb0, 0xcf, 0xe0, 0x82, + 0xf4, 0x06, 0xcc, 0x53, 0xdf, 0x66, 0x8e, 0x18, 0x10, 0xb1, 0xb8, 0x2e, 0x11, 0xd0, 0x2e, 0x81, + 0x08, 0xf4, 0x6d, 0x00, 0xea, 0xa3, 0xb4, 0x6a, 0xd3, 0xa0, 0x4d, 0x48, 0x15, 0x14, 0x75, 0x22, + 0x18, 0xf1, 0xd3, 0xf7, 0xc8, 0x0f, 0x35, 0xef, 0x8b, 0x3f, 0xe5, 0x3d, 0x28, 0x63, 0xdf, 0x32, + 0x8e, 0xbb, 0x5a, 0x84, 0xd7, 0xd4, 0x08, 0xbc, 0xe6, 0x18, 0x79, 0x30, 0x20, 0x7f, 0x05, 0x96, + 0x0c, 0xdb, 0x22, 0x6b, 0xb7, 0xad, 0x43, 0x4f, 0xf7, 0xba, 0xda, 0x09, 0xf2, 0x30, 0xb1, 0xe2, + 0x34, 0xf5, 0xd8, 0x05, 0x06, 0x7d, 0xc8, 0x80, 0xef, 0x33, 0x58, 0x84, 0xaa, 0x81, 0x74, 0xbf, + 0xe3, 0xa1, 0x80, 0x2a, 0x1f, 0xa5, 0xda, 0x65, 0x40, 0x41, 0x75, 0x05, 0x66, 0x38, 0x95, 0xd5, + 0x6a, 0xdb, 0x15, 0xa0, 0xa8, 0xc0, 0x86, 0xea, 0xad, 0xb6, 0x2d, 0x3f, 0x85, 0xd7, 0x12, 0xe2, + 0x69, 0xd8, 0x68, 0x22, 0xb3, 0x63, 0x23, 0xcd, 0x77, 0x99, 0x89, 0x68, 0x12, 0x75, 0x3b, 0x7e, + 0x65, 0x86, 0x86, 0xf7, 0x46, 0x8f, 0x48, 0xfb, 0x1c, 0xff, 0xc0, 0xa5, 0x06, 0x3b, 0x60, 0xc8, + 0x72, 0x0d, 0xe6, 0x99, 0x8d, 0xc8, 0x76, 0x23, 0x5c, 0x6f, 0x81, 0xf2, 0x28, 0x53, 0xd0, 0x3e, + 0x81, 0x88, 0xc5, 0x66, 0xc5, 0xc7, 0x6c, 0x56, 0x7c, 0xc8, 0xbf, 0x0b, 0xa5, 0x48, 0xf9, 0x66, + 0xb5, 0xa7, 0xb8, 0x96, 0xdb, 0x9c, 0xb9, 0xbd, 0x5f, 0x1b, 0x6a, 0xc3, 0x58, 0xcb, 0x88, 0xae, + 0x9a, 0x1a, 0xb2, 0x25, 0x05, 0x68, 0xc7, 0xf1, 0xbd, 0xae, 0x3a, 0xe7, 0xc5, 0x47, 0xe5, 0x6f, + 0x42, 0x31, 0x08, 0x1d, 0x4c, 0xe8, 0x2b, 0x73, 0xb4, 0x34, 0xa4, 0x57, 0xbe, 0xa0, 0x42, 0x24, + 0xc2, 0x91, 0xcd, 0x1d, 0x84, 0x21, 0xfd, 0x29, 0x3f, 0x81, 0xb9, 0x18, 0xf3, 0x0e, 0xae, 0x94, + 0x28, 0xf7, 0x5a, 0x46, 0xe1, 0x49, 0x65, 0xdb, 0xc1, 0x6a, 0x31, 0xca, 0xb7, 0x83, 0xe5, 0x6f, + 0x43, 0x99, 0xdb, 0x42, 0x63, 0x0a, 0xb1, 0x10, 0xae, 0x94, 0xa9, 0x4b, 0xbf, 0xde, 0x4f, 0x6d, + 0x64, 0x0e, 0x6e, 0xab, 0x07, 0x82, 0x4e, 0x2d, 0x9d, 0xf4, 0x8c, 0xc8, 0x5f, 0x87, 0x4b, 0x16, + 0x09, 0xed, 0x5e, 0xaf, 0x42, 0x0e, 0x51, 0xb3, 0x59, 0x91, 0xd7, 0xa4, 0xcd, 0x69, 0xb5, 0x62, + 0xe1, 0xfd, 0xb8, 0x17, 0xed, 0x30, 0xf8, 0xea, 0x29, 0x2c, 0xa4, 0x69, 0x5f, 0x2e, 0x41, 0xee, + 0x18, 0x75, 0x79, 0x5a, 0x27, 0x7f, 0xca, 0x75, 0x98, 0x38, 0xd1, 0xed, 0x8e, 0xc8, 0x58, 0x77, + 0x52, 0x17, 0x1f, 0xb1, 0x19, 0x11, 0xa0, 0x87, 0xb5, 0xca, 0x38, 0xdc, 0x1d, 0x7b, 0x4b, 0x52, + 0x7e, 0x2a, 0xc1, 0xf2, 0x9e, 0x6b, 0xdb, 0xbf, 0x24, 0xc5, 0xe5, 0x7f, 0xf3, 0x50, 0x49, 0x8a, + 0xfb, 0x45, 0x75, 0xf9, 0xa2, 0xba, 0xfc, 0x42, 0x54, 0x97, 0x2c, 0x87, 0x2f, 0x64, 0x56, 0x8b, + 0xdf, 0x4b, 0xa9, 0x16, 0xb3, 0xb4, 0x5a, 0x1c, 0x0c, 0x59, 0x2d, 0xb2, 0xc2, 0x65, 0xc8, 0x72, + 0x91, 0x9a, 0x78, 0x8b, 0x2f, 0x2c, 0xf1, 0xfe, 0x42, 0x56, 0xa3, 0x97, 0x97, 0xee, 0xbf, 0x27, + 0xc1, 0x45, 0x15, 0x61, 0xe4, 0xf7, 0xd4, 0xa1, 0x97, 0x90, 0xf2, 0x95, 0x2a, 0x5c, 0x4a, 0x5f, + 0x0a, 0xf3, 0x2f, 0xe5, 0xdf, 0xc6, 0x60, 0x4d, 0x45, 0x86, 0xeb, 0x99, 0xd1, 0x43, 0x15, 0x4f, + 0x60, 0x23, 0x2c, 0xf8, 0x37, 0x40, 0x4e, 0x9e, 0x96, 0x47, 0x5f, 0x79, 0x39, 0x71, 0x86, 0x26, + 0xb9, 0x20, 0x08, 0xec, 0x20, 0x35, 0x83, 0x18, 0xaa, 0x9b, 0xf2, 0x32, 0x4c, 0xd1, 0x24, 0x10, + 0xe4, 0xe1, 0x49, 0xf2, 0xb3, 0x6e, 0xca, 0x97, 0x01, 0xc4, 0x4d, 0x08, 0x4f, 0xb7, 0x79, 0x35, + 0xcf, 0x47, 0xea, 0xa6, 0xfc, 0x01, 0x14, 0xda, 0xae, 0x6d, 0x07, 0x17, 0x19, 0x2c, 0xd3, 0x7e, + 0x6d, 0xe0, 0x45, 0x06, 0x89, 0xd5, 0xa8, 0xb2, 0xa2, 0xb6, 0x55, 0x67, 0x08, 0x4b, 0xfe, 0x43, + 0xf9, 0xd1, 0x14, 0xac, 0xf7, 0x51, 0x2e, 0xaf, 0x88, 0x89, 0x42, 0x26, 0x3d, 0x77, 0x21, 0xeb, + 0x5b, 0xa4, 0xc6, 0xfa, 0x16, 0xa9, 0x2f, 0x83, 0x2c, 0x74, 0x6a, 0xf6, 0x16, 0xc2, 0x52, 0x00, + 0x11, 0xd8, 0x9b, 0x50, 0xca, 0x28, 0x82, 0x45, 0x1c, 0xe7, 0x9b, 0xa8, 0xad, 0x13, 0xc9, 0xda, + 0x1a, 0xb9, 0x84, 0x99, 0xa4, 0xd0, 0xe0, 0x12, 0xe6, 0x2d, 0xa8, 0xf0, 0x3c, 0x1f, 0xb9, 0x82, + 0xe1, 0xdb, 0xbd, 0x29, 0xba, 0xdd, 0x5b, 0x62, 0xf0, 0xf0, 0xce, 0x85, 0x41, 0xe5, 0xa3, 0x88, + 0x43, 0x32, 0xf7, 0x20, 0x59, 0x99, 0x5d, 0x55, 0xbc, 0x3d, 0x28, 0x27, 0x1e, 0x78, 0xba, 0x83, + 0x49, 0xb1, 0x89, 0xda, 0x8d, 0x86, 0x79, 0xe9, 0xb4, 0x67, 0x44, 0x3e, 0x82, 0xcb, 0x29, 0xf7, + 0x44, 0x91, 0xaa, 0x9b, 0x1f, 0xa1, 0xea, 0xae, 0x26, 0xfc, 0x3f, 0x2c, 0xc0, 0x19, 0xa7, 0x1e, + 0xc8, 0x3a, 0xf5, 0xac, 0x43, 0x21, 0x56, 0xbf, 0x66, 0x68, 0xfd, 0x9a, 0x39, 0x8c, 0x14, 0xae, + 0x9b, 0x30, 0x1f, 0x1a, 0x3d, 0xbc, 0xcf, 0x2a, 0x50, 0x23, 0x84, 0xfe, 0x10, 0xde, 0x5e, 0xbd, + 0x46, 0xb6, 0x15, 0xcc, 0xee, 0x21, 0xfa, 0x2c, 0x77, 0x12, 0x06, 0x08, 0x91, 0x5d, 0x98, 0xfa, + 0xb0, 0x83, 0x78, 0x2d, 0x22, 0xd5, 0xf0, 0x1b, 0x43, 0x56, 0xc3, 0x81, 0x31, 0x53, 0x7b, 0x8f, + 0xf1, 0x65, 0xe5, 0x50, 0xcc, 0xb2, 0xfa, 0x01, 0x14, 0xa2, 0x80, 0x94, 0x4c, 0x7f, 0x37, 0x9e, + 0xe9, 0x7b, 0x8c, 0x42, 0xaf, 0xc4, 0xa3, 0x21, 0x46, 0xb8, 0x75, 0xa3, 0xa9, 0x3d, 0x4c, 0x97, + 0xf7, 0x0c, 0xdf, 0x3a, 0xb1, 0xfc, 0xee, 0x17, 0xe9, 0x72, 0x88, 0x74, 0x19, 0x55, 0x56, 0x76, + 0xba, 0xfc, 0x97, 0x9c, 0x48, 0x97, 0xa9, 0xca, 0xe5, 0xe9, 0xf2, 0x31, 0xcc, 0xf5, 0x24, 0x2a, + 0x9e, 0x30, 0x37, 0xe2, 0x4b, 0x89, 0x84, 0x33, 0xdb, 0xc9, 0x74, 0x69, 0xba, 0x51, 0x8b, 0xf1, + 0x64, 0x96, 0xee, 0xd2, 0x63, 0x19, 0x2e, 0x1d, 0xc9, 0x54, 0xb9, 0x78, 0xa6, 0x7a, 0x08, 0x57, + 0x53, 0x42, 0x49, 0x73, 0x1b, 0x9a, 0xdf, 0xb4, 0xb0, 0x16, 0xbd, 0x64, 0xce, 0xa9, 0x57, 0x92, + 0xa1, 0xf5, 0x6e, 0xe3, 0xa0, 0x69, 0xe1, 0x7b, 0x9c, 0xdb, 0x23, 0x28, 0x37, 0x91, 0xee, 0xf9, + 0x87, 0x48, 0xf7, 0x35, 0x13, 0xf9, 0xba, 0x65, 0x63, 0x6a, 0x92, 0x61, 0xee, 0x59, 0x4b, 0x01, + 0xe9, 0x7d, 0x46, 0x99, 0x2c, 0x31, 0x93, 0xcf, 0x5d, 0x62, 0x6e, 0x44, 0x3c, 0x37, 0xf0, 0x68, + 0x9a, 0x8b, 0xf3, 0xa1, 0x3b, 0x3e, 0x16, 0x00, 0xe5, 0x87, 0x12, 0x5c, 0x65, 0xa6, 0x8b, 0xc5, + 0x33, 0xbf, 0x05, 0x1e, 0x29, 0x66, 0x5c, 0x28, 0xf1, 0xbb, 0x67, 0xd4, 0xf3, 0xf8, 0x70, 0x7f, + 0xa0, 0x13, 0x0e, 0xb1, 0x04, 0x75, 0x4e, 0x70, 0x17, 0xfe, 0xf8, 0xe7, 0x12, 0x5c, 0xeb, 0x4f, + 0xc8, 0x5d, 0x12, 0x87, 0xd5, 0x50, 0x3c, 0xb9, 0x70, 0x9f, 0x7c, 0xf0, 0xa2, 0x32, 0x1e, 0x39, + 0x8f, 0xc5, 0x06, 0x94, 0xbf, 0x95, 0x48, 0x2a, 0x4a, 0xac, 0x6e, 0x57, 0xb7, 0xec, 0x91, 0xd4, + 0xda, 0x84, 0x62, 0x83, 0xd2, 0xf4, 0x28, 0xf5, 0xde, 0xf3, 0x28, 0x35, 0x36, 0xbb, 0x3a, 0xdb, + 0x88, 0xfe, 0x54, 0xae, 0x92, 0xf0, 0xce, 0x24, 0xe1, 0x62, 0xfd, 0x50, 0x02, 0x25, 0x99, 0x04, + 0x1e, 0x08, 0x8f, 0x1e, 0x41, 0xb0, 0x76, 0x34, 0x86, 0xe2, 0xb2, 0x6d, 0x0f, 0x21, 0xdb, 0xa0, + 0x25, 0x44, 0xc2, 0x4c, 0x08, 0xb8, 0x47, 0x7c, 0xbd, 0x0f, 0x1d, 0x77, 0x97, 0x57, 0xa1, 0x64, + 0xe8, 0x8e, 0x81, 0x82, 0x5c, 0x8a, 0xd8, 0xfa, 0xa7, 0xd5, 0x39, 0x36, 0xae, 0x8a, 0xe1, 0x68, + 0xf8, 0x44, 0x79, 0xbe, 0xa4, 0xf0, 0xe9, 0xb7, 0x84, 0x64, 0xf8, 0xbc, 0x12, 0x44, 0x4f, 0x06, + 0x5d, 0xd2, 0x91, 0xa3, 0x88, 0xff, 0xff, 0x8e, 0x9c, 0x39, 0x7b, 0xb6, 0x23, 0xa7, 0x91, 0x70, + 0xb1, 0xfe, 0x8e, 0x3a, 0x72, 0x52, 0x7e, 0x6a, 0xe1, 0x91, 0x04, 0xfb, 0x2d, 0x28, 0xc6, 0xfd, + 0x65, 0x04, 0x2f, 0x1e, 0x34, 0xbf, 0x3a, 0x1b, 0x73, 0x39, 0x65, 0x23, 0xdd, 0xdf, 0x02, 0x22, + 0x2e, 0xdc, 0x3f, 0x8d, 0x41, 0x75, 0xdf, 0x3a, 0x72, 0x74, 0xfb, 0x3c, 0x6f, 0xc9, 0x0d, 0x28, + 0x62, 0xca, 0xa4, 0x47, 0xb0, 0x5f, 0x1b, 0xfc, 0x98, 0xdc, 0x77, 0x6e, 0x75, 0x96, 0xb1, 0x15, + 0x4b, 0xb1, 0xe0, 0x22, 0x3a, 0xf3, 0x91, 0x47, 0x66, 0x4a, 0xd9, 0x76, 0xe5, 0x46, 0xdd, 0x76, + 0xad, 0x08, 0x6e, 0x09, 0x10, 0xd9, 0xa4, 0x1b, 0x4d, 0xcb, 0x36, 0xc3, 0x79, 0x5c, 0xc7, 0xee, + 0xd2, 0xb2, 0x3f, 0xad, 0x96, 0x29, 0x48, 0x10, 0xbd, 0xeb, 0xd8, 0x5d, 0x65, 0x1d, 0xae, 0x64, + 0xca, 0xc2, 0x75, 0xfd, 0xaf, 0x12, 0x5c, 0xe7, 0x38, 0x96, 0xdf, 0x3c, 0xf7, 0x03, 0xfe, 0x77, + 0x25, 0x58, 0xe1, 0x5a, 0x3f, 0xb5, 0xfc, 0xa6, 0x96, 0xf6, 0x9a, 0xff, 0x60, 0x58, 0x03, 0x0c, + 0x5a, 0x90, 0xba, 0x84, 0xe3, 0x88, 0xc2, 0xcf, 0xee, 0xc1, 0xe6, 0x60, 0x16, 0xfd, 0x5f, 0x6c, + 0xff, 0x41, 0x82, 0x2b, 0x2a, 0x6a, 0xb9, 0x27, 0x88, 0x71, 0x7a, 0xce, 0xdb, 0xf5, 0xcf, 0x6e, + 0x2b, 0x1e, 0xdf, 0x50, 0xe7, 0x7a, 0x36, 0xd4, 0x8a, 0x42, 0xd2, 0x5e, 0xd6, 0xf2, 0xb9, 0xed, + 0xff, 0x5e, 0x82, 0xf5, 0x03, 0xe4, 0xb5, 0x2c, 0x47, 0xf7, 0xd1, 0x79, 0xac, 0xee, 0x42, 0xd9, + 0x17, 0x7c, 0x7a, 0x8c, 0xbd, 0x35, 0xd0, 0xd8, 0x03, 0x57, 0xa0, 0x96, 0x02, 0xe6, 0xc2, 0xc0, + 0xd7, 0x40, 0xe9, 0x47, 0xc6, 0xe5, 0xfb, 0x6b, 0x09, 0x2e, 0xd3, 0xfb, 0xa9, 0x73, 0xb6, 0xa4, + 0x78, 0x84, 0xc7, 0xc8, 0x2d, 0x29, 0x7d, 0x67, 0x56, 0x0b, 0x94, 0xa9, 0x90, 0xe7, 0x4d, 0xa8, + 0x66, 0xa1, 0xf7, 0x77, 0xd3, 0x3f, 0xcd, 0xc1, 0x06, 0x67, 0xc2, 0xd2, 0xe8, 0x79, 0x44, 0x6d, + 0x65, 0x94, 0x82, 0xdd, 0x21, 0x64, 0x1d, 0x62, 0x09, 0x3d, 0xd5, 0x40, 0xfe, 0x5a, 0x24, 0x71, + 0xf2, 0x2e, 0x95, 0xe4, 0xed, 0x50, 0x45, 0xa0, 0xd4, 0x05, 0x86, 0xb8, 0xd7, 0x19, 0x90, 0x77, + 0xc7, 0x3f, 0xfb, 0xbc, 0x3b, 0x91, 0x95, 0x77, 0x37, 0xe1, 0x95, 0x41, 0x1a, 0xe1, 0x2e, 0xfa, + 0x23, 0x09, 0x2e, 0x8a, 0x97, 0x82, 0xe8, 0xbe, 0xf5, 0xe7, 0x22, 0xc5, 0xdc, 0x81, 0x25, 0x0b, + 0x6b, 0x29, 0xfd, 0x33, 0xd4, 0x36, 0xd3, 0xea, 0xbc, 0x85, 0x77, 0x7b, 0x3b, 0x66, 0x94, 0x2a, + 0x5c, 0x4a, 0x17, 0x88, 0x4b, 0xfc, 0x3f, 0x63, 0x64, 0xe7, 0x46, 0xf6, 0xb1, 0xdb, 0x44, 0x6f, + 0xc1, 0x6c, 0xcf, 0xb3, 0xeb, 0xfc, 0xec, 0x44, 0x5f, 0x87, 0x42, 0xe8, 0x92, 0xe1, 0x9b, 0x5d, + 0x30, 0x56, 0x37, 0xe5, 0xa7, 0x30, 0x2f, 0x36, 0xa5, 0xe6, 0x79, 0xfc, 0x4e, 0x0e, 0xb8, 0x84, + 0xd3, 0xef, 0x05, 0xdb, 0x69, 0x7a, 0x27, 0x49, 0xef, 0x21, 0x26, 0x46, 0xb9, 0x87, 0x98, 0x0b, + 0xc9, 0xe9, 0x80, 0x72, 0x9d, 0xe4, 0x89, 0xbe, 0x5a, 0xe7, 0xf6, 0xf9, 0x4b, 0x09, 0xd6, 0xee, + 0x23, 0x6c, 0x78, 0xd6, 0xe1, 0xb9, 0x6a, 0xc2, 0x37, 0x61, 0x6a, 0xd4, 0x9d, 0xf2, 0xa0, 0x69, + 0x55, 0xc1, 0x51, 0xf9, 0x41, 0x0e, 0xd6, 0xfb, 0x60, 0xf3, 0x9c, 0xf9, 0x2d, 0x28, 0x85, 0x77, + 0xa6, 0x86, 0xeb, 0x34, 0xac, 0x23, 0x7e, 0x72, 0xbe, 0x95, 0xbe, 0x96, 0x54, 0x03, 0x6d, 0x53, + 0x42, 0x75, 0x0e, 0xc5, 0x07, 0xe4, 0x23, 0x58, 0x4e, 0xb9, 0x9a, 0xa5, 0x17, 0xc1, 0x4c, 0xe0, + 0x9b, 0x23, 0x4c, 0x42, 0xaf, 0x7f, 0x17, 0x4f, 0xd3, 0x86, 0xe5, 0x6f, 0x81, 0xdc, 0x46, 0x8e, + 0x69, 0x39, 0x47, 0x9a, 0xce, 0xb6, 0xcd, 0x16, 0xc2, 0x95, 0x1c, 0xbd, 0xf4, 0xbc, 0x91, 0x3d, + 0xc7, 0x1e, 0xa3, 0x11, 0x3b, 0x6d, 0x3a, 0x43, 0xb9, 0x1d, 0x1b, 0xb4, 0x10, 0x96, 0x7f, 0x13, + 0x4a, 0x82, 0x3b, 0x4d, 0x64, 0x1e, 0x7d, 0x7d, 0xcf, 0xc5, 0x5f, 0xaa, 0x32, 0x78, 0xc7, 0x7d, + 0x89, 0xce, 0x30, 0xd7, 0x8e, 0x80, 0x3c, 0xe4, 0x28, 0xdf, 0x9d, 0x82, 0x25, 0xf1, 0x9c, 0x85, + 0xa8, 0x2f, 0x62, 0xe1, 0x45, 0x1b, 0x50, 0xc4, 0x6e, 0xc7, 0x33, 0x90, 0x66, 0xd8, 0x1d, 0xec, + 0x23, 0x8f, 0xfb, 0xd1, 0x2c, 0x1b, 0xdd, 0x66, 0x83, 0x09, 0x67, 0x1b, 0x1b, 0x36, 0x11, 0xe4, + 0x5e, 0x40, 0x22, 0xb8, 0x06, 0xc5, 0x9e, 0x97, 0x75, 0x76, 0xc9, 0x56, 0x68, 0x44, 0x5f, 0xd5, + 0x87, 0x7c, 0x87, 0x10, 0xb7, 0xea, 0xfc, 0x1d, 0x82, 0xff, 0x94, 0x7f, 0x27, 0xe5, 0x85, 0x77, + 0x8a, 0x9a, 0x40, 0x1d, 0xfa, 0x86, 0x27, 0x4d, 0xc1, 0x43, 0xbe, 0xef, 0xde, 0x85, 0x29, 0xce, + 0x31, 0xbd, 0xd9, 0x32, 0x99, 0x63, 0x54, 0x41, 0x20, 0x3f, 0x80, 0x39, 0x07, 0x9d, 0x6a, 0x64, + 0x6b, 0x22, 0x78, 0xe4, 0x87, 0xe4, 0x31, 0xeb, 0xa0, 0x53, 0xb5, 0xc3, 0x1f, 0x82, 0xbb, 0xa4, + 0xc6, 0x36, 0x5c, 0xe2, 0x0b, 0x87, 0x9d, 0x46, 0x03, 0x79, 0x4c, 0x95, 0x98, 0x3e, 0x40, 0x4c, + 0xab, 0x65, 0x0a, 0xda, 0xa2, 0x10, 0x26, 0x62, 0xd6, 0x83, 0xc5, 0x4c, 0xd6, 0x83, 0xc5, 0x57, + 0xe1, 0xa2, 0x58, 0x69, 0x76, 0x7b, 0xd7, 0x32, 0x5b, 0xd3, 0x4e, 0x82, 0x7a, 0x03, 0x8a, 0x6c, + 0x17, 0x28, 0x3c, 0x84, 0xbe, 0x4b, 0x4c, 0xab, 0x6c, 0x6f, 0x28, 0x3c, 0x49, 0xae, 0xc2, 0x8c, + 0x98, 0xc4, 0x31, 0x0d, 0xfa, 0x48, 0x3e, 0xad, 0xe6, 0x19, 0xd3, 0xc7, 0xa6, 0xf1, 0xf2, 0x5e, + 0x8d, 0x57, 0x60, 0x39, 0xe1, 0x23, 0x3c, 0xe1, 0xff, 0xd1, 0x04, 0xac, 0x04, 0x30, 0x55, 0x3f, + 0x8d, 0xc7, 0xe8, 0x4b, 0xad, 0xc2, 0xdf, 0x91, 0x52, 0x22, 0x23, 0x37, 0xe2, 0x6b, 0x4f, 0x86, + 0x64, 0xa3, 0x07, 0xc7, 0x78, 0xff, 0x1b, 0xf2, 0xfb, 0xba, 0xaf, 0x6f, 0xd9, 0xee, 0x61, 0xdf, + 0xe0, 0x98, 0x18, 0x92, 0x47, 0x32, 0x38, 0xd2, 0x9c, 0x76, 0xf2, 0x39, 0x9d, 0x7d, 0xaa, 0xaf, + 0xb3, 0xbf, 0x3c, 0x2f, 0xbd, 0x04, 0xab, 0x69, 0xf6, 0xe2, 0x8e, 0xfa, 0xfb, 0x39, 0xa8, 0xf4, + 0x38, 0xf1, 0xfb, 0xb7, 0x7f, 0x2e, 0xfc, 0xb4, 0x01, 0x8b, 0xf1, 0x0e, 0x99, 0xae, 0x66, 0xf9, + 0xa8, 0x25, 0x8a, 0xf4, 0xed, 0x91, 0xba, 0x64, 0xba, 0x75, 0x1f, 0xb5, 0xd4, 0xf9, 0x93, 0xc4, + 0x18, 0x96, 0xdf, 0x82, 0x49, 0x9e, 0x16, 0x87, 0xf5, 0x45, 0x8e, 0x2f, 0xef, 0x42, 0x31, 0xe6, + 0x10, 0x78, 0x68, 0x4f, 0x2c, 0x44, 0xbc, 0x04, 0x2b, 0x17, 0x23, 0xb9, 0x22, 0x34, 0x01, 0x37, + 0xd0, 0x19, 0x2c, 0xed, 0x77, 0x1d, 0x63, 0xbf, 0xa9, 0x7b, 0x26, 0x6f, 0x9b, 0x19, 0xad, 0xd2, + 0xaf, 0xc0, 0x34, 0x26, 0xc4, 0x61, 0x43, 0xc1, 0x14, 0xfd, 0x5d, 0x37, 0xe5, 0x4b, 0x90, 0x0f, + 0x1f, 0xd0, 0xd8, 0x6e, 0x3c, 0x1c, 0x20, 0xe9, 0x2d, 0x31, 0x33, 0x5f, 0xd4, 0x4f, 0xc7, 0x61, + 0x9e, 0xc0, 0xc4, 0x3e, 0x68, 0x04, 0x87, 0xb9, 0x02, 0x33, 0x81, 0xc3, 0x04, 0xfb, 0x0e, 0x10, + 0x43, 0x75, 0x33, 0x72, 0x28, 0xcf, 0x45, 0x0e, 0xe5, 0xd1, 0x4a, 0x3f, 0x1e, 0xaf, 0xf4, 0xeb, + 0x50, 0x08, 0xdf, 0xf1, 0xc2, 0x6d, 0x42, 0x30, 0x56, 0x37, 0xa9, 0xaa, 0x62, 0x4f, 0x7d, 0x7c, + 0xb7, 0x30, 0x1b, 0x7b, 0xd5, 0x93, 0x2f, 0x03, 0x88, 0x57, 0x21, 0x8b, 0x75, 0x2b, 0xe4, 0xd4, + 0x3c, 0x1f, 0xa9, 0x9b, 0x74, 0xa2, 0xc8, 0xbb, 0x23, 0x2d, 0xec, 0x64, 0xa2, 0xf0, 0xc9, 0x91, + 0xe4, 0x14, 0xda, 0x38, 0x18, 0x3e, 0x63, 0x50, 0xcc, 0x3c, 0xc5, 0x2c, 0x13, 0x50, 0xf0, 0xb8, + 0x40, 0xf1, 0xef, 0xc2, 0x94, 0x78, 0x2b, 0x84, 0x21, 0xdf, 0x0a, 0x05, 0x41, 0xf4, 0x65, 0x73, + 0x26, 0xfe, 0x21, 0xcc, 0x36, 0x14, 0x58, 0xfb, 0x22, 0xff, 0x84, 0xa4, 0x30, 0xe4, 0x27, 0x24, + 0x33, 0xb4, 0xb3, 0x91, 0x7f, 0x3d, 0xf2, 0x3a, 0xd0, 0xaf, 0x3f, 0x68, 0x71, 0x46, 0x9e, 0x66, + 0x99, 0xc8, 0xf1, 0x2d, 0xbf, 0x4b, 0x6b, 0x74, 0x5e, 0x95, 0x09, 0xec, 0x09, 0x05, 0xd5, 0x39, + 0x44, 0x7e, 0x02, 0x73, 0x3d, 0x11, 0xcb, 0x3b, 0xda, 0x6a, 0xa3, 0xc5, 0xaa, 0x5a, 0x8c, 0xc7, + 0xa9, 0xb2, 0x04, 0x0b, 0x71, 0x6f, 0xe3, 0x6e, 0xf8, 0x3d, 0x09, 0x2e, 0x8a, 0x13, 0xcb, 0x4b, + 0xee, 0xd4, 0x55, 0xfe, 0x44, 0x82, 0x4b, 0xe9, 0x6b, 0xe1, 0x07, 0xa7, 0x3b, 0xb0, 0xd4, 0x62, + 0xe3, 0xac, 0x23, 0x4f, 0xb3, 0x1c, 0xcd, 0xd0, 0x8d, 0x26, 0xe2, 0xcb, 0x9a, 0x6f, 0x45, 0xa8, + 0xea, 0xce, 0x36, 0x01, 0xc9, 0x6f, 0xc3, 0x4a, 0x82, 0xc8, 0xd4, 0x7d, 0xfd, 0x50, 0xc7, 0x88, + 0xc7, 0xce, 0x52, 0x9c, 0xee, 0x3e, 0x87, 0x2a, 0xff, 0x29, 0xc1, 0xaa, 0x58, 0x10, 0x57, 0xe4, + 0x03, 0x17, 0x47, 0x9f, 0xe3, 0x9a, 0x2e, 0xf6, 0x35, 0xdd, 0x34, 0x3d, 0x84, 0xb1, 0xd0, 0x0d, + 0x19, 0xbb, 0xc7, 0x86, 0xe4, 0x57, 0xa1, 0x2c, 0x32, 0x87, 0xd6, 0x70, 0x3d, 0x8d, 0xc0, 0xe8, + 0xa4, 0x13, 0x6a, 0x91, 0xa7, 0x90, 0x5d, 0xd7, 0x23, 0x4c, 0x13, 0x9a, 0xce, 0x25, 0x35, 0xfd, + 0x04, 0xe4, 0xf0, 0x44, 0x17, 0xb0, 0x1b, 0xf9, 0x64, 0x1f, 0x9e, 0x3e, 0xf9, 0xdc, 0xca, 0x9f, + 0x8d, 0x85, 0x5e, 0x10, 0x13, 0x94, 0x2b, 0x7e, 0x13, 0x4a, 0x4e, 0xa7, 0x75, 0x88, 0x3c, 0xcd, + 0x6d, 0x68, 0x74, 0xdd, 0x4c, 0xda, 0x09, 0xb5, 0xc8, 0xc6, 0xdf, 0x6d, 0xd0, 0x1c, 0x87, 0xe5, + 0x8b, 0x90, 0x17, 0x02, 0xe3, 0xca, 0xd8, 0x5a, 0x6e, 0x73, 0x42, 0x9d, 0xe6, 0x82, 0x62, 0xf9, + 0xdb, 0x30, 0x17, 0x8a, 0xc8, 0x0c, 0xd7, 0xef, 0xdb, 0xb6, 0x00, 0x97, 0x88, 0x11, 0xbc, 0xae, + 0x53, 0xab, 0xd2, 0x0a, 0x5d, 0x74, 0x62, 0x63, 0xf2, 0x1b, 0xb0, 0xcc, 0xe6, 0x36, 0x5c, 0xc7, + 0xf7, 0x5c, 0xdb, 0x46, 0x9e, 0x68, 0xae, 0x1c, 0xa7, 0xca, 0x5c, 0xa4, 0xe0, 0xed, 0x00, 0xca, + 0x3b, 0xf8, 0x49, 0x16, 0xe0, 0x26, 0x64, 0x0d, 0x20, 0xe2, 0xa7, 0x52, 0x83, 0xf2, 0xb6, 0xed, + 0x62, 0x44, 0x85, 0x13, 0x66, 0x8f, 0x56, 0x03, 0xa6, 0x04, 0x51, 0x0d, 0x94, 0x05, 0x90, 0xa3, + 0xf8, 0x3c, 0xc6, 0xfe, 0x51, 0x82, 0x32, 0xbb, 0xf4, 0x8e, 0x5e, 0xa1, 0x65, 0xb3, 0x91, 0x77, + 0x61, 0x9a, 0x14, 0xb2, 0x23, 0x12, 0xfe, 0x63, 0xb4, 0x2d, 0xf4, 0x4b, 0xfd, 0x9b, 0x4e, 0xd9, + 0x73, 0x15, 0xa3, 0x50, 0x03, 0xda, 0x68, 0xd7, 0x4b, 0x2e, 0xd6, 0xf5, 0x72, 0x0b, 0x16, 0x4e, + 0x2c, 0x6c, 0x1d, 0x5a, 0xb6, 0xe5, 0x77, 0x23, 0x1d, 0x20, 0xac, 0x2c, 0xcc, 0x87, 0xb0, 0xa0, + 0x53, 0x83, 0x88, 0x16, 0x95, 0x81, 0x8b, 0xf6, 0x7d, 0x09, 0x2e, 0xbf, 0x83, 0xfc, 0xc8, 0xde, + 0xe9, 0x11, 0xfb, 0xe2, 0x33, 0x28, 0xb1, 0x0f, 0x61, 0x92, 0x76, 0x62, 0x11, 0x87, 0xc9, 0x65, + 0x9a, 0x3a, 0x7b, 0x2f, 0x46, 0x7b, 0xb6, 0x54, 0xce, 0x83, 0x04, 0x09, 0xaf, 0xd4, 0xb4, 0x0f, + 0x43, 0x9c, 0xb9, 0xf9, 0x18, 0xf1, 0x11, 0xe5, 0xaf, 0xc6, 0xa0, 0x9a, 0xb5, 0x24, 0xee, 0xce, + 0x7f, 0x28, 0x41, 0x99, 0x7f, 0x99, 0x8a, 0xb5, 0xc3, 0x2e, 0xf3, 0x68, 0xbe, 0xbe, 0xa7, 0xc3, + 0x7f, 0xea, 0xd2, 0x67, 0x8a, 0x9a, 0x18, 0xd8, 0xea, 0x52, 0x5f, 0xe0, 0xbb, 0xf8, 0x56, 0x7c, + 0x74, 0xf5, 0xb7, 0x61, 0x21, 0x0d, 0x31, 0xba, 0xa3, 0x9d, 0x60, 0x3b, 0xda, 0x47, 0xf1, 0x1d, + 0xed, 0x9b, 0x23, 0x6a, 0x31, 0x58, 0x5f, 0x64, 0x57, 0xfb, 0x11, 0xac, 0xbd, 0x83, 0xfc, 0xfb, + 0x0f, 0xdf, 0xeb, 0x63, 0xbd, 0xf7, 0x79, 0x5b, 0x3e, 0x39, 0xe1, 0x08, 0x0b, 0x8e, 0x3a, 0x77, + 0xd0, 0x46, 0x48, 0x3b, 0xf5, 0xc9, 0x5f, 0x58, 0xf9, 0x03, 0x09, 0xd6, 0xfb, 0x4c, 0xce, 0xed, + 0xf4, 0x01, 0x94, 0xa3, 0xc7, 0x2c, 0x42, 0x2e, 0x16, 0x71, 0xe7, 0x39, 0x16, 0xa1, 0x46, 0x0f, + 0x6d, 0x64, 0x00, 0x2b, 0x7f, 0x2c, 0xc1, 0x02, 0xed, 0x77, 0x13, 0x59, 0x72, 0x84, 0xba, 0xf7, + 0x6e, 0xef, 0x4d, 0xe2, 0xaf, 0x0c, 0xbc, 0x49, 0x4c, 0x9b, 0x2a, 0xbc, 0x3d, 0x3c, 0x86, 0xc5, + 0x1e, 0x04, 0xae, 0x07, 0x15, 0xa6, 0x7b, 0x5a, 0x6c, 0xde, 0x18, 0x75, 0x2a, 0xde, 0x50, 0x13, + 0xf0, 0x21, 0xc5, 0x76, 0x41, 0x45, 0x7a, 0xbb, 0x6d, 0x77, 0x47, 0x3e, 0x59, 0xef, 0xf7, 0x4a, + 0x9e, 0xde, 0x5b, 0x1a, 0xfd, 0x42, 0x9b, 0x99, 0x23, 0x39, 0x5d, 0x28, 0xfd, 0x32, 0x2c, 0xf6, + 0x20, 0xf0, 0x95, 0xfe, 0xcd, 0x18, 0x2c, 0x32, 0x5f, 0xe9, 0xf5, 0xce, 0x1d, 0x18, 0x0f, 0x7a, + 0x87, 0x8b, 0xd1, 0xcb, 0xd3, 0xb4, 0x1c, 0x79, 0x1f, 0xe9, 0xe6, 0x43, 0xe4, 0xfb, 0xc8, 0xa3, + 0xcd, 0x78, 0xb4, 0xcb, 0x8b, 0x92, 0x27, 0xb6, 0xf7, 0x91, 0x4c, 0x9c, 0x3c, 0x20, 0xe4, 0xd2, + 0x0e, 0x08, 0x6f, 0x42, 0xc5, 0x72, 0x08, 0x86, 0x75, 0x82, 0x34, 0xe4, 0x98, 0x1a, 0x0f, 0xf4, + 0xf0, 0x5e, 0x6e, 0x31, 0x80, 0xef, 0x38, 0x26, 0x97, 0xa3, 0x6e, 0xca, 0x5f, 0x82, 0x72, 0x4b, + 0x3f, 0xb3, 0x5a, 0x9d, 0x96, 0xd6, 0x26, 0xf8, 0xd8, 0xfa, 0x08, 0xd1, 0x22, 0x34, 0xa1, 0xce, + 0x71, 0xc0, 0x9e, 0x7e, 0x84, 0xf6, 0xad, 0x8f, 0x90, 0xfc, 0x0a, 0x39, 0xb6, 0x9f, 0xf9, 0x0c, + 0x91, 0x75, 0xb7, 0x4e, 0xd2, 0xee, 0x56, 0x7a, 0xc7, 0x47, 0xd0, 0xd8, 0x97, 0x48, 0xff, 0xcd, + 0x3e, 0xea, 0x8d, 0xe9, 0x8b, 0x3b, 0xd2, 0x0b, 0x52, 0x58, 0x6a, 0x5c, 0x8e, 0xbd, 0xc0, 0xb8, + 0x4c, 0x93, 0x35, 0x97, 0x26, 0xeb, 0xbf, 0x4b, 0xb0, 0xbc, 0xd7, 0xf1, 0x8e, 0xd0, 0xe7, 0xd1, + 0x3b, 0x94, 0x55, 0xa8, 0x24, 0x85, 0x13, 0x0d, 0x44, 0x63, 0xb0, 0xfc, 0x08, 0x7d, 0x4e, 0x25, + 0xff, 0x4c, 0xe2, 0x62, 0x0b, 0x2a, 0x49, 0x85, 0xf1, 0xc0, 0x48, 0xe1, 0x21, 0xa5, 0xf1, 0xf8, + 0x0b, 0xfa, 0x95, 0x4b, 0xc3, 0x43, 0xb8, 0x19, 0x7d, 0x45, 0x1c, 0x25, 0x79, 0x3e, 0xed, 0x4d, + 0x9e, 0xbf, 0x3e, 0x64, 0xf2, 0xcc, 0x9c, 0x35, 0xcc, 0xa1, 0xf4, 0xc3, 0x97, 0x34, 0x3c, 0x26, + 0xe6, 0x56, 0xfb, 0xe3, 0x4f, 0xaa, 0x17, 0x7e, 0xfc, 0x49, 0xf5, 0xc2, 0xcf, 0x3e, 0xa9, 0x4a, + 0xdf, 0x79, 0x56, 0x95, 0x7e, 0xf0, 0xac, 0x2a, 0xfd, 0xf3, 0xb3, 0xaa, 0xf4, 0xf1, 0xb3, 0xaa, + 0xf4, 0x1f, 0xcf, 0xaa, 0xd2, 0x7f, 0x3d, 0xab, 0x5e, 0xf8, 0xd9, 0xb3, 0xaa, 0xf4, 0xfd, 0x4f, + 0xab, 0x17, 0x3e, 0xfe, 0xb4, 0x7a, 0xe1, 0xc7, 0x9f, 0x56, 0x2f, 0x3c, 0xbd, 0x7b, 0xe4, 0x86, + 0x4b, 0xb4, 0xdc, 0xbe, 0xff, 0x71, 0xe6, 0x57, 0xe3, 0x23, 0x87, 0x93, 0xf4, 0xbf, 0x70, 0xdc, + 0xf9, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc3, 0x3a, 0xe1, 0x59, 0xb0, 0x46, 0x00, 0x00, } func (this *StartWorkflowExecutionRequest) Equal(that interface{}) bool { @@ -6622,6 +6630,9 @@ func (this *DescribeHistoryHostRequest) Equal(that interface{}) bool { if this.ShardIdForHost != that1.ShardIdForHost { return false } + if this.NamespaceId != that1.NamespaceId { + return false + } if !this.ExecutionForHost.Equal(that1.ExecutionForHost) { return false } @@ -8086,10 +8097,11 @@ func (this *DescribeHistoryHostRequest) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 7) + s := make([]string, 0, 8) s = append(s, "&historyservice.DescribeHistoryHostRequest{") s = append(s, "HostAddress: "+fmt.Sprintf("%#v", this.HostAddress)+",\n") s = append(s, "ShardIdForHost: "+fmt.Sprintf("%#v", this.ShardIdForHost)+",\n") + s = append(s, "NamespaceId: "+fmt.Sprintf("%#v", this.NamespaceId)+",\n") if this.ExecutionForHost != nil { s = append(s, "ExecutionForHost: "+fmt.Sprintf("%#v", this.ExecutionForHost)+",\n") } @@ -11268,6 +11280,13 @@ func (m *DescribeHistoryHostRequest) MarshalToSizedBuffer(dAtA []byte) (int, err i = encodeVarintRequestResponse(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x22 + } + if len(m.NamespaceId) > 0 { + i -= len(m.NamespaceId) + copy(dAtA[i:], m.NamespaceId) + i = encodeVarintRequestResponse(dAtA, i, uint64(len(m.NamespaceId))) + i-- dAtA[i] = 0x1a } if m.ShardIdForHost != 0 { @@ -13336,6 +13355,10 @@ func (m *DescribeHistoryHostRequest) Size() (n int) { if m.ShardIdForHost != 0 { n += 1 + sovRequestResponse(uint64(m.ShardIdForHost)) } + l = len(m.NamespaceId) + if l > 0 { + n += 1 + l + sovRequestResponse(uint64(l)) + } if m.ExecutionForHost != nil { l = m.ExecutionForHost.Size() n += 1 + l + sovRequestResponse(uint64(l)) @@ -14448,6 +14471,7 @@ func (this *DescribeHistoryHostRequest) String() string { s := strings.Join([]string{`&DescribeHistoryHostRequest{`, `HostAddress:` + fmt.Sprintf("%v", this.HostAddress) + `,`, `ShardIdForHost:` + fmt.Sprintf("%v", this.ShardIdForHost) + `,`, + `NamespaceId:` + fmt.Sprintf("%v", this.NamespaceId) + `,`, `ExecutionForHost:` + strings.Replace(fmt.Sprintf("%v", this.ExecutionForHost), "WorkflowExecution", "v14.WorkflowExecution", 1) + `,`, `}`, }, "") @@ -23454,6 +23478,38 @@ func (m *DescribeHistoryHostRequest) Unmarshal(dAtA []byte) error { } } case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NamespaceId", 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.NamespaceId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ExecutionForHost", wireType) } diff --git a/client/history/client.go b/client/history/client.go index 8d953c5c5e4..cc3f80bc17d 100644 --- a/client/history/client.go +++ b/client/history/client.go @@ -74,7 +74,7 @@ func (c *clientImpl) StartWorkflowExecution( ctx context.Context, request *historyservice.StartWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.StartWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.StartRequest.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.StartRequest.WorkflowId) if err != nil { return nil, err } @@ -98,7 +98,7 @@ func (c *clientImpl) GetMutableState( ctx context.Context, request *historyservice.GetMutableStateRequest, opts ...grpc.CallOption) (*historyservice.GetMutableStateResponse, error) { - client, err := c.getClientForWorkflowID(request.Execution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.Execution.WorkflowId) if err != nil { return nil, err } @@ -122,7 +122,7 @@ func (c *clientImpl) PollMutableState( ctx context.Context, request *historyservice.PollMutableStateRequest, opts ...grpc.CallOption) (*historyservice.PollMutableStateResponse, error) { - client, err := c.getClientForWorkflowID(request.Execution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.Execution.WorkflowId) if err != nil { return nil, err } @@ -153,7 +153,7 @@ func (c *clientImpl) DescribeHistoryHost( if request.GetShardIdForHost() != 0 { client, err = c.getClientForShardID(int(request.GetShardIdForHost())) } else if request.ExecutionForHost != nil { - client, err = c.getClientForWorkflowID(request.ExecutionForHost.GetWorkflowId()) + client, err = c.getClientForWorkflowID(request.GetNamespaceId(), request.ExecutionForHost.GetWorkflowId()) } else { ret, err := c.clients.GetClientForClientKey(request.GetHostAddress()) if err != nil { @@ -241,7 +241,7 @@ func (c *clientImpl) DescribeMutableState( ctx context.Context, request *historyservice.DescribeMutableStateRequest, opts ...grpc.CallOption) (*historyservice.DescribeMutableStateResponse, error) { - client, err := c.getClientForWorkflowID(request.Execution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.Execution.WorkflowId) if err != nil { return nil, err } @@ -265,7 +265,7 @@ func (c *clientImpl) ResetStickyTaskQueue( ctx context.Context, request *historyservice.ResetStickyTaskQueueRequest, opts ...grpc.CallOption) (*historyservice.ResetStickyTaskQueueResponse, error) { - client, err := c.getClientForWorkflowID(request.Execution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.Execution.WorkflowId) if err != nil { return nil, err } @@ -289,7 +289,7 @@ func (c *clientImpl) DescribeWorkflowExecution( ctx context.Context, request *historyservice.DescribeWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.DescribeWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.Request.Execution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.Request.Execution.WorkflowId) if err != nil { return nil, err } @@ -313,7 +313,7 @@ func (c *clientImpl) RecordWorkflowTaskStarted( ctx context.Context, request *historyservice.RecordWorkflowTaskStartedRequest, opts ...grpc.CallOption) (*historyservice.RecordWorkflowTaskStartedResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -337,7 +337,7 @@ func (c *clientImpl) RecordActivityTaskStarted( ctx context.Context, request *historyservice.RecordActivityTaskStartedRequest, opts ...grpc.CallOption) (*historyservice.RecordActivityTaskStartedResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -365,7 +365,7 @@ func (c *clientImpl) RespondWorkflowTaskCompleted( if err != nil { return nil, err } - client, err := c.getClientForWorkflowID(taskToken.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, taskToken.GetWorkflowId()) if err != nil { return nil, err } @@ -389,7 +389,7 @@ func (c *clientImpl) RespondWorkflowTaskFailed( if err != nil { return nil, err } - client, err := c.getClientForWorkflowID(taskToken.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, taskToken.GetWorkflowId()) if err != nil { return nil, err } @@ -418,7 +418,7 @@ func (c *clientImpl) RespondActivityTaskCompleted( if err != nil { return nil, err } - client, err := c.getClientForWorkflowID(taskToken.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, taskToken.GetWorkflowId()) if err != nil { return nil, err } @@ -447,7 +447,7 @@ func (c *clientImpl) RespondActivityTaskFailed( if err != nil { return nil, err } - client, err := c.getClientForWorkflowID(taskToken.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, taskToken.GetWorkflowId()) if err != nil { return nil, err } @@ -476,7 +476,7 @@ func (c *clientImpl) RespondActivityTaskCanceled( if err != nil { return nil, err } - client, err := c.getClientForWorkflowID(taskToken.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, taskToken.GetWorkflowId()) if err != nil { return nil, err } @@ -505,7 +505,7 @@ func (c *clientImpl) RecordActivityTaskHeartbeat( if err != nil { return nil, err } - client, err := c.getClientForWorkflowID(taskToken.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, taskToken.GetWorkflowId()) if err != nil { return nil, err } @@ -529,7 +529,7 @@ func (c *clientImpl) RequestCancelWorkflowExecution( ctx context.Context, request *historyservice.RequestCancelWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.RequestCancelWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.CancelRequest.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.CancelRequest.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -553,7 +553,7 @@ func (c *clientImpl) SignalWorkflowExecution( ctx context.Context, request *historyservice.SignalWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.SignalWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.SignalRequest.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.SignalRequest.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -578,7 +578,7 @@ func (c *clientImpl) SignalWithStartWorkflowExecution( ctx context.Context, request *historyservice.SignalWithStartWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.SignalWithStartWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.SignalWithStartRequest.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.SignalWithStartRequest.WorkflowId) if err != nil { return nil, err } @@ -602,7 +602,7 @@ func (c *clientImpl) RemoveSignalMutableState( ctx context.Context, request *historyservice.RemoveSignalMutableStateRequest, opts ...grpc.CallOption) (*historyservice.RemoveSignalMutableStateResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -625,7 +625,7 @@ func (c *clientImpl) TerminateWorkflowExecution( ctx context.Context, request *historyservice.TerminateWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.TerminateWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.TerminateRequest.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.TerminateRequest.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -650,7 +650,7 @@ func (c *clientImpl) ResetWorkflowExecution( ctx context.Context, request *historyservice.ResetWorkflowExecutionRequest, opts ...grpc.CallOption) (*historyservice.ResetWorkflowExecutionResponse, error) { - client, err := c.getClientForWorkflowID(request.ResetRequest.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.ResetRequest.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -673,7 +673,7 @@ func (c *clientImpl) ScheduleWorkflowTask( ctx context.Context, request *historyservice.ScheduleWorkflowTaskRequest, opts ...grpc.CallOption) (*historyservice.ScheduleWorkflowTaskResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -698,7 +698,7 @@ func (c *clientImpl) RecordChildExecutionCompleted( ctx context.Context, request *historyservice.RecordChildExecutionCompletedRequest, opts ...grpc.CallOption) (*historyservice.RecordChildExecutionCompletedResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.WorkflowId) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.WorkflowId) if err != nil { return nil, err } @@ -723,7 +723,7 @@ func (c *clientImpl) ReplicateEvents( ctx context.Context, request *historyservice.ReplicateEventsRequest, opts ...grpc.CallOption) (*historyservice.ReplicateEventsResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.GetWorkflowId()) if err != nil { return nil, err } @@ -748,7 +748,7 @@ func (c *clientImpl) ReplicateRawEvents( ctx context.Context, request *historyservice.ReplicateRawEventsRequest, opts ...grpc.CallOption) (*historyservice.ReplicateRawEventsResponse, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.GetWorkflowId()) if err != nil { return nil, err } @@ -773,7 +773,7 @@ func (c *clientImpl) ReplicateEventsV2( ctx context.Context, request *historyservice.ReplicateEventsV2Request, opts ...grpc.CallOption) (*historyservice.ReplicateEventsV2Response, error) { - client, err := c.getClientForWorkflowID(request.WorkflowExecution.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.WorkflowExecution.GetWorkflowId()) if err != nil { return nil, err } @@ -826,7 +826,7 @@ func (c *clientImpl) SyncActivity( request *historyservice.SyncActivityRequest, opts ...grpc.CallOption) (*historyservice.SyncActivityResponse, error) { - client, err := c.getClientForWorkflowID(request.GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.GetWorkflowId()) if err != nil { return nil, err } @@ -852,7 +852,7 @@ func (c *clientImpl) QueryWorkflow( request *historyservice.QueryWorkflowRequest, opts ...grpc.CallOption, ) (*historyservice.QueryWorkflowResponse, error) { - client, err := c.getClientForWorkflowID(request.GetRequest().GetExecution().GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.GetRequest().GetExecution().GetWorkflowId()) if err != nil { return nil, err } @@ -932,8 +932,9 @@ func (c *clientImpl) GetDLQReplicationMessages( opts ...grpc.CallOption, ) (*historyservice.GetDLQReplicationMessagesResponse, error) { // All workflow IDs are in the same shard per request + namespaceID := request.GetTaskInfos()[0].GetNamespaceId() workflowID := request.GetTaskInfos()[0].GetWorkflowId() - client, err := c.getClientForWorkflowID(workflowID) + client, err := c.getClientForWorkflowID(namespaceID, workflowID) if err != nil { return nil, err } @@ -950,7 +951,8 @@ func (c *clientImpl) ReapplyEvents( request *historyservice.ReapplyEventsRequest, opts ...grpc.CallOption, ) (*historyservice.ReapplyEventsResponse, error) { - client, err := c.getClientForWorkflowID(request.GetRequest().GetWorkflowExecution().GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, + request.GetRequest().GetWorkflowExecution().GetWorkflowId()) if err != nil { return nil, err } @@ -1015,7 +1017,7 @@ func (c *clientImpl) RefreshWorkflowTasks( request *historyservice.RefreshWorkflowTasksRequest, opts ...grpc.CallOption, ) (*historyservice.RefreshWorkflowTasksResponse, error) { - client, err := c.getClientForWorkflowID(request.GetRequest().GetExecution().GetWorkflowId()) + client, err := c.getClientForWorkflowID(request.NamespaceId, request.GetRequest().GetExecution().GetWorkflowId()) var response *historyservice.RefreshWorkflowTasksResponse op := func(ctx context.Context, client historyservice.HistoryServiceClient) error { var err error @@ -1035,8 +1037,8 @@ func (c *clientImpl) createContext(parent context.Context) (context.Context, con return context.WithTimeout(parent, c.timeout) } -func (c *clientImpl) getClientForWorkflowID(workflowID string) (historyservice.HistoryServiceClient, error) { - key := common.WorkflowIDToHistoryShard(workflowID, c.numberOfShards) +func (c *clientImpl) getClientForWorkflowID(namespaceID, workflowID string) (historyservice.HistoryServiceClient, error) { + key := common.WorkflowIDToHistoryShard(namespaceID, workflowID, c.numberOfShards) return c.getClientForShardID(key) } diff --git a/common/util.go b/common/util.go index d3db92ab41f..da98d36097f 100644 --- a/common/util.go +++ b/common/util.go @@ -236,9 +236,10 @@ func IsWhitelistServiceTransientError(err error) bool { return false } -// WorkflowIDToHistoryShard is used to map workflowID to a shardID -func WorkflowIDToHistoryShard(workflowID string, numberOfShards int) int { - hash := farm.Fingerprint32([]byte(workflowID)) +// WorkflowIDToHistoryShard is used to map namespaceID-workflowID pair to a shardID +func WorkflowIDToHistoryShard(namespaceID, workflowID string, numberOfShards int) int { + idBytes := []byte(namespaceID + "_" + workflowID) + hash := farm.Hash32(idBytes) return int(hash % uint32(numberOfShards)) } diff --git a/host/archival_test.go b/host/archival_test.go index dd6315e7fee..ef06aeca7f1 100644 --- a/host/archival_test.go +++ b/host/archival_test.go @@ -184,7 +184,9 @@ func (s *integrationSuite) isHistoryArchived(namespace string, execution *common } func (s *integrationSuite) isHistoryDeleted(execution *commonpb.WorkflowExecution) bool { - shardID := common.WorkflowIDToHistoryShard(execution.GetWorkflowId(), s.testClusterConfig.HistoryConfig.NumHistoryShards) + namespaceID := s.getNamespaceID(s.archivalNamespace) + shardID := common.WorkflowIDToHistoryShard(namespaceID, execution.GetWorkflowId(), + s.testClusterConfig.HistoryConfig.NumHistoryShards) request := &persistence.GetHistoryTreeRequest{ TreeID: execution.GetRunId(), ShardID: convert.IntPtr(shardID), 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 e9e5aa12008..fc263b7dd47 100644 --- a/proto/internal/temporal/server/api/adminservice/v1/request_response.proto +++ b/proto/internal/temporal/server/api/adminservice/v1/request_response.proto @@ -51,7 +51,8 @@ message DescribeHistoryHostRequest { //ip:port string host_address = 1; int32 shard_id_for_host = 2; - temporal.api.common.v1.WorkflowExecution execution_for_host = 3; + string namespace = 3; + temporal.api.common.v1.WorkflowExecution execution_for_host = 4; } message DescribeHistoryHostResponse { diff --git a/proto/internal/temporal/server/api/historyservice/v1/request_response.proto b/proto/internal/temporal/server/api/historyservice/v1/request_response.proto index 20fa00abdde..ed4e9dceb10 100644 --- a/proto/internal/temporal/server/api/historyservice/v1/request_response.proto +++ b/proto/internal/temporal/server/api/historyservice/v1/request_response.proto @@ -403,7 +403,8 @@ message DescribeHistoryHostRequest { //ip:port string host_address = 1; int32 shard_id_for_host = 2; - temporal.api.common.v1.WorkflowExecution execution_for_host = 3; + string namespace_id = 3; + temporal.api.common.v1.WorkflowExecution execution_for_host = 4; } message DescribeHistoryHostResponse { diff --git a/service/frontend/adminHandler.go b/service/frontend/adminHandler.go index a2c624cc18c..ed1a2d40f33 100644 --- a/service/frontend/adminHandler.go +++ b/service/frontend/adminHandler.go @@ -203,7 +203,9 @@ func (adh *AdminHandler) DescribeWorkflowExecution(ctx context.Context, request return nil, adh.error(err, scope) } - shardID := common.WorkflowIDToHistoryShard(request.Execution.WorkflowId, adh.numberOfHistoryShards) + namespaceID, err := adh.GetNamespaceCache().GetNamespaceID(request.GetNamespace()) + + shardID := common.WorkflowIDToHistoryShard(namespaceID, request.Execution.WorkflowId, adh.numberOfHistoryShards) shardIDstr := string(shardID) shardIDForOutput := strconv.Itoa(shardID) @@ -212,8 +214,6 @@ func (adh *AdminHandler) DescribeWorkflowExecution(ctx context.Context, request return nil, adh.error(err, scope) } - namespaceID, err := adh.GetNamespaceCache().GetNamespaceID(request.GetNamespace()) - historyAddr := historyHost.GetAddress() resp2, err := adh.GetHistoryClient().DescribeMutableState(ctx, &historyservice.DescribeMutableStateRequest{ NamespaceId: namespaceID, @@ -275,7 +275,14 @@ func (adh *AdminHandler) DescribeHistoryHost(ctx context.Context, request *admin return nil, adh.error(errRequestNotSet, scope) } + var err error + namespaceID := "" if request.ExecutionForHost != nil { + namespaceID, err = adh.GetNamespaceCache().GetNamespaceID(request.Namespace) + if err != nil { + return nil, adh.error(err, scope) + } + if err := validateExecution(request.ExecutionForHost); err != nil { return nil, adh.error(err, scope) } @@ -284,6 +291,7 @@ func (adh *AdminHandler) DescribeHistoryHost(ctx context.Context, request *admin resp, err := adh.GetHistoryClient().DescribeHistoryHost(ctx, &historyservice.DescribeHistoryHostRequest{ HostAddress: request.GetHostAddress(), ShardIdForHost: request.GetShardIdForHost(), + NamespaceId: namespaceID, ExecutionForHost: request.GetExecutionForHost(), }) @@ -398,7 +406,8 @@ func (adh *AdminHandler) GetWorkflowExecutionRawHistory(ctx context.Context, req // TODO need to deal with transient workflow task if to be used by client getting history var historyBatches []*historypb.History - shardID := common.WorkflowIDToHistoryShard(execution.GetWorkflowId(), adh.numberOfHistoryShards) + shardID := common.WorkflowIDToHistoryShard(namespaceID, execution.GetWorkflowId(), + adh.numberOfHistoryShards) _, historyBatches, continuationToken.PersistenceToken, size, err = history.PaginateHistory( adh.GetHistoryManager(), true, // this means that we are getting history by batch @@ -532,6 +541,7 @@ func (adh *AdminHandler) GetWorkflowExecutionRawHistoryV2(ctx context.Context, r } pageSize := int(request.GetMaximumPageSize()) shardID := common.WorkflowIDToHistoryShard( + namespaceID, execution.GetWorkflowId(), adh.numberOfHistoryShards, ) diff --git a/service/frontend/workflowHandler.go b/service/frontend/workflowHandler.go index 701cc969844..1725ac6db06 100644 --- a/service/frontend/workflowHandler.go +++ b/service/frontend/workflowHandler.go @@ -3196,7 +3196,7 @@ func (wh *WorkflowHandler) getRawHistory( branchToken []byte, ) ([]*commonpb.DataBlob, []byte, error) { var rawHistory []*commonpb.DataBlob - shardID := common.WorkflowIDToHistoryShard(execution.GetWorkflowId(), wh.config.NumHistoryShards) + shardID := common.WorkflowIDToHistoryShard(namespaceID, execution.GetWorkflowId(), wh.config.NumHistoryShards) resp, err := wh.GetHistoryManager().ReadRawHistoryBranch(&persistence.ReadHistoryBranchRequest{ BranchToken: branchToken, @@ -3272,7 +3272,7 @@ func (wh *WorkflowHandler) getHistory( var size int isFirstPage := len(nextPageToken) == 0 - shardID := common.WorkflowIDToHistoryShard(execution.GetWorkflowId(), wh.config.NumHistoryShards) + shardID := common.WorkflowIDToHistoryShard(namespaceID, execution.GetWorkflowId(), wh.config.NumHistoryShards) var err error var historyEvents []*historypb.HistoryEvent historyEvents, size, nextPageToken, err = persistence.ReadFullPageV2Events(wh.GetHistoryManager(), &persistence.ReadHistoryBranchRequest{ diff --git a/service/frontend/workflowHandler_test.go b/service/frontend/workflowHandler_test.go index 103817936b2..74c3a3df5ed 100644 --- a/service/frontend/workflowHandler_test.go +++ b/service/frontend/workflowHandler_test.go @@ -1008,7 +1008,7 @@ func (s *workflowHandlerSuite) TestGetHistory() { WorkflowId: "wid", RunId: "rid", } - shardID := common.WorkflowIDToHistoryShard(we.WorkflowId, numHistoryShards) + shardID := common.WorkflowIDToHistoryShard(namespaceID, we.WorkflowId, numHistoryShards) req := &persistence.ReadHistoryBranchRequest{ BranchToken: branchToken, MinEventID: firstEventID, diff --git a/service/history/handler.go b/service/history/handler.go index 858f49c9a86..a83af074deb 100644 --- a/service/history/handler.go +++ b/service/history/handler.go @@ -287,7 +287,7 @@ func (h *Handler) RecordActivityTaskHeartbeat(ctx context.Context, request *hist } workflowID := taskToken.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -322,7 +322,7 @@ func (h *Handler) RecordActivityTaskStarted(ctx context.Context, request *histor return nil, h.error(errHistoryHostThrottle, scope, namespaceID, workflowID) } - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -366,7 +366,7 @@ func (h *Handler) RecordWorkflowTaskStarted(ctx context.Context, request *histor return nil, h.error(errTaskQueueNotSet, scope, namespaceID, workflowID) } - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { h.GetLogger().Error("RecordWorkflowTaskStarted failed.", tag.Error(err1), @@ -417,7 +417,7 @@ func (h *Handler) RespondActivityTaskCompleted(ctx context.Context, request *his } workflowID := taskToken.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -461,7 +461,7 @@ func (h *Handler) RespondActivityTaskFailed(ctx context.Context, request *histor } workflowID := taskToken.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -505,7 +505,7 @@ func (h *Handler) RespondActivityTaskCanceled(ctx context.Context, request *hist } workflowID := taskToken.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -558,7 +558,7 @@ func (h *Handler) RespondWorkflowTaskCompleted(ctx context.Context, request *his } workflowID := token.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -622,7 +622,7 @@ func (h *Handler) RespondWorkflowTaskFailed(ctx context.Context, request *histor } workflowID := token.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -660,7 +660,7 @@ func (h *Handler) StartWorkflowExecution(ctx context.Context, request *historyse startRequest := request.StartRequest workflowID := startRequest.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -754,7 +754,7 @@ func (h *Handler) DescribeMutableState(ctx context.Context, request *historyserv workflowExecution := request.Execution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -787,7 +787,7 @@ func (h *Handler) GetMutableState(ctx context.Context, request *historyservice.G workflowExecution := request.Execution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -820,7 +820,7 @@ func (h *Handler) PollMutableState(ctx context.Context, request *historyservice. workflowExecution := request.Execution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -853,7 +853,7 @@ func (h *Handler) DescribeWorkflowExecution(ctx context.Context, request *histor workflowExecution := request.Request.Execution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -896,7 +896,7 @@ func (h *Handler) RequestCancelWorkflowExecution(ctx context.Context, request *h tag.WorkflowRunID(cancelRequest.WorkflowExecution.GetRunId())) workflowID := cancelRequest.WorkflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -935,7 +935,7 @@ func (h *Handler) SignalWorkflowExecution(ctx context.Context, request *historys workflowExecution := request.SignalRequest.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -977,7 +977,7 @@ func (h *Handler) SignalWithStartWorkflowExecution(ctx context.Context, request signalWithStartRequest := request.SignalWithStartRequest workflowID := signalWithStartRequest.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1016,7 +1016,7 @@ func (h *Handler) RemoveSignalMutableState(ctx context.Context, request *history workflowExecution := request.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1055,7 +1055,7 @@ func (h *Handler) TerminateWorkflowExecution(ctx context.Context, request *histo workflowExecution := request.TerminateRequest.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1094,7 +1094,7 @@ func (h *Handler) ResetWorkflowExecution(ctx context.Context, request *historyse workflowExecution := request.ResetRequest.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1131,7 +1131,7 @@ func (h *Handler) QueryWorkflow(ctx context.Context, request *historyservice.Que } workflowID := request.GetRequest().GetExecution().GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1176,7 +1176,7 @@ func (h *Handler) ScheduleWorkflowTask(ctx context.Context, request *historyserv workflowExecution := request.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1219,7 +1219,7 @@ func (h *Handler) RecordChildExecutionCompleted(ctx context.Context, request *hi workflowExecution := request.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1263,7 +1263,7 @@ func (h *Handler) ResetStickyTaskQueue(ctx context.Context, request *historyserv } workflowID := request.Execution.GetWorkflowId() - engine, err := h.controller.GetEngine(workflowID) + engine, err := h.controller.GetEngine(namespaceID, workflowID) if err != nil { return nil, h.error(err, scope, namespaceID, workflowID) } @@ -1301,7 +1301,7 @@ func (h *Handler) ReplicateEvents(ctx context.Context, request *historyservice.R workflowExecution := request.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1339,7 +1339,7 @@ func (h *Handler) ReplicateRawEvents(ctx context.Context, request *historyservic workflowExecution := request.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1377,7 +1377,7 @@ func (h *Handler) ReplicateEventsV2(ctx context.Context, request *historyservice workflowExecution := request.WorkflowExecution workflowID := workflowExecution.GetWorkflowId() - engine, err1 := h.controller.GetEngine(workflowID) + engine, err1 := h.controller.GetEngine(namespaceID, workflowID) if err1 != nil { return nil, h.error(err1, scope, namespaceID, workflowID) } @@ -1468,7 +1468,7 @@ func (h *Handler) SyncActivity(ctx context.Context, request *historyservice.Sync } workflowID := request.GetWorkflowId() - engine, err := h.controller.GetEngine(workflowID) + engine, err := h.controller.GetEngine(namespaceID, workflowID) if err != nil { return nil, h.error(err, scope, namespaceID, workflowID) } @@ -1577,6 +1577,7 @@ func (h *Handler) GetDLQReplicationMessages(ctx context.Context, request *histor } engine, err := h.controller.GetEngine( + taskInfos[0].GetNamespaceId(), taskInfos[0].GetWorkflowId(), ) if err != nil { @@ -1629,7 +1630,7 @@ func (h *Handler) ReapplyEvents(ctx context.Context, request *historyservice.Rea namespaceID := request.GetNamespaceId() workflowID := request.GetRequest().GetWorkflowExecution().GetWorkflowId() - engine, err := h.controller.GetEngine(workflowID) + engine, err := h.controller.GetEngine(namespaceID, workflowID) if err != nil { return nil, h.error(err, scope, namespaceID, workflowID) } @@ -1758,7 +1759,7 @@ func (h *Handler) RefreshWorkflowTasks(ctx context.Context, request *historyserv namespaceID := request.GetNamespaceId() execution := request.GetRequest().GetExecution() workflowID := execution.GetWorkflowId() - engine, err := h.controller.GetEngine(workflowID) + engine, err := h.controller.GetEngine(namespaceID, workflowID) if err != nil { err = h.error(err, scope, namespaceID, workflowID) return nil, err diff --git a/service/history/historyEventNotifier.go b/service/history/historyEventNotifier.go index 8530a22ba77..c4729ffa1a5 100644 --- a/service/history/historyEventNotifier.go +++ b/service/history/historyEventNotifier.go @@ -66,8 +66,8 @@ type ( closeChan chan bool // this channel will never close eventsChan chan *historyEventNotification - // function which calculate the shard ID from given workflow ID - workflowIDToShardID func(string) int + // function which calculate the shard ID from given namespaceID and workflowID pair + workflowIDToShardID func(string, string) int // concurrent map with key workflowIdentifier, value map[string]chan *historyEventNotification. // the reason for the second map being non thread safe: @@ -108,7 +108,7 @@ func newHistoryEventNotification( func newHistoryEventNotifier( timeSource clock.TimeSource, metrics metrics.Client, - workflowIDToShardID func(string) int, + workflowIDToShardID func(string, string) int, ) *historyEventNotifierImpl { hashFn := func(key interface{}) uint32 { @@ -116,7 +116,7 @@ func newHistoryEventNotifier( if !ok { return 0 } - return uint32(workflowIDToShardID(notification.id.WorkflowID)) + return uint32(workflowIDToShardID(notification.id.NamespaceID, notification.id.WorkflowID)) } return &historyEventNotifierImpl{ timeSource: timeSource, diff --git a/service/history/service.go b/service/history/service.go index 654f85b0a06..d987b3452d4 100644 --- a/service/history/service.go +++ b/service/history/service.go @@ -414,9 +414,9 @@ func NewConfig(dc *dynamicconfig.Collection, numberOfShards int, storeType strin return cfg } -// GetShardID return the corresponding shard ID for a given workflow ID -func (config *Config) GetShardID(workflowID string) int { - return common.WorkflowIDToHistoryShard(workflowID, config.NumberOfShards) +// GetShardID return the corresponding shard ID for a given namespaceID and workflowID pair +func (config *Config) GetShardID(namespaceID, workflowID string) int { + return common.WorkflowIDToHistoryShard(namespaceID, workflowID, config.NumberOfShards) } // Service represents the history service diff --git a/service/history/shardController.go b/service/history/shardController.go index e0a52434724..006afcf9048 100644 --- a/service/history/shardController.go +++ b/service/history/shardController.go @@ -174,8 +174,8 @@ func (c *shardController) isShuttingDown() bool { return atomic.LoadInt32(&c.shuttingDown) != 0 } -func (c *shardController) GetEngine(workflowID string) (Engine, error) { - shardID := c.config.GetShardID(workflowID) +func (c *shardController) GetEngine(namespaceID, workflowID string) (Engine, error) { + shardID := c.config.GetShardID(namespaceID, workflowID) return c.getEngineForShard(shardID) } diff --git a/service/worker/indexer/esProcessor.go b/service/worker/indexer/esProcessor.go index e330ee74c0f..62cb13ab97c 100644 --- a/service/worker/indexer/esProcessor.go +++ b/service/worker/indexer/esProcessor.go @@ -29,11 +29,11 @@ import ( "encoding/json" "time" + "github.com/dgryski/go-farm" "github.com/olivere/elastic" "github.com/uber-go/tally" indexerspb "go.temporal.io/server/api/indexer/v1" - "go.temporal.io/server/common" "go.temporal.io/server/common/codec" "go.temporal.io/server/common/collection" es "go.temporal.io/server/common/elasticsearch" @@ -237,7 +237,10 @@ func (p *esProcessorImpl) hashFn(key interface{}) uint32 { return 0 } numOfShards := p.config.IndexerConcurrency() - return uint32(common.WorkflowIDToHistoryShard(id, numOfShards)) + + idBytes := []byte(id) + hash := farm.Hash32(idBytes) + return hash % uint32(numOfShards) } func (p *esProcessorImpl) getKeyForKafkaMsg(request elastic.BulkableRequest) string { diff --git a/tools/cli/admin.go b/tools/cli/admin.go index ed2ed6b044f..8e2f85f988f 100644 --- a/tools/cli/admin.go +++ b/tools/cli/admin.go @@ -325,8 +325,12 @@ func newAdminHistoryHostCommands() []cli.Command { { Name: "get_shardid", Aliases: []string{"gsh"}, - Usage: "Get shardId for a workflowId", + Usage: "Get shardId for a namespaceId and workflowId combination", Flags: []cli.Flag{ + cli.StringFlag{ + Name: FlagNamespaceID, + Usage: "NamespaceId", + }, cli.StringFlag{ Name: FlagWorkflowIDWithAlias, Usage: "WorkflowId", diff --git a/tools/cli/adminCommands.go b/tools/cli/adminCommands.go index 8b69efa7b0f..2e8680b7053 100644 --- a/tools/cli/adminCommands.go +++ b/tools/cli/adminCommands.go @@ -383,6 +383,7 @@ func AdminGetNamespaceIDOrName(c *cli.Context) { // AdminGetShardID get shardID func AdminGetShardID(c *cli.Context) { + namespaceID := getRequiredOption(c, FlagNamespaceID) wid := getRequiredOption(c, FlagWorkflowID) numberOfShards := c.Int(FlagNumberOfShards) @@ -390,8 +391,8 @@ func AdminGetShardID(c *cli.Context) { ErrorAndExit("numberOfShards is required", nil) return } - shardID := common.WorkflowIDToHistoryShard(wid, numberOfShards) - fmt.Printf("ShardId for workflowId: %v is %v \n", wid, shardID) + shardID := common.WorkflowIDToHistoryShard(namespaceID, wid, numberOfShards) + fmt.Printf("ShardId for namespace, workflowId: %v, %v is %v \n", namespaceID, wid, shardID) } // AdminDescribeTask outputs the details of a task given Task Id, Task Type, Shard Id and Visibility Timestamp diff --git a/tools/cli/adminKafkaCommands.go b/tools/cli/adminKafkaCommands.go index 756c68b5058..dd66b08348d 100644 --- a/tools/cli/adminKafkaCommands.go +++ b/tools/cli/adminKafkaCommands.go @@ -692,7 +692,7 @@ func AdminRereplicate(c *cli.Context) { maxID = int64(i) } - shardID := common.WorkflowIDToHistoryShard(wid, numberOfShards) + shardID := common.WorkflowIDToHistoryShard(namespaceID, wid, numberOfShards) doRereplicate(ctx, shardID, namespaceID, wid, rid, minID, maxID, startVersion, targets, producer, session, adminClient) fmt.Printf("Done processing line %v ...\n", idx) } @@ -705,7 +705,7 @@ func AdminRereplicate(c *cli.Context) { rid := getRequiredOption(c, FlagRunID) minID := c.Int64(FlagMinEventID) maxID := c.Int64(FlagMaxEventID) - shardID := common.WorkflowIDToHistoryShard(wid, numberOfShards) + shardID := common.WorkflowIDToHistoryShard(namespaceID, wid, numberOfShards) doRereplicate(ctx, shardID, namespaceID, wid, rid, minID, maxID, startVersion, targets, producer, session, adminClient) } From 2974bde2946e3124097ce94545d8c6cd501f915d Mon Sep 17 00:00:00 2001 From: Samar Abbas Date: Wed, 29 Jul 2020 22:38:59 -0700 Subject: [PATCH 2/2] fix build break --- service/history/conflictResolver_test.go | 2 +- service/history/historyEngine2_test.go | 4 ++-- service/history/historyEngine3_eventsv2_test.go | 4 ++-- service/history/historyEngine_test.go | 6 ++++-- service/history/historyEventNotifier_test.go | 5 +++-- service/history/historyReplicator_test.go | 2 +- service/history/nDCActivityReplicator_test.go | 4 ++-- service/history/timerQueueActiveTaskExecutor_test.go | 3 ++- service/history/timerQueueStandbyTaskExecutor_test.go | 3 ++- service/history/transferQueueActiveTaskExecutor_test.go | 4 ++-- service/history/workflowResetor_test.go | 2 +- 11 files changed, 22 insertions(+), 17 deletions(-) diff --git a/service/history/conflictResolver_test.go b/service/history/conflictResolver_test.go index d582eab2c3d..3ad78bee0fb 100644 --- a/service/history/conflictResolver_test.go +++ b/service/history/conflictResolver_test.go @@ -125,7 +125,7 @@ func (s *conflictResolverSuite) SetupTest() { h := &historyEngineImpl{ shard: s.mockShard, clusterMetadata: s.mockClusterMetadata, - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/historyEngine2_test.go b/service/history/historyEngine2_test.go index d58bdd4c0b7..e6c02502a48 100644 --- a/service/history/historyEngine2_test.go +++ b/service/history/historyEngine2_test.go @@ -114,7 +114,7 @@ func (s *engine2Suite) SetupTest() { s.controller, &p.ShardInfoWithFailover{ ShardInfo: &persistenceblobs.ShardInfo{ - ShardId: 0, + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -151,7 +151,7 @@ func (s *engine2Suite) SetupTest() { tokenSerializer: common.NewProtoTaskTokenSerializer(), config: s.config, timeSource: s.mockShard.GetTimeSource(), - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/historyEngine3_eventsv2_test.go b/service/history/historyEngine3_eventsv2_test.go index d476ca6c6d6..92010f748ae 100644 --- a/service/history/historyEngine3_eventsv2_test.go +++ b/service/history/historyEngine3_eventsv2_test.go @@ -106,7 +106,7 @@ func (s *engine3Suite) SetupTest() { s.mockShard = newTestShardContext( s.controller, &p.ShardInfoWithFailover{ShardInfo: &persistenceblobs.ShardInfo{ - ShardId: 0, + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -140,7 +140,7 @@ func (s *engine3Suite) SetupTest() { tokenSerializer: common.NewProtoTaskTokenSerializer(), config: s.config, timeSource: s.mockShard.GetTimeSource(), - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/historyEngine_test.go b/service/history/historyEngine_test.go index 86d1e7c8664..641d2e149a6 100644 --- a/service/history/historyEngine_test.go +++ b/service/history/historyEngine_test.go @@ -223,6 +223,7 @@ func (s *engineSuite) SetupTest() { s.controller, &persistence.ShardInfoWithFailover{ ShardInfo: &persistenceblobs.ShardInfo{ + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -248,8 +249,9 @@ func (s *engineSuite) SetupTest() { historyEventNotifier := newHistoryEventNotifier( clock.NewRealTimeSource(), s.mockShard.resource.MetricsClient, - func(workflowID string) int { - return len(workflowID) + func(namespaceID, workflowID string) int { + key := namespaceID + "_" + workflowID + return len(key) }, ) diff --git a/service/history/historyEventNotifier_test.go b/service/history/historyEventNotifier_test.go index a04f64cc2ac..035d91eed21 100644 --- a/service/history/historyEventNotifier_test.go +++ b/service/history/historyEventNotifier_test.go @@ -69,8 +69,9 @@ func (s *historyEventNotifierSuite) SetupTest() { s.historyEventNotifier = newHistoryEventNotifier( clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), - func(workflowID string) int { - return len(workflowID) + func(namespaceID, workflowID string) int { + key := namespaceID + "_" + workflowID + return len(key) }, ) s.historyEventNotifier.Start() diff --git a/service/history/historyReplicator_test.go b/service/history/historyReplicator_test.go index 41ed2f46e33..7feba4d9c6d 100644 --- a/service/history/historyReplicator_test.go +++ b/service/history/historyReplicator_test.go @@ -147,7 +147,7 @@ func (s *historyReplicatorSuite) SetupTest() { tokenSerializer: common.NewProtoTaskTokenSerializer(), metricsClient: s.mockShard.GetMetricsClient(), timeSource: s.mockShard.GetTimeSource(), - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return testShardID }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/nDCActivityReplicator_test.go b/service/history/nDCActivityReplicator_test.go index a3ca4ab026a..726f5b2dcfb 100644 --- a/service/history/nDCActivityReplicator_test.go +++ b/service/history/nDCActivityReplicator_test.go @@ -108,7 +108,7 @@ func (s *activityReplicatorSuite) SetupTest() { s.controller, &persistence.ShardInfoWithFailover{ ShardInfo: &persistenceblobs.ShardInfo{ - ShardId: 0, + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -135,7 +135,7 @@ func (s *activityReplicatorSuite) SetupTest() { tokenSerializer: common.NewProtoTaskTokenSerializer(), metricsClient: s.mockShard.GetMetricsClient(), timeSource: s.mockShard.GetTimeSource(), - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/timerQueueActiveTaskExecutor_test.go b/service/history/timerQueueActiveTaskExecutor_test.go index 5963133365e..621b8ec9051 100644 --- a/service/history/timerQueueActiveTaskExecutor_test.go +++ b/service/history/timerQueueActiveTaskExecutor_test.go @@ -115,6 +115,7 @@ func (s *timerQueueActiveTaskExecutorSuite) SetupTest() { s.controller, &persistence.ShardInfoWithFailover{ ShardInfo: &persistenceblobs.ShardInfo{ + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -147,7 +148,7 @@ func (s *timerQueueActiveTaskExecutorSuite) SetupTest() { logger: s.logger, tokenSerializer: common.NewProtoTaskTokenSerializer(), metricsClient: s.mockShard.GetMetricsClient(), - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/timerQueueStandbyTaskExecutor_test.go b/service/history/timerQueueStandbyTaskExecutor_test.go index aec0339cd21..3b2d3d9deda 100644 --- a/service/history/timerQueueStandbyTaskExecutor_test.go +++ b/service/history/timerQueueStandbyTaskExecutor_test.go @@ -124,6 +124,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) SetupTest() { s.controller, &persistence.ShardInfoWithFailover{ ShardInfo: &persistenceblobs.ShardInfo{ + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -154,7 +155,7 @@ func (s *timerQueueStandbyTaskExecutorSuite) SetupTest() { logger: s.logger, tokenSerializer: common.NewProtoTaskTokenSerializer(), metricsClient: s.mockShard.GetMetricsClient(), - historyEventNotifier: newHistoryEventNotifier(s.timeSource, metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(s.timeSource, metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/transferQueueActiveTaskExecutor_test.go b/service/history/transferQueueActiveTaskExecutor_test.go index 96deb880bbb..5630761d254 100644 --- a/service/history/transferQueueActiveTaskExecutor_test.go +++ b/service/history/transferQueueActiveTaskExecutor_test.go @@ -151,7 +151,7 @@ func (s *transferQueueActiveTaskExecutorSuite) SetupTest() { s.controller, &persistence.ShardInfoWithFailover{ ShardInfo: &persistenceblobs.ShardInfo{ - ShardId: 0, + ShardId: 1, RangeId: 1, TransferAckLevel: 0, }}, @@ -197,7 +197,7 @@ func (s *transferQueueActiveTaskExecutorSuite) SetupTest() { logger: s.logger, tokenSerializer: common.NewProtoTaskTokenSerializer(), metricsClient: s.mockShard.GetMetricsClient(), - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), metrics.NewClient(tally.NoopScope, metrics.History), func(string, string) int { return 1 }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor, diff --git a/service/history/workflowResetor_test.go b/service/history/workflowResetor_test.go index c3ca3a051e6..49f31901227 100644 --- a/service/history/workflowResetor_test.go +++ b/service/history/workflowResetor_test.go @@ -148,7 +148,7 @@ func (s *resetorSuite) SetupTest() { metricsClient: s.mockShard.GetMetricsClient(), tokenSerializer: common.NewProtoTaskTokenSerializer(), config: s.config, - historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), s.mockShard.GetMetricsClient(), func(string) int { return 0 }), + historyEventNotifier: newHistoryEventNotifier(clock.NewRealTimeSource(), s.mockShard.GetMetricsClient(), func(string, string) int { return shardID }), txProcessor: s.mockTxProcessor, replicatorProcessor: s.mockReplicationProcessor, timerProcessor: s.mockTimerProcessor,