From 05918f55d23c7c3728f44c9877a232dbffcc0891 Mon Sep 17 00:00:00 2001 From: "cai.zhang" <cai.zhang@zilliz.com> Date: Tue, 22 Dec 2020 15:39:10 +0800 Subject: [PATCH] Impl CreateIndex interface for proxy server Signed-off-by: cai.zhang <cai.zhang@zilliz.com> --- internal/proto/internal_msg.proto | 7 +- internal/proto/internalpb/internal_msg.pb.go | 275 ++++++++++--------- internal/proxy/grpc_service.go | 43 ++- internal/proxy/task.go | 165 +++++++++++ 4 files changed, 356 insertions(+), 134 deletions(-) diff --git a/internal/proto/internal_msg.proto b/internal/proto/internal_msg.proto index 6f02250a4..7f765963e 100644 --- a/internal/proto/internal_msg.proto +++ b/internal/proto/internal_msg.proto @@ -23,6 +23,11 @@ enum MsgType { kDescribePartition = 203; kShowPartitions = 204; + /* Definition Requests: Index */ + kCreateIndex = 300; + kDescribeIndex = 301; + kDescribeIndexProgress = 302; + /* Manipulation Requests */ kInsert = 400; kDelete = 401; @@ -31,7 +36,7 @@ enum MsgType { /* Query */ kSearch = 500; kSearchResult = 501; - + /* System Control */ kTimeTick = 1200; kQueryNodeStats = 1201; diff --git a/internal/proto/internalpb/internal_msg.pb.go b/internal/proto/internalpb/internal_msg.pb.go index 9b877a7dd..da44b6a76 100644 --- a/internal/proto/internalpb/internal_msg.pb.go +++ b/internal/proto/internalpb/internal_msg.pb.go @@ -39,6 +39,10 @@ const ( MsgType_kHasPartition MsgType = 202 MsgType_kDescribePartition MsgType = 203 MsgType_kShowPartitions MsgType = 204 + // Definition Requests: Index + MsgType_kCreateIndex MsgType = 300 + MsgType_kDescribeIndex MsgType = 301 + MsgType_kDescribeIndexProgress MsgType = 302 // Manipulation Requests MsgType_kInsert MsgType = 400 MsgType_kDelete MsgType = 401 @@ -65,6 +69,9 @@ var MsgType_name = map[int32]string{ 202: "kHasPartition", 203: "kDescribePartition", 204: "kShowPartitions", + 300: "kCreateIndex", + 301: "kDescribeIndex", + 302: "kDescribeIndexProgress", 400: "kInsert", 401: "kDelete", 402: "kFlush", @@ -76,26 +83,29 @@ var MsgType_name = map[int32]string{ } var MsgType_value = map[string]int32{ - "kNone": 0, - "kCreateCollection": 100, - "kDropCollection": 101, - "kHasCollection": 102, - "kDescribeCollection": 103, - "kShowCollections": 104, - "kGetSysConfigs": 105, - "kCreatePartition": 200, - "kDropPartition": 201, - "kHasPartition": 202, - "kDescribePartition": 203, - "kShowPartitions": 204, - "kInsert": 400, - "kDelete": 401, - "kFlush": 402, - "kSearch": 500, - "kSearchResult": 501, - "kTimeTick": 1200, - "kQueryNodeStats": 1201, - "kLoadIndex": 1202, + "kNone": 0, + "kCreateCollection": 100, + "kDropCollection": 101, + "kHasCollection": 102, + "kDescribeCollection": 103, + "kShowCollections": 104, + "kGetSysConfigs": 105, + "kCreatePartition": 200, + "kDropPartition": 201, + "kHasPartition": 202, + "kDescribePartition": 203, + "kShowPartitions": 204, + "kCreateIndex": 300, + "kDescribeIndex": 301, + "kDescribeIndexProgress": 302, + "kInsert": 400, + "kDelete": 401, + "kFlush": 402, + "kSearch": 500, + "kSearchResult": 501, + "kTimeTick": 1200, + "kQueryNodeStats": 1201, + "kLoadIndex": 1202, } func (x MsgType) String() string { @@ -2651,119 +2661,120 @@ func init() { func init() { proto.RegisterFile("internal_msg.proto", fileDescriptor_7eb37f6b80b23116) } var fileDescriptor_7eb37f6b80b23116 = []byte{ - // 1812 bytes of a gzipped FileDescriptorProto + // 1838 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x6f, 0x23, 0x49, - 0x15, 0xdf, 0xee, 0xf6, 0x57, 0x3f, 0x3b, 0x4e, 0x4f, 0x25, 0x99, 0xf1, 0xec, 0x2e, 0x3b, 0x99, + 0x15, 0xdf, 0xee, 0xf6, 0x57, 0x3f, 0x3b, 0x4e, 0x4f, 0x25, 0x99, 0xf1, 0xec, 0x2c, 0x3b, 0x99, 0x1e, 0xc4, 0x86, 0x45, 0x24, 0x90, 0xe1, 0xc0, 0xde, 0x20, 0xb1, 0x96, 0x35, 0x43, 0x46, 0xa1, 0x13, 0x2d, 0x12, 0x5a, 0xa9, 0xd5, 0xb1, 0x5f, 0xec, 0x56, 0x7f, 0x39, 0x55, 0xed, 0x49, 0x3c, - 0x07, 0x24, 0xa4, 0x39, 0x70, 0x42, 0x7c, 0x88, 0x03, 0x27, 0x38, 0x72, 0x5a, 0xb1, 0x70, 0xe7, - 0x0c, 0xcb, 0x9e, 0x10, 0xff, 0x04, 0x1c, 0x40, 0x82, 0xe5, 0xc0, 0x0d, 0x55, 0x55, 0x7f, 0xb8, - 0x13, 0xdb, 0x89, 0x70, 0x66, 0x09, 0x9a, 0xb9, 0x75, 0xbd, 0x2a, 0x57, 0xbd, 0xf7, 0xfb, 0xbd, - 0x7a, 0xf5, 0xde, 0x33, 0x10, 0x37, 0x8c, 0x91, 0x86, 0x8e, 0x6f, 0x07, 0xac, 0xbf, 0x39, 0xa4, - 0x51, 0x1c, 0x91, 0xb5, 0xc0, 0xf5, 0x9f, 0x8c, 0x98, 0x1c, 0x6d, 0xa6, 0x0b, 0x5e, 0x6d, 0x74, - 0xa3, 0x20, 0x88, 0x42, 0x29, 0x7e, 0xf5, 0x16, 0x43, 0xfa, 0xc4, 0xed, 0x62, 0xfe, 0x3b, 0x33, - 0x04, 0xbd, 0xd3, 0xb6, 0xf0, 0x64, 0x84, 0x2c, 0x26, 0xb7, 0xa1, 0x32, 0x44, 0xa4, 0x9d, 0x76, - 0x4b, 0x59, 0x57, 0x36, 0x34, 0x2b, 0x19, 0x91, 0x87, 0x50, 0xa2, 0x91, 0x8f, 0x2d, 0x75, 0x5d, - 0xd9, 0x68, 0x6e, 0xdf, 0xdb, 0x9c, 0x7a, 0xd6, 0xe6, 0x3e, 0x22, 0xb5, 0x22, 0x1f, 0x2d, 0xb1, - 0x98, 0xac, 0x42, 0xb9, 0x1b, 0x8d, 0xc2, 0xb8, 0xa5, 0xad, 0x2b, 0x1b, 0x4b, 0x96, 0x1c, 0x98, - 0x7d, 0x00, 0x7e, 0x1e, 0x1b, 0x46, 0x21, 0x43, 0xf2, 0x10, 0x2a, 0x2c, 0x76, 0xe2, 0x11, 0x13, - 0x07, 0xd6, 0xb7, 0x5f, 0x2b, 0x6e, 0x9d, 0x28, 0x7f, 0x20, 0x96, 0x58, 0xc9, 0x52, 0xd2, 0x04, - 0xb5, 0xd3, 0x16, 0xba, 0x68, 0x96, 0xda, 0x69, 0xcf, 0x38, 0x28, 0x02, 0x38, 0x64, 0xd1, 0xa7, - 0x68, 0xd9, 0x13, 0xa8, 0x8b, 0x03, 0x17, 0x31, 0xed, 0x75, 0xd0, 0x63, 0x37, 0x40, 0x16, 0x3b, - 0xc1, 0x50, 0xe8, 0x54, 0xb2, 0x72, 0xc1, 0x8c, 0x73, 0x9f, 0x29, 0xd0, 0x38, 0xc0, 0x7e, 0xce, - 0x62, 0xb6, 0x4c, 0x99, 0x58, 0xc6, 0xb7, 0xee, 0x0e, 0x9c, 0x30, 0x44, 0x3f, 0x01, 0xaf, 0x6c, - 0xe5, 0x02, 0xf2, 0x1a, 0xe8, 0xdd, 0xc8, 0xf7, 0xed, 0xd0, 0x09, 0x50, 0x6c, 0xaf, 0x5b, 0x35, - 0x2e, 0x78, 0xec, 0x04, 0x48, 0x1e, 0xc0, 0xd2, 0xd0, 0xa1, 0xb1, 0x1b, 0xbb, 0x51, 0x68, 0xc7, - 0x4e, 0xbf, 0x55, 0x12, 0x0b, 0x1a, 0x99, 0xf0, 0xd0, 0xe9, 0x9b, 0x1f, 0x28, 0x40, 0xbe, 0xce, - 0x98, 0xdb, 0x0f, 0x0b, 0xca, 0x5c, 0x2b, 0xf0, 0x8f, 0x60, 0x79, 0x88, 0xd4, 0x4e, 0xd4, 0xb6, - 0x29, 0x9e, 0xb4, 0xb4, 0x75, 0x6d, 0xa3, 0xbe, 0xfd, 0x60, 0xc6, 0xef, 0x27, 0x55, 0xb1, 0x96, - 0x86, 0x48, 0x77, 0xe5, 0x4f, 0x2d, 0x3c, 0x31, 0x7f, 0xa7, 0xc0, 0xb2, 0x98, 0x97, 0x5a, 0x07, - 0x18, 0x0a, 0xe8, 0x18, 0x17, 0x25, 0xca, 0xca, 0xc1, 0x25, 0xd0, 0x4d, 0x65, 0xa5, 0x08, 0x68, - 0xe9, 0x32, 0x40, 0xcb, 0x17, 0x01, 0x25, 0xf7, 0xa0, 0x8e, 0x67, 0x43, 0x97, 0xa2, 0xcd, 0x3d, - 0xa0, 0x55, 0x11, 0xde, 0x00, 0x52, 0x74, 0xe8, 0x06, 0x68, 0xfe, 0x4a, 0x81, 0x95, 0x02, 0xe2, - 0x8b, 0x78, 0xde, 0xfb, 0x70, 0x7b, 0x12, 0x5a, 0x27, 0xc3, 0xa4, 0xa5, 0x0a, 0x84, 0x3f, 0x37, - 0x0f, 0xe1, 0x1c, 0x41, 0x6b, 0x35, 0x07, 0x39, 0x97, 0x9a, 0xff, 0x56, 0xe0, 0xce, 0x2e, 0x45, - 0x27, 0xc6, 0xdd, 0xc8, 0xf7, 0xb1, 0xcb, 0x6d, 0x4c, 0x3d, 0xe4, 0x6d, 0xa8, 0x05, 0xac, 0x6f, - 0xc7, 0xe3, 0x21, 0x0a, 0x85, 0x9b, 0xdb, 0x6f, 0xcc, 0x38, 0x6b, 0x8f, 0xf5, 0x0f, 0xc7, 0x43, - 0xb4, 0xaa, 0x81, 0xfc, 0x20, 0x26, 0x34, 0xba, 0xd9, 0x7e, 0x59, 0x4c, 0x28, 0xc8, 0x38, 0x3d, - 0x14, 0x4f, 0x3a, 0x6d, 0x41, 0x8f, 0x66, 0xc9, 0x41, 0xf1, 0xa2, 0x95, 0xce, 0x5f, 0xb4, 0x16, - 0x54, 0x87, 0x34, 0x3a, 0x1b, 0x77, 0xda, 0x82, 0x19, 0xcd, 0x4a, 0x87, 0xe4, 0xcb, 0x50, 0x61, - 0xdd, 0x01, 0x06, 0x8e, 0xe0, 0xa3, 0xbe, 0x7d, 0x77, 0x2a, 0xb6, 0x3b, 0x7e, 0x74, 0x64, 0x25, - 0x0b, 0xcd, 0x9f, 0xaa, 0xb0, 0xd6, 0xa6, 0xd1, 0xf0, 0xff, 0xdc, 0xf2, 0x3d, 0x58, 0xce, 0x77, - 0x97, 0x6e, 0x2d, 0x21, 0xf8, 0x6c, 0x51, 0xe7, 0xe4, 0x89, 0xd9, 0xcc, 0xcd, 0xe5, 0x2e, 0x6f, - 0x35, 0xbb, 0x85, 0xb1, 0xf9, 0x37, 0x05, 0x56, 0xdf, 0x75, 0xd8, 0xb5, 0x82, 0x92, 0x19, 0xac, - 0xce, 0x34, 0x58, 0x9b, 0x63, 0x70, 0xe9, 0x52, 0x83, 0xcb, 0x0b, 0x18, 0xfc, 0x4f, 0x05, 0xee, - 0xb6, 0x91, 0x75, 0xa9, 0x7b, 0x84, 0x2f, 0x8e, 0xd5, 0xbf, 0x54, 0x60, 0xed, 0x60, 0x10, 0x9d, - 0xde, 0x5c, 0x8b, 0xcd, 0xdf, 0xaa, 0x70, 0x5b, 0xc6, 0xa6, 0xfd, 0x34, 0xfc, 0x7e, 0x4a, 0x17, - 0x74, 0x1d, 0xea, 0x59, 0xc4, 0xcf, 0xae, 0xe9, 0xa4, 0x28, 0xb7, 0xb4, 0x34, 0xd3, 0xd2, 0xf2, - 0x1c, 0x4b, 0x2b, 0x45, 0x6e, 0xbf, 0x09, 0xcd, 0xfc, 0xd9, 0x11, 0xd4, 0x56, 0x05, 0xb5, 0x0f, - 0xa6, 0x53, 0x9b, 0xc1, 0x21, 0x98, 0xcd, 0x5f, 0x2c, 0x41, 0xec, 0x87, 0x2a, 0xac, 0xf2, 0xa8, - 0xf6, 0x12, 0xb3, 0xab, 0x63, 0xf6, 0x57, 0x05, 0x56, 0xde, 0x75, 0xd8, 0x75, 0x42, 0x76, 0xbd, - 0x97, 0xff, 0xa2, 0xb1, 0xe5, 0xff, 0xda, 0xd8, 0xbf, 0x2b, 0xd0, 0x4a, 0xe3, 0xdd, 0x8b, 0x61, - 0x31, 0x7f, 0xd2, 0x78, 0xac, 0xbb, 0xb9, 0xd6, 0x5e, 0x73, 0x70, 0xff, 0x87, 0x0a, 0x4b, 0x9d, - 0x90, 0x21, 0x8d, 0x9f, 0x9b, 0xa5, 0x6f, 0x5e, 0xd4, 0x58, 0x56, 0x27, 0xe7, 0x74, 0xb9, 0x52, - 0x8d, 0xc2, 0x71, 0x63, 0xd8, 0xe7, 0x19, 0x69, 0x96, 0xdf, 0xe4, 0x82, 0x62, 0x9a, 0x2f, 0xc3, - 0xc0, 0x44, 0x9a, 0x3f, 0x81, 0x6a, 0xb5, 0x88, 0xea, 0x1b, 0x00, 0x19, 0xf8, 0xac, 0x55, 0x5b, - 0xd7, 0x78, 0x9e, 0x9e, 0x4b, 0x78, 0x09, 0x44, 0xa3, 0xd3, 0x4e, 0x9b, 0xb5, 0xf4, 0x75, 0x8d, - 0x97, 0x40, 0x72, 0x44, 0xbe, 0x02, 0x35, 0x1a, 0x9d, 0xda, 0x3d, 0x27, 0x76, 0x5a, 0x20, 0x92, - 0xec, 0x39, 0xd9, 0x64, 0x95, 0x46, 0xa7, 0x6d, 0x27, 0x76, 0xcc, 0x67, 0x2a, 0x2c, 0xb5, 0xd1, - 0xc7, 0x18, 0xff, 0xf7, 0xa0, 0x17, 0x10, 0x2b, 0xcd, 0x41, 0xac, 0x3c, 0x0f, 0xb1, 0xca, 0x05, - 0xc4, 0xee, 0x43, 0x63, 0x48, 0xdd, 0xc0, 0xa1, 0x63, 0xdb, 0xc3, 0x31, 0x6b, 0x55, 0x05, 0x6e, - 0xf5, 0x44, 0xf6, 0x08, 0xc7, 0xcc, 0xfc, 0x44, 0x81, 0xa5, 0x03, 0x74, 0x68, 0x77, 0xf0, 0xdc, - 0x60, 0x98, 0xd0, 0x5f, 0x2b, 0xea, 0x3f, 0x3f, 0x87, 0xfe, 0x3c, 0x18, 0x14, 0xd9, 0xc8, 0x8f, - 0xed, 0x1c, 0x1c, 0x09, 0xc0, 0xb2, 0x94, 0xef, 0x66, 0x10, 0x6d, 0x41, 0xf9, 0x64, 0x84, 0x74, - 0x7c, 0x79, 0x35, 0x21, 0xd7, 0x99, 0x7f, 0x52, 0xc0, 0x38, 0x18, 0xb3, 0xdd, 0x28, 0x3c, 0x76, - 0xfb, 0x37, 0xce, 0x72, 0x02, 0x25, 0xc1, 0x57, 0x79, 0x5d, 0xdb, 0xd0, 0x2d, 0xf1, 0xcd, 0xb9, - 0xf4, 0x70, 0x6c, 0x0f, 0x29, 0x1e, 0xbb, 0x67, 0x28, 0xd9, 0xd6, 0xad, 0xba, 0x87, 0xe3, 0xfd, - 0x44, 0x64, 0x7e, 0xa0, 0x42, 0x23, 0xe5, 0x92, 0xe3, 0xb3, 0x88, 0x41, 0x79, 0xf1, 0xab, 0x5e, - 0xbd, 0xf8, 0x9d, 0x5e, 0x29, 0xcd, 0x8e, 0xa3, 0xf7, 0xa1, 0x21, 0xe8, 0xb0, 0xc3, 0xa8, 0x87, - 0x19, 0xbb, 0x75, 0x21, 0x7b, 0x2c, 0x44, 0x45, 0xa0, 0x2a, 0x57, 0x71, 0x91, 0xea, 0x74, 0x17, - 0x21, 0x50, 0x1a, 0xb8, 0xb1, 0x8c, 0x2b, 0x0d, 0x4b, 0x7c, 0x9b, 0xdf, 0x83, 0xfa, 0xa1, 0x1b, - 0xe0, 0xa1, 0xdb, 0xf5, 0xf6, 0x58, 0x7f, 0x11, 0xb8, 0xf2, 0xf6, 0x8c, 0x5a, 0x68, 0xcf, 0xcc, - 0x7d, 0x61, 0xcc, 0xef, 0x2b, 0x50, 0x7b, 0xc7, 0x1f, 0xb1, 0xc1, 0x82, 0xa7, 0x17, 0xe2, 0xb1, - 0x3a, 0x25, 0x1e, 0xcf, 0xd1, 0xe1, 0xe7, 0x0a, 0x54, 0x1f, 0xe1, 0x78, 0xfb, 0x00, 0xfb, 0x82, - 0x3f, 0x1e, 0x53, 0xd3, 0xb6, 0x8d, 0x18, 0x90, 0x7b, 0x50, 0x9f, 0x88, 0x22, 0xc9, 0xfe, 0x90, - 0x07, 0x91, 0x4b, 0x9e, 0xd1, 0xbb, 0x50, 0x73, 0x99, 0xfd, 0xc4, 0xf1, 0xdd, 0x9e, 0xe0, 0xbf, - 0x66, 0x55, 0x5d, 0xf6, 0x1e, 0x1f, 0xf2, 0xf8, 0x95, 0xa9, 0x29, 0xbd, 0x5d, 0xb3, 0x26, 0x24, - 0xe6, 0xfb, 0x00, 0x89, 0x6a, 0x1c, 0xa0, 0xcc, 0xbb, 0x94, 0x49, 0xef, 0xfa, 0x2a, 0x54, 0x3d, - 0x1c, 0x6f, 0x33, 0xec, 0x27, 0x1d, 0x96, 0x59, 0xa8, 0x25, 0x3b, 0x59, 0xe9, 0x72, 0xf3, 0x17, - 0x0a, 0xe8, 0xdf, 0x8a, 0x9c, 0x5e, 0x27, 0xec, 0xe1, 0xd9, 0xf3, 0x83, 0xbf, 0x05, 0xd5, 0x63, - 0x17, 0xfd, 0x5e, 0x1e, 0x04, 0x92, 0x21, 0x07, 0xd6, 0xe5, 0x67, 0xdb, 0x43, 0x27, 0x1e, 0xb0, - 0x56, 0x49, 0xdc, 0x68, 0x10, 0xa2, 0x7d, 0x2e, 0x31, 0x9f, 0x29, 0x00, 0x42, 0x3b, 0x7e, 0xcf, - 0x18, 0x69, 0x43, 0x23, 0x5d, 0x4f, 0x9d, 0x80, 0xb5, 0x14, 0x61, 0xef, 0xfd, 0xa9, 0x37, 0xf3, - 0x11, 0x8e, 0xdf, 0x73, 0xfc, 0x11, 0xee, 0x3b, 0x2e, 0xb5, 0xea, 0xc9, 0x9e, 0xfc, 0x57, 0xe4, - 0x4b, 0xb0, 0x1a, 0x8e, 0x02, 0x9b, 0xa2, 0xef, 0xc4, 0xd8, 0xb3, 0x13, 0x45, 0x59, 0xa2, 0x38, - 0x09, 0x47, 0x81, 0x25, 0xa7, 0x0e, 0x92, 0x19, 0xf3, 0x87, 0x0a, 0xc0, 0x3b, 0x5c, 0x67, 0xa9, - 0xc6, 0xf9, 0xf2, 0x42, 0x99, 0x52, 0x5e, 0x4c, 0x18, 0xad, 0x16, 0x8d, 0xde, 0x49, 0x8d, 0xe6, - 0x31, 0x83, 0x25, 0x7d, 0xc7, 0xfb, 0x33, 0xa0, 0xce, 0x8d, 0x4f, 0x70, 0x11, 0xdf, 0xe6, 0xcf, - 0x64, 0xab, 0x96, 0x6b, 0x27, 0x55, 0x2a, 0x30, 0xa0, 0x9c, 0x67, 0xe0, 0x1e, 0xd4, 0x03, 0x0c, - 0x22, 0x3a, 0xb6, 0x99, 0xfb, 0x14, 0x53, 0x07, 0x96, 0xa2, 0x03, 0xf7, 0x29, 0x72, 0x17, 0x15, - 0x90, 0x44, 0xa7, 0x2c, 0xe5, 0x88, 0xc3, 0x10, 0x9d, 0x32, 0xf2, 0x05, 0xb8, 0x45, 0xb1, 0x8b, - 0x61, 0xec, 0x8f, 0xed, 0x20, 0xea, 0xb9, 0xc7, 0x2e, 0xa6, 0x6e, 0x6c, 0xa4, 0x13, 0x7b, 0x89, - 0xdc, 0xfc, 0x8b, 0x02, 0xcd, 0x6f, 0xa7, 0xc1, 0x4b, 0x6a, 0xf6, 0x1c, 0x62, 0xca, 0xd7, 0x84, - 0xb1, 0x05, 0xfc, 0xe6, 0xf4, 0x6d, 0x33, 0x90, 0xac, 0x1a, 0xc3, 0xbe, 0x54, 0x6a, 0x07, 0xea, - 0x82, 0x8e, 0x64, 0x8f, 0xd2, 0x5c, 0x0e, 0x72, 0xe6, 0x2d, 0x38, 0xce, 0xbe, 0xcd, 0x8f, 0x54, - 0x20, 0xb2, 0xdc, 0x17, 0x24, 0xdd, 0xb8, 0x1c, 0xfd, 0xcd, 0xe9, 0x39, 0xfa, 0xc5, 0xe4, 0xeb, - 0x33, 0x20, 0xcd, 0xca, 0x7b, 0x71, 0xba, 0xa5, 0x0b, 0x49, 0x3a, 0x2d, 0xfd, 0x35, 0x2b, 0x5a, - 0x75, 0x4b, 0x17, 0x12, 0x31, 0xdd, 0x86, 0x06, 0x9e, 0xc5, 0xd4, 0x49, 0xef, 0x64, 0xed, 0xca, - 0x77, 0x52, 0xfc, 0x4c, 0xde, 0x49, 0xf3, 0x63, 0x15, 0x56, 0xd3, 0x22, 0xef, 0x25, 0x9c, 0x0b, - 0xc3, 0xf9, 0x67, 0x15, 0x5e, 0x2f, 0xc0, 0xb9, 0x4f, 0xa3, 0x3e, 0x45, 0xc6, 0x5e, 0xc2, 0xba, - 0x00, 0xac, 0x6f, 0xfd, 0x40, 0x83, 0x6a, 0x82, 0x07, 0xd1, 0xa1, 0xec, 0x3d, 0x8e, 0x42, 0x34, - 0x5e, 0x21, 0x6b, 0x70, 0xcb, 0x3b, 0xff, 0xa7, 0x84, 0xd1, 0x23, 0x2b, 0xb0, 0xec, 0x15, 0xfb, - 0xf5, 0x06, 0x12, 0x02, 0x4d, 0xaf, 0xd0, 0xae, 0x36, 0x8e, 0xc9, 0x1d, 0x58, 0xf1, 0x2e, 0x76, - 0x74, 0x0d, 0xfe, 0xe0, 0x1b, 0x5e, 0xb1, 0xe9, 0xc9, 0x8c, 0x81, 0xd8, 0xe2, 0x1b, 0x18, 0x67, - 0xd9, 0x3b, 0x33, 0x5c, 0xb2, 0x06, 0x86, 0x77, 0xae, 0xf7, 0x68, 0xfc, 0x5e, 0x21, 0x2b, 0xd0, - 0xf4, 0x0a, 0xcd, 0x35, 0xe3, 0x0f, 0x0a, 0x21, 0xb0, 0xe4, 0x4d, 0x76, 0x8f, 0x8c, 0x8f, 0x14, - 0x72, 0x07, 0x88, 0x77, 0xa1, 0xc9, 0x62, 0xfc, 0x51, 0x21, 0xab, 0xb0, 0xec, 0x15, 0x7a, 0x11, - 0xcc, 0xf8, 0x58, 0x21, 0x0d, 0xa8, 0x7a, 0xb2, 0x60, 0x37, 0x7e, 0xa4, 0x89, 0x91, 0xac, 0x24, - 0x8d, 0x1f, 0x6b, 0xa4, 0x0e, 0x15, 0x4f, 0xe4, 0x74, 0xc6, 0x4f, 0xe4, 0x94, 0xcc, 0xc8, 0x8d, - 0x4f, 0x34, 0x71, 0xf2, 0x64, 0x7e, 0x6e, 0xfc, 0x4b, 0x23, 0x4d, 0xd0, 0xbd, 0x34, 0x07, 0x35, - 0x7e, 0xad, 0x8b, 0x03, 0x8b, 0x4f, 0x88, 0xf1, 0xa1, 0x4e, 0x96, 0x01, 0xbc, 0x2c, 0x55, 0x31, - 0x7e, 0xa3, 0xbf, 0xf5, 0x36, 0xd4, 0xd2, 0xff, 0xf4, 0x08, 0x40, 0x65, 0xcf, 0x61, 0x31, 0x52, - 0xe3, 0x15, 0xfe, 0x6d, 0xa1, 0xd3, 0x43, 0x6a, 0x28, 0xfc, 0xfb, 0x3b, 0xd4, 0xe5, 0x72, 0x95, - 0xd3, 0xb5, 0xcf, 0x5d, 0xce, 0xd0, 0x76, 0xda, 0xdf, 0xdd, 0xe9, 0xbb, 0xf1, 0x60, 0x74, 0xc4, - 0x09, 0xdf, 0x7a, 0xea, 0xfa, 0xbe, 0xfb, 0x34, 0xc6, 0xee, 0x60, 0x4b, 0x3a, 0xc3, 0x17, 0x7b, - 0x2e, 0x8b, 0xa9, 0x7b, 0x34, 0x8a, 0xb1, 0xb7, 0x95, 0x5e, 0x83, 0x2d, 0xe1, 0x21, 0xd9, 0x70, - 0x78, 0x74, 0x54, 0x11, 0x92, 0x87, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xb3, 0x05, 0xc2, - 0x44, 0x1f, 0x00, 0x00, + 0x07, 0x24, 0xa4, 0x39, 0x23, 0x3e, 0xc4, 0x81, 0x13, 0x1c, 0x39, 0xc0, 0x88, 0x85, 0x3b, 0x67, + 0x58, 0x96, 0x0b, 0xe2, 0x9f, 0x80, 0x03, 0x48, 0xb0, 0x1c, 0xb8, 0xa1, 0xaa, 0xea, 0x0f, 0x77, + 0x62, 0x3b, 0x11, 0xce, 0x2c, 0x83, 0x76, 0x6e, 0x5d, 0xaf, 0xca, 0x55, 0xef, 0xf7, 0x7b, 0xaf, + 0x5e, 0xbd, 0xf7, 0x0c, 0xc4, 0x0d, 0x63, 0xa4, 0xa1, 0xe3, 0xdb, 0x01, 0xeb, 0x6f, 0x0e, 0x69, + 0x14, 0x47, 0x64, 0x2d, 0x70, 0xfd, 0xc7, 0x23, 0x26, 0x47, 0x9b, 0xe9, 0x82, 0x57, 0x1b, 0xdd, + 0x28, 0x08, 0xa2, 0x50, 0x8a, 0x5f, 0xbd, 0xc1, 0x90, 0x3e, 0x76, 0xbb, 0x98, 0xff, 0xce, 0x0c, + 0x41, 0xef, 0xb4, 0x2d, 0x3c, 0x19, 0x21, 0x8b, 0xc9, 0x4d, 0xa8, 0x0c, 0x11, 0x69, 0xa7, 0xdd, + 0x52, 0xd6, 0x95, 0x0d, 0xcd, 0x4a, 0x46, 0xe4, 0x01, 0x94, 0x68, 0xe4, 0x63, 0x4b, 0x5d, 0x57, + 0x36, 0x9a, 0xdb, 0x77, 0x37, 0xa7, 0x9e, 0xb5, 0xb9, 0x8f, 0x48, 0xad, 0xc8, 0x47, 0x4b, 0x2c, + 0x26, 0xab, 0x50, 0xee, 0x46, 0xa3, 0x30, 0x6e, 0x69, 0xeb, 0xca, 0xc6, 0x92, 0x25, 0x07, 0x66, + 0x1f, 0x80, 0x9f, 0xc7, 0x86, 0x51, 0xc8, 0x90, 0x3c, 0x80, 0x0a, 0x8b, 0x9d, 0x78, 0xc4, 0xc4, + 0x81, 0xf5, 0xed, 0x3b, 0xc5, 0xad, 0x13, 0xe5, 0x0f, 0xc4, 0x12, 0x2b, 0x59, 0x4a, 0x9a, 0xa0, + 0x76, 0xda, 0x42, 0x17, 0xcd, 0x52, 0x3b, 0xed, 0x19, 0x07, 0x45, 0x00, 0x87, 0x2c, 0xfa, 0x18, + 0x91, 0x3d, 0x86, 0xba, 0x38, 0x70, 0x11, 0x68, 0xaf, 0x81, 0x1e, 0xbb, 0x01, 0xb2, 0xd8, 0x09, + 0x86, 0x42, 0xa7, 0x92, 0x95, 0x0b, 0x66, 0x9c, 0xfb, 0x54, 0x81, 0xc6, 0x01, 0xf6, 0x73, 0x2b, + 0x66, 0xcb, 0x94, 0x89, 0x65, 0x7c, 0xeb, 0xee, 0xc0, 0x09, 0x43, 0xf4, 0x13, 0xf2, 0xca, 0x56, + 0x2e, 0x20, 0x77, 0x40, 0xef, 0x46, 0xbe, 0x6f, 0x87, 0x4e, 0x80, 0x62, 0x7b, 0xdd, 0xaa, 0x71, + 0xc1, 0x23, 0x27, 0x40, 0x72, 0x1f, 0x96, 0x86, 0x0e, 0x8d, 0xdd, 0xd8, 0x8d, 0x42, 0x3b, 0x76, + 0xfa, 0xad, 0x92, 0x58, 0xd0, 0xc8, 0x84, 0x87, 0x4e, 0xdf, 0x7c, 0xa6, 0x00, 0xf9, 0x2a, 0x63, + 0x6e, 0x3f, 0x2c, 0x28, 0x73, 0xad, 0xc4, 0x3f, 0x84, 0xe5, 0x21, 0x52, 0x3b, 0x51, 0xdb, 0xa6, + 0x78, 0xd2, 0xd2, 0xd6, 0xb5, 0x8d, 0xfa, 0xf6, 0xfd, 0x19, 0xbf, 0x9f, 0x54, 0xc5, 0x5a, 0x1a, + 0x22, 0xdd, 0x95, 0x3f, 0xb5, 0xf0, 0xc4, 0xfc, 0xad, 0x02, 0xcb, 0x62, 0x5e, 0x6a, 0x1d, 0x60, + 0x28, 0xa8, 0x63, 0x5c, 0x94, 0x28, 0x2b, 0x07, 0x97, 0x50, 0x37, 0xd5, 0x2a, 0x45, 0x42, 0x4b, + 0x97, 0x11, 0x5a, 0xbe, 0x48, 0x28, 0xb9, 0x0b, 0x75, 0x3c, 0x1b, 0xba, 0x14, 0x6d, 0xee, 0x01, + 0xad, 0x8a, 0xf0, 0x06, 0x90, 0xa2, 0x43, 0x37, 0x40, 0xf3, 0xe7, 0x0a, 0xac, 0x14, 0x18, 0x5f, + 0xc4, 0xf3, 0xde, 0x83, 0x9b, 0x93, 0xd4, 0x3a, 0x19, 0x27, 0x2d, 0x55, 0x30, 0xfc, 0x99, 0x79, + 0x0c, 0xe7, 0x0c, 0x5a, 0xab, 0x39, 0xc9, 0xb9, 0xd4, 0xfc, 0xb7, 0x02, 0xb7, 0x76, 0x29, 0x3a, + 0x31, 0xee, 0x46, 0xbe, 0x8f, 0x5d, 0x8e, 0x31, 0xf5, 0x90, 0xb7, 0xa0, 0x16, 0xb0, 0xbe, 0x1d, + 0x8f, 0x87, 0x28, 0x14, 0x6e, 0x6e, 0xbf, 0x3e, 0xe3, 0xac, 0x3d, 0xd6, 0x3f, 0x1c, 0x0f, 0xd1, + 0xaa, 0x06, 0xf2, 0x83, 0x98, 0xd0, 0xe8, 0x66, 0xfb, 0x65, 0x31, 0xa1, 0x20, 0xe3, 0xe6, 0xa1, + 0x78, 0xd2, 0x69, 0x0b, 0xf3, 0x68, 0x96, 0x1c, 0x14, 0x2f, 0x5a, 0xe9, 0xfc, 0x45, 0x6b, 0x41, + 0x75, 0x48, 0xa3, 0xb3, 0x71, 0xa7, 0x2d, 0x2c, 0xa3, 0x59, 0xe9, 0x90, 0x7c, 0x11, 0x2a, 0xac, + 0x3b, 0xc0, 0xc0, 0x11, 0xf6, 0xa8, 0x6f, 0xdf, 0x9e, 0xca, 0xed, 0x8e, 0x1f, 0x1d, 0x59, 0xc9, + 0x42, 0xf3, 0x47, 0x2a, 0xac, 0xb5, 0x69, 0x34, 0xfc, 0x3f, 0x47, 0xbe, 0x07, 0xcb, 0xf9, 0xee, + 0xd2, 0xad, 0x25, 0x05, 0x9f, 0x2e, 0xea, 0x9c, 0x3c, 0x31, 0x9b, 0x39, 0x5c, 0xee, 0xf2, 0x56, + 0xb3, 0x5b, 0x18, 0x9b, 0x7f, 0x53, 0x60, 0xf5, 0x1d, 0x87, 0x5d, 0x2b, 0x29, 0x19, 0x60, 0x75, + 0x26, 0x60, 0x6d, 0x0e, 0xe0, 0xd2, 0xa5, 0x80, 0xcb, 0x0b, 0x00, 0xfe, 0xa7, 0x02, 0xb7, 0xdb, + 0xc8, 0xba, 0xd4, 0x3d, 0xc2, 0x4f, 0x0e, 0xea, 0x9f, 0x29, 0xb0, 0x76, 0x30, 0x88, 0x4e, 0x5f, + 0x5c, 0xc4, 0xe6, 0x6f, 0x54, 0xb8, 0x29, 0x63, 0xd3, 0x7e, 0x1a, 0x7e, 0x3f, 0xa6, 0x0b, 0xba, + 0x0e, 0xf5, 0x2c, 0xe2, 0x67, 0xd7, 0x74, 0x52, 0x94, 0x23, 0x2d, 0xcd, 0x44, 0x5a, 0x9e, 0x83, + 0xb4, 0x52, 0xb4, 0xed, 0xd7, 0xa1, 0x99, 0x3f, 0x3b, 0xc2, 0xb4, 0x55, 0x61, 0xda, 0xfb, 0xd3, + 0x4d, 0x9b, 0xd1, 0x21, 0x2c, 0x9b, 0xbf, 0x58, 0xc2, 0xb0, 0xef, 0xab, 0xb0, 0xca, 0xa3, 0xda, + 0x4b, 0xce, 0xae, 0xce, 0xd9, 0x5f, 0x15, 0x58, 0x79, 0xc7, 0x61, 0xd7, 0x49, 0xd9, 0xf5, 0x5e, + 0xfe, 0x8b, 0x60, 0xcb, 0xff, 0x35, 0xd8, 0xbf, 0x2b, 0xd0, 0x4a, 0xe3, 0xdd, 0x27, 0x03, 0x31, + 0x7f, 0xd2, 0x78, 0xac, 0x7b, 0x71, 0xd1, 0x5e, 0x73, 0x70, 0xff, 0x87, 0x0a, 0x4b, 0x9d, 0x90, + 0x21, 0x8d, 0x9f, 0x1b, 0xd2, 0x37, 0x2e, 0x6a, 0x2c, 0xab, 0x93, 0x73, 0xba, 0x5c, 0xa9, 0x46, + 0xe1, 0xbc, 0x31, 0xec, 0xf3, 0x8c, 0x34, 0xcb, 0x6f, 0x72, 0x41, 0x31, 0xcd, 0x97, 0x61, 0x60, + 0x22, 0xcd, 0x9f, 0x60, 0xb5, 0x5a, 0x64, 0xf5, 0x75, 0x80, 0x8c, 0x7c, 0xd6, 0xaa, 0xad, 0x6b, + 0x3c, 0x4f, 0xcf, 0x25, 0xbc, 0x04, 0xa2, 0xd1, 0x69, 0xa7, 0xcd, 0x5a, 0xfa, 0xba, 0xc6, 0x4b, + 0x20, 0x39, 0x22, 0x5f, 0x82, 0x1a, 0x8d, 0x4e, 0xed, 0x9e, 0x13, 0x3b, 0x2d, 0x10, 0x49, 0xf6, + 0x9c, 0x6c, 0xb2, 0x4a, 0xa3, 0xd3, 0xb6, 0x13, 0x3b, 0xe6, 0x53, 0x15, 0x96, 0xda, 0xe8, 0x63, + 0x8c, 0xff, 0x7b, 0xd2, 0x0b, 0x8c, 0x95, 0xe6, 0x30, 0x56, 0x9e, 0xc7, 0x58, 0xe5, 0x02, 0x63, + 0xf7, 0xa0, 0x31, 0xa4, 0x6e, 0xe0, 0xd0, 0xb1, 0xed, 0xe1, 0x98, 0xb5, 0xaa, 0x82, 0xb7, 0x7a, + 0x22, 0x7b, 0x88, 0x63, 0x66, 0x7e, 0xa4, 0xc0, 0xd2, 0x01, 0x3a, 0xb4, 0x3b, 0x78, 0x6e, 0x34, + 0x4c, 0xe8, 0xaf, 0x15, 0xf5, 0x9f, 0x9f, 0x43, 0x7f, 0x16, 0x0c, 0x8a, 0x6c, 0xe4, 0xc7, 0x76, + 0x4e, 0x8e, 0x24, 0x60, 0x59, 0xca, 0x77, 0x33, 0x8a, 0xb6, 0xa0, 0x7c, 0x32, 0x42, 0x3a, 0xbe, + 0xbc, 0x9a, 0x90, 0xeb, 0xcc, 0x3f, 0x29, 0x60, 0x1c, 0x8c, 0xd9, 0x6e, 0x14, 0x1e, 0xbb, 0xfd, + 0x17, 0x0e, 0x39, 0x81, 0x92, 0xb0, 0x57, 0x79, 0x5d, 0xdb, 0xd0, 0x2d, 0xf1, 0xcd, 0x6d, 0xe9, + 0xe1, 0xd8, 0x1e, 0x52, 0x3c, 0x76, 0xcf, 0x50, 0x5a, 0x5b, 0xb7, 0xea, 0x1e, 0x8e, 0xf7, 0x13, + 0x91, 0xf9, 0x4c, 0x85, 0x46, 0x6a, 0x4b, 0xce, 0xcf, 0x22, 0x80, 0xf2, 0xe2, 0x57, 0xbd, 0x7a, + 0xf1, 0x3b, 0xbd, 0x52, 0x9a, 0x1d, 0x47, 0xef, 0x41, 0x43, 0x98, 0xc3, 0x0e, 0xa3, 0x1e, 0x66, + 0xd6, 0xad, 0x0b, 0xd9, 0x23, 0x21, 0x2a, 0x12, 0x55, 0xb9, 0x8a, 0x8b, 0x54, 0xa7, 0xbb, 0x08, + 0x81, 0xd2, 0xc0, 0x8d, 0x65, 0x5c, 0x69, 0x58, 0xe2, 0xdb, 0xfc, 0x0e, 0xd4, 0x0f, 0xdd, 0x00, + 0x0f, 0xdd, 0xae, 0xb7, 0xc7, 0xfa, 0x8b, 0xd0, 0x95, 0xb7, 0x67, 0xd4, 0x42, 0x7b, 0x66, 0xee, + 0x0b, 0x63, 0x7e, 0x57, 0x81, 0xda, 0xdb, 0xfe, 0x88, 0x0d, 0x16, 0x3c, 0xbd, 0x10, 0x8f, 0xd5, + 0x29, 0xf1, 0x78, 0x8e, 0x0e, 0x3f, 0x51, 0xa0, 0xfa, 0x10, 0xc7, 0xdb, 0x07, 0xd8, 0x17, 0xf6, + 0xe3, 0x31, 0x35, 0x6d, 0xdb, 0x88, 0x01, 0xb9, 0x0b, 0xf5, 0x89, 0x28, 0x92, 0xec, 0x0f, 0x79, + 0x10, 0xb9, 0xe4, 0x19, 0xbd, 0x0d, 0x35, 0x97, 0xd9, 0x8f, 0x1d, 0xdf, 0xed, 0x09, 0xfb, 0xd7, + 0xac, 0xaa, 0xcb, 0xde, 0xe5, 0x43, 0x1e, 0xbf, 0x32, 0x35, 0xa5, 0xb7, 0x6b, 0xd6, 0x84, 0xc4, + 0x7c, 0x0f, 0x20, 0x51, 0x8d, 0x13, 0x94, 0x79, 0x97, 0x32, 0xe9, 0x5d, 0x5f, 0x86, 0xaa, 0x87, + 0xe3, 0x6d, 0x86, 0xfd, 0xa4, 0xc3, 0x32, 0x8b, 0xb5, 0x64, 0x27, 0x2b, 0x5d, 0x6e, 0xfe, 0x54, + 0x01, 0xfd, 0x1b, 0x91, 0xd3, 0xeb, 0x84, 0x3d, 0x3c, 0x7b, 0x7e, 0xf4, 0xb7, 0xa0, 0x7a, 0xec, + 0xa2, 0xdf, 0xcb, 0x83, 0x40, 0x32, 0xe4, 0xc4, 0xba, 0xfc, 0x6c, 0x7b, 0xe8, 0xc4, 0x03, 0xd6, + 0x2a, 0x89, 0x1b, 0x0d, 0x42, 0xb4, 0xcf, 0x25, 0xe6, 0x53, 0x05, 0x40, 0x68, 0xc7, 0xef, 0x19, + 0x23, 0x6d, 0x68, 0xa4, 0xeb, 0xa9, 0x13, 0xb0, 0x96, 0x22, 0xf0, 0xde, 0x9b, 0x7a, 0x33, 0x1f, + 0xe2, 0xf8, 0x5d, 0xc7, 0x1f, 0xe1, 0xbe, 0xe3, 0x52, 0xab, 0x9e, 0xec, 0xc9, 0x7f, 0x45, 0xbe, + 0x00, 0xab, 0xe1, 0x28, 0xb0, 0x29, 0xfa, 0x4e, 0x8c, 0x3d, 0x3b, 0x51, 0x94, 0x25, 0x8a, 0x93, + 0x70, 0x14, 0x58, 0x72, 0xea, 0x20, 0x99, 0x31, 0xbf, 0xa7, 0x00, 0xbc, 0xcd, 0x75, 0x96, 0x6a, + 0x9c, 0x2f, 0x2f, 0x94, 0x29, 0xe5, 0xc5, 0x04, 0x68, 0xb5, 0x08, 0x7a, 0x27, 0x05, 0xcd, 0x63, + 0x06, 0x4b, 0xfa, 0x8e, 0xf7, 0x66, 0x50, 0x9d, 0x83, 0x4f, 0x78, 0x11, 0xdf, 0xe6, 0x8f, 0x65, + 0xab, 0x96, 0x6b, 0x27, 0x55, 0x2a, 0x58, 0x40, 0x39, 0x6f, 0x81, 0xbb, 0x50, 0x0f, 0x30, 0x88, + 0xe8, 0xd8, 0x66, 0xee, 0x13, 0x4c, 0x1d, 0x58, 0x8a, 0x0e, 0xdc, 0x27, 0xc8, 0x5d, 0x54, 0x50, + 0x12, 0x9d, 0xb2, 0xd4, 0x46, 0x9c, 0x86, 0xe8, 0x94, 0x91, 0xcf, 0xc1, 0x0d, 0x8a, 0x5d, 0x0c, + 0x63, 0x7f, 0x6c, 0x07, 0x51, 0xcf, 0x3d, 0x76, 0x31, 0x75, 0x63, 0x23, 0x9d, 0xd8, 0x4b, 0xe4, + 0xe6, 0x5f, 0x14, 0x68, 0x7e, 0x33, 0x0d, 0x5e, 0x52, 0xb3, 0xe7, 0x10, 0x53, 0xbe, 0x22, 0xc0, + 0x16, 0xf8, 0x9b, 0xd3, 0xb7, 0xcd, 0x48, 0xb2, 0x6a, 0x0c, 0xfb, 0x52, 0xa9, 0x1d, 0xa8, 0x0b, + 0x73, 0x24, 0x7b, 0x94, 0xe6, 0xda, 0x20, 0xb7, 0xbc, 0x05, 0xc7, 0xd9, 0xb7, 0xf9, 0x81, 0x0a, + 0x44, 0x96, 0xfb, 0xc2, 0x48, 0x2f, 0x5c, 0x8e, 0xfe, 0xc6, 0xf4, 0x1c, 0xfd, 0x62, 0xf2, 0xf5, + 0x29, 0x90, 0xb0, 0xf2, 0x5e, 0x9c, 0x6e, 0xe9, 0x42, 0x92, 0x4e, 0x4b, 0x7f, 0xcd, 0x8a, 0x56, + 0xdd, 0xd2, 0x85, 0x44, 0x4c, 0xb7, 0xa1, 0x81, 0x67, 0x31, 0x75, 0xd2, 0x3b, 0x59, 0xbb, 0xf2, + 0x9d, 0x14, 0x3f, 0x93, 0x77, 0xd2, 0xfc, 0x50, 0x85, 0xd5, 0xb4, 0xc8, 0x7b, 0x49, 0xe7, 0xc2, + 0x74, 0xfe, 0x59, 0x85, 0xd7, 0x0a, 0x74, 0xee, 0xd3, 0xa8, 0x4f, 0x91, 0xb1, 0x97, 0xb4, 0x2e, + 0x40, 0xeb, 0x9b, 0x7f, 0xd4, 0xa0, 0x9a, 0xf0, 0x41, 0x74, 0x28, 0x7b, 0x8f, 0xa2, 0x10, 0x8d, + 0x57, 0xc8, 0x1a, 0xdc, 0xf0, 0xce, 0xff, 0x29, 0x61, 0xf4, 0xc8, 0x0a, 0x2c, 0x7b, 0xc5, 0x7e, + 0xbd, 0x81, 0x84, 0x40, 0xd3, 0x2b, 0xb4, 0xab, 0x8d, 0x63, 0x72, 0x0b, 0x56, 0xbc, 0x8b, 0x1d, + 0x5d, 0x83, 0x3f, 0xf8, 0x86, 0x57, 0x6c, 0x7a, 0x32, 0x63, 0x20, 0xb6, 0xf8, 0x1a, 0xc6, 0x59, + 0xf6, 0xce, 0x0c, 0x97, 0xac, 0x81, 0xe1, 0x9d, 0xeb, 0x3d, 0x1a, 0xbf, 0x53, 0xc8, 0x0a, 0x34, + 0xbd, 0x42, 0x73, 0xcd, 0xf8, 0xbd, 0x42, 0x08, 0x2c, 0x79, 0x93, 0xdd, 0x23, 0xe3, 0x03, 0x85, + 0xdc, 0x02, 0xe2, 0x5d, 0x68, 0xb2, 0x18, 0x7f, 0x50, 0xc8, 0x2a, 0x2c, 0x7b, 0x85, 0x5e, 0x04, + 0x33, 0x3e, 0x54, 0xc8, 0x0d, 0x68, 0x78, 0x13, 0xb1, 0xcf, 0xf8, 0x85, 0x2a, 0x8f, 0x9a, 0x74, + 0x39, 0xe3, 0x97, 0x2a, 0xb9, 0x03, 0x37, 0xbd, 0xa9, 0x7e, 0x68, 0x3c, 0x53, 0x49, 0x03, 0xaa, + 0x9e, 0xac, 0xfa, 0x8d, 0xef, 0x6b, 0x62, 0x24, 0xcb, 0x51, 0xe3, 0x07, 0x1a, 0xa9, 0x43, 0xc5, + 0x13, 0x89, 0xa1, 0xf1, 0x43, 0x39, 0x25, 0xd3, 0x7a, 0xe3, 0x23, 0x4d, 0xa8, 0x3f, 0x99, 0xe4, + 0x1b, 0xff, 0xd2, 0x48, 0x13, 0x74, 0x2f, 0x4d, 0x64, 0x8d, 0x5f, 0xe9, 0x42, 0xeb, 0xe2, 0x3b, + 0x64, 0xbc, 0xaf, 0x93, 0x65, 0x00, 0x2f, 0xcb, 0x77, 0x8c, 0x5f, 0xeb, 0x6f, 0xbe, 0x05, 0xb5, + 0xf4, 0x8f, 0x41, 0x02, 0x50, 0xd9, 0x73, 0x58, 0x8c, 0xd4, 0x78, 0x85, 0x7f, 0x5b, 0xe8, 0xf4, + 0x90, 0x1a, 0x0a, 0xff, 0xfe, 0x16, 0x75, 0xb9, 0x5c, 0xe5, 0x36, 0xdf, 0xe7, 0x7e, 0x6b, 0x68, + 0x3b, 0xed, 0x6f, 0xef, 0xf4, 0xdd, 0x78, 0x30, 0x3a, 0xe2, 0x5e, 0xb3, 0xf5, 0xc4, 0xf5, 0x7d, + 0xf7, 0x49, 0x8c, 0xdd, 0xc1, 0x96, 0xf4, 0xa8, 0xcf, 0xf7, 0x5c, 0x16, 0x53, 0xf7, 0x68, 0x14, + 0x63, 0x6f, 0x2b, 0xbd, 0x4b, 0x5b, 0xc2, 0xcd, 0xb2, 0xe1, 0xf0, 0xe8, 0xa8, 0x22, 0x24, 0x0f, + 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x6d, 0xfc, 0xc1, 0x89, 0x1f, 0x00, 0x00, } diff --git a/internal/proxy/grpc_service.go b/internal/proxy/grpc_service.go index ec8d08135..54d15dbdb 100644 --- a/internal/proxy/grpc_service.go +++ b/internal/proxy/grpc_service.go @@ -595,7 +595,48 @@ func (p *Proxy) ShowPartitions(ctx context.Context, req *servicepb.CollectionNam } func (p *Proxy) CreateIndex(ctx context.Context, indexParam *servicepb.IndexParam) (*commonpb.Status, error) { - return nil, nil + log.Println("create index: ", indexParam.IndexName) + cit := &CreateIndexTask{ + Condition: NewTaskCondition(ctx), + CreateIndexRequest: internalpb.CreateIndexRequest{ + MsgType: internalpb.MsgType_kCreateIndex, + CollectionName: indexParam.CollectionName, + FieldName: indexParam.FieldName, + IndexName: indexParam.IndexName, + ExtraParams: indexParam.ExtraParams, + }, + masterClient: p.masterClient, + } + + var cancel func() + cit.ctx, cancel = context.WithTimeout(ctx, reqTimeoutInterval) + defer cancel() + + fn := func() error { + select { + case <-ctx.Done(): + return errors.New("create index timeout") + default: + return p.sched.DdQueue.Enqueue(cit) + } + } + err := fn() + if err != nil { + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_UNEXPECTED_ERROR, + Reason: err.Error(), + }, nil + } + + err = cit.WaitToFinish() + if err != nil { + return &commonpb.Status{ + ErrorCode: commonpb.ErrorCode_UNEXPECTED_ERROR, + Reason: err.Error(), + }, nil + } + + return cit.result, nil } func (p *Proxy) DescribeIndex(context.Context, *servicepb.IndexParam) (*servicepb.DescribeIndexResponse, error) { diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 3433e35c9..add283974 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -962,3 +962,168 @@ func (spt *ShowPartitionsTask) Execute() (err error) { func (spt *ShowPartitionsTask) PostExecute() error { return nil } + +type CreateIndexTask struct { + Condition + internalpb.CreateIndexRequest + masterClient masterpb.MasterClient + result *commonpb.Status + ctx context.Context +} + +func (cit *CreateIndexTask) ID() UniqueID { + return cit.ReqID +} + +func (cit *CreateIndexTask) SetID(uid UniqueID) { + cit.ReqID = uid +} + +func (cit *CreateIndexTask) Type() internalpb.MsgType { + return cit.MsgType +} + +func (cit *CreateIndexTask) BeginTs() Timestamp { + return cit.Timestamp +} + +func (cit *CreateIndexTask) EndTs() Timestamp { + return cit.Timestamp +} + +func (cit *CreateIndexTask) SetTs(ts Timestamp) { + cit.Timestamp = ts +} + +func (cit *CreateIndexTask) PreExecute() error { + collName, fieldName := cit.CollectionName, cit.FieldName + + if err := ValidateCollectionName(collName); err != nil { + return err + } + + if err := ValidateFieldName(fieldName); err != nil { + return err + } + + return nil +} + +func (cit *CreateIndexTask) Execute() (err error) { + cit.result, err = cit.masterClient.CreateIndex(cit.ctx, &cit.CreateIndexRequest) + return err +} + +func (cit *CreateIndexTask) PostExecute() error { + return nil +} + +type DescribeIndexTask struct { + Condition + internalpb.DescribeIndexRequest + masterClient masterpb.MasterClient + result *servicepb.DescribeIndexResponse + ctx context.Context +} + +func (dit *DescribeIndexTask) ID() UniqueID { + return dit.ReqID +} + +func (dit *DescribeIndexTask) SetID(uid UniqueID) { + dit.ReqID = uid +} + +func (dit *DescribeIndexTask) Type() internalpb.MsgType { + return dit.MsgType +} + +func (dit *DescribeIndexTask) BeginTs() Timestamp { + return dit.Timestamp +} + +func (dit *DescribeIndexTask) EndTs() Timestamp { + return dit.Timestamp +} + +func (dit *DescribeIndexTask) SetTs(ts Timestamp) { + dit.Timestamp = ts +} + +func (dit *DescribeIndexTask) PreExecute() error { + collName, fieldName := dit.CollectionName, dit.FieldName + + if err := ValidateCollectionName(collName); err != nil { + return err + } + + if err := ValidateFieldName(fieldName); err != nil { + return err + } + + return nil +} + +func (dit *DescribeIndexTask) Execute() (err error) { + dit.result, err = dit.masterClient.DescribeIndex(dit.ctx, &dit.DescribeIndexRequest) + return err +} + +func (dit *DescribeIndexTask) PostExecute() error { + return nil +} + +type DescribeIndexProgressTask struct { + Condition + internalpb.DescribeIndexProgressRequest + masterClient masterpb.MasterClient + result *servicepb.BoolResponse + ctx context.Context +} + +func (dipt *DescribeIndexProgressTask) ID() UniqueID { + return dipt.ReqID +} + +func (dipt *DescribeIndexProgressTask) SetID(uid UniqueID) { + dipt.ReqID = uid +} + +func (dipt *DescribeIndexProgressTask) Type() internalpb.MsgType { + return dipt.MsgType +} + +func (dipt *DescribeIndexProgressTask) BeginTs() Timestamp { + return dipt.Timestamp +} + +func (dipt *DescribeIndexProgressTask) EndTs() Timestamp { + return dipt.Timestamp +} + +func (dipt *DescribeIndexProgressTask) SetTs(ts Timestamp) { + dipt.Timestamp = ts +} + +func (dipt *DescribeIndexProgressTask) PreExecute() error { + collName, fieldName := dipt.CollectionName, dipt.FieldName + + if err := ValidateCollectionName(collName); err != nil { + return err + } + + if err := ValidateFieldName(fieldName); err != nil { + return err + } + + return nil +} + +func (dipt *DescribeIndexProgressTask) Execute() (err error) { + dipt.result, err = dipt.masterClient.DescribeIndexProgress(dipt.ctx, &dipt.DescribeIndexProgressRequest) + return err +} + +func (dipt *DescribeIndexProgressTask) PostExecute() error { + return nil +} -- GitLab