From b7977698a89f550d4325f62daea4bfdd2813ef6a Mon Sep 17 00:00:00 2001 From: dragondriver Date: Fri, 7 May 2021 19:27:17 +0800 Subject: [PATCH] Change the codec style of expr plan from text to binary (#5129) Signed-off-by: dragondriver --- internal/core/src/query/Plan.cpp | 6 +- internal/core/src/query/Plan.h | 3 +- internal/core/src/segcore/plan_c.cpp | 5 +- internal/core/src/segcore/plan_c.h | 3 +- internal/core/unittest/test_c_api.cpp | 43 +++-- internal/proto/internal.proto | 2 +- internal/proto/internalpb/internal.pb.go | 204 +++++++++++------------ internal/proxynode/task.go | 5 +- internal/querynode/plan.go | 6 +- 9 files changed, 152 insertions(+), 125 deletions(-) diff --git a/internal/core/src/query/Plan.cpp b/internal/core/src/query/Plan.cpp index 2cf3862ea2..eb87763207 100644 --- a/internal/core/src/query/Plan.cpp +++ b/internal/core/src/query/Plan.cpp @@ -324,10 +324,10 @@ CreatePlan(const Schema& schema, const std::string& dsl_str) { } std::unique_ptr -CreatePlanByExpr(const Schema& schema, const std::string& serialized_expr_plan) { +CreatePlanByExpr(const Schema& schema, const char* serialized_expr_plan, int64_t size) { + // Note: serialized_expr_plan is of binary format proto::plan::PlanNode plan_node; - auto ok = google::protobuf::TextFormat::ParseFromString(serialized_expr_plan, &plan_node); - AssertInfo(ok, "Failed to parse"); + plan_node.ParseFromArray(serialized_expr_plan, size); return ProtoParser(schema).CreatePlan(plan_node); } diff --git a/internal/core/src/query/Plan.h b/internal/core/src/query/Plan.h index 4102f0efd0..122b2d2c18 100644 --- a/internal/core/src/query/Plan.h +++ b/internal/core/src/query/Plan.h @@ -25,8 +25,9 @@ struct PlaceholderGroup; std::unique_ptr CreatePlan(const Schema& schema, const std::string& dsl); +// Note: serialized_expr_plan is of binary format std::unique_ptr -CreatePlanByExpr(const Schema& schema, const std::string& serialized_expr_plan); +CreatePlanByExpr(const Schema& schema, const char* serialized_expr_plan, int64_t size); std::unique_ptr ParsePlaceholderGroup(const Plan* plan, const std::string& placeholder_group_blob); diff --git a/internal/core/src/segcore/plan_c.cpp b/internal/core/src/segcore/plan_c.cpp index 8d38146522..bd6325cfc5 100644 --- a/internal/core/src/segcore/plan_c.cpp +++ b/internal/core/src/segcore/plan_c.cpp @@ -41,12 +41,13 @@ CreatePlan(CCollection c_col, const char* dsl, CPlan* res_plan) { } } +// Note: serialized_expr_plan is of binary format CStatus -CreatePlanByExpr(CCollection c_col, const char* serialized_expr_plan, CPlan* res_plan) { +CreatePlanByExpr(CCollection c_col, const char* serialized_expr_plan, int64_t size, CPlan* res_plan) { auto col = (milvus::segcore::Collection*)c_col; try { - auto res = milvus::query::CreatePlanByExpr(*col->get_schema(), serialized_expr_plan); + auto res = milvus::query::CreatePlanByExpr(*col->get_schema(), serialized_expr_plan, size); auto status = CStatus(); status.error_code = Success; diff --git a/internal/core/src/segcore/plan_c.h b/internal/core/src/segcore/plan_c.h index 1c7c32650c..5d7f17ce19 100644 --- a/internal/core/src/segcore/plan_c.h +++ b/internal/core/src/segcore/plan_c.h @@ -24,8 +24,9 @@ typedef void* CPlaceholderGroup; CStatus CreatePlan(CCollection col, const char* dsl, CPlan* res_plan); +// Note: serialized_expr_plan is of binary format CStatus -CreatePlanByExpr(CCollection col, const char* serialized_expr_plan, CPlan* res_plan); +CreatePlanByExpr(CCollection col, const char* serialized_expr_plan, int64_t size, CPlan* res_plan); CStatus ParsePlaceholderGroup(CPlan plan, diff --git a/internal/core/unittest/test_c_api.cpp b/internal/core/unittest/test_c_api.cpp index eba25dcffc..a1163ad257 100644 --- a/internal/core/unittest/test_c_api.cpp +++ b/internal/core/unittest/test_c_api.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include "test_utils/DataGen.h" namespace chrono = std::chrono; @@ -61,6 +62,22 @@ get_default_schema_config() { return conf.c_str(); } +std::vector +translate_text_plan_to_binary_plan(const char* text_plan) { + proto::plan::PlanNode plan_node; + auto ok = google::protobuf::TextFormat::ParseFromString(text_plan, &plan_node); + AssertInfo(ok, "Failed to parse"); + + std::string binary_plan; + plan_node.SerializeToString(&binary_plan); + + std::vector ret; + ret.resize(binary_plan.size()); + std::memcpy(ret.data(), binary_plan.c_str(), binary_plan.size()); + + return ret; +} + TEST(CApiTest, CollectionTest) { auto collection = NewCollection(get_default_schema_config()); DeleteCollection(collection); @@ -279,8 +296,8 @@ TEST(CApiTest, SearchTestWithExpr) { auto blob = raw_group.SerializeAsString(); void* plan = nullptr; - - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); ASSERT_EQ(status.error_code, Success); void* placeholderGroup = nullptr; @@ -705,8 +722,8 @@ TEST(CApiTest, ReduceSearchWithExpr) { auto blob = raw_group.SerializeAsString(); void* plan = nullptr; - - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; @@ -1015,7 +1032,8 @@ TEST(CApiTest, UpdateSegmentIndex_Expr_Without_Predicate) { // search on segment's small index void* plan = nullptr; - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; @@ -1303,7 +1321,8 @@ TEST(CApiTest, UpdateSegmentIndex_Expr_With_float_Predicate_Range) { // search on segment's small index void* plan = nullptr; - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; @@ -1643,7 +1662,8 @@ TEST(CApiTest, UpdateSegmentIndex_Expr_With_float_Predicate_Term) { // search on segment's small index void* plan = nullptr; - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; @@ -1934,7 +1954,8 @@ TEST(CApiTest, UpdateSegmentIndex_Expr_With_binary_Predicate_Range) { // search on segment's small index void* plan = nullptr; - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; @@ -2283,7 +2304,8 @@ TEST(CApiTest, UpdateSegmentIndex_Expr_With_binary_Predicate_Term) { // search on segment's small index void* plan = nullptr; - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; @@ -2629,7 +2651,8 @@ TEST(CApiTest, SealedSegment_search_float_With_Expr_Predicate_Range) { // search on segment's small index void* plan = nullptr; - auto status = CreatePlanByExpr(collection, serialized_expr_plan, &plan); + auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan); + auto status = CreatePlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan); assert(status.error_code == Success); void* placeholderGroup = nullptr; diff --git a/internal/proto/internal.proto b/internal/proto/internal.proto index 8b114892d2..acf3c2271d 100644 --- a/internal/proto/internal.proto +++ b/internal/proto/internal.proto @@ -128,7 +128,7 @@ message SearchRequest { // serialized `PlaceholderGroup` bytes placeholder_group = 7; common.DslType dsl_type = 8; - string serialized_expr_plan = 9; + bytes serialized_expr_plan = 9; } message SearchResults { diff --git a/internal/proto/internalpb/internal.pb.go b/internal/proto/internalpb/internal.pb.go index 6cf9ed0b27..dac4477a3e 100644 --- a/internal/proto/internalpb/internal.pb.go +++ b/internal/proto/internalpb/internal.pb.go @@ -1028,7 +1028,7 @@ type SearchRequest struct { // serialized `PlaceholderGroup` PlaceholderGroup []byte `protobuf:"bytes,7,opt,name=placeholder_group,json=placeholderGroup,proto3" json:"placeholder_group,omitempty"` DslType commonpb.DslType `protobuf:"varint,8,opt,name=dsl_type,json=dslType,proto3,enum=milvus.proto.common.DslType" json:"dsl_type,omitempty"` - SerializedExprPlan string `protobuf:"bytes,9,opt,name=serialized_expr_plan,json=serializedExprPlan,proto3" json:"serialized_expr_plan,omitempty"` + SerializedExprPlan []byte `protobuf:"bytes,9,opt,name=serialized_expr_plan,json=serializedExprPlan,proto3" json:"serialized_expr_plan,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -1115,11 +1115,11 @@ func (m *SearchRequest) GetDslType() commonpb.DslType { return commonpb.DslType_Dsl } -func (m *SearchRequest) GetSerializedExprPlan() string { +func (m *SearchRequest) GetSerializedExprPlan() []byte { if m != nil { return m.SerializedExprPlan } - return "" + return nil } type SearchResults struct { @@ -1906,103 +1906,103 @@ func init() { func init() { proto.RegisterFile("internal.proto", fileDescriptor_41f4a519b878ee3b) } var fileDescriptor_41f4a519b878ee3b = []byte{ - // 1563 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4b, 0x6f, 0x1b, 0xd5, - 0x17, 0xff, 0x8f, 0xed, 0xc4, 0xf6, 0xb1, 0x93, 0xba, 0xd3, 0xd7, 0xa4, 0x4d, 0xff, 0x75, 0x87, - 0x57, 0xa0, 0x22, 0xa9, 0x52, 0xa0, 0x88, 0x4d, 0xdb, 0xc4, 0x6d, 0xb0, 0xda, 0x44, 0x61, 0x9c, - 0x56, 0x82, 0xcd, 0xe8, 0xda, 0x73, 0x62, 0x4f, 0x3b, 0x2f, 0xee, 0xbd, 0x6e, 0xe2, 0xae, 0x58, - 0xb0, 0x43, 0xb0, 0x40, 0xe2, 0x0b, 0xf0, 0x01, 0xf8, 0x08, 0x80, 0x58, 0x21, 0xb1, 0x47, 0x42, - 0xe2, 0x53, 0xb0, 0x64, 0x85, 0xee, 0x63, 0xc6, 0x8f, 0x3a, 0x69, 0x1a, 0xa8, 0x10, 0x82, 0xdd, - 0xdc, 0x73, 0x8e, 0xcf, 0xbd, 0xe7, 0xf7, 0x3b, 0x8f, 0x7b, 0x0d, 0xf3, 0x7e, 0xc4, 0x91, 0x46, - 0x24, 0x58, 0x4e, 0x68, 0xcc, 0x63, 0xf3, 0x4c, 0xe8, 0x07, 0x8f, 0xfb, 0x4c, 0xad, 0x96, 0x53, - 0xe5, 0xf9, 0x6a, 0x27, 0x0e, 0xc3, 0x38, 0x52, 0x62, 0xfb, 0x5b, 0x03, 0xe6, 0xd6, 0xe3, 0x30, - 0x89, 0x23, 0x8c, 0x78, 0x33, 0xda, 0x8d, 0xcd, 0xb3, 0x30, 0x1b, 0xc5, 0x1e, 0x36, 0x1b, 0x96, - 0x51, 0x37, 0x96, 0xf2, 0x8e, 0x5e, 0x99, 0x26, 0x14, 0x68, 0x1c, 0xa0, 0x95, 0xab, 0x1b, 0x4b, - 0x65, 0x47, 0x7e, 0x9b, 0x37, 0x00, 0x18, 0x27, 0x1c, 0xdd, 0x4e, 0xec, 0xa1, 0x95, 0xaf, 0x1b, - 0x4b, 0xf3, 0xab, 0xf5, 0xe5, 0xa9, 0xfb, 0x2e, 0xb7, 0x84, 0xe1, 0x7a, 0xec, 0xa1, 0x53, 0x66, - 0xe9, 0xa7, 0x79, 0x13, 0x00, 0xf7, 0x39, 0x25, 0xae, 0x1f, 0xed, 0xc6, 0x56, 0xa1, 0x9e, 0x5f, - 0xaa, 0xac, 0x5e, 0x1e, 0x77, 0xa0, 0x8f, 0x7b, 0x17, 0x07, 0x0f, 0x48, 0xd0, 0xc7, 0x6d, 0xe2, - 0x53, 0xa7, 0x2c, 0x7f, 0x24, 0x8e, 0x6b, 0xff, 0x62, 0xc0, 0x89, 0x2c, 0x00, 0xb9, 0x07, 0x33, - 0xdf, 0x83, 0x19, 0xb9, 0x85, 0x8c, 0xa0, 0xb2, 0xfa, 0xf2, 0x01, 0x27, 0x1a, 0x8b, 0xdb, 0x51, - 0x3f, 0x31, 0xef, 0xc3, 0x29, 0xd6, 0x6f, 0x77, 0x52, 0x95, 0x2b, 0xa5, 0xcc, 0xca, 0xc9, 0xa3, - 0x1d, 0xcd, 0x93, 0x39, 0xea, 0x40, 0x1f, 0xe9, 0x1a, 0xcc, 0x0a, 0x4f, 0x7d, 0x26, 0x51, 0xaa, - 0xac, 0x5e, 0x98, 0x1a, 0x64, 0x4b, 0x9a, 0x38, 0xda, 0xd4, 0xbe, 0x00, 0x0b, 0x1b, 0xc8, 0x27, - 0xa2, 0x73, 0xf0, 0xe3, 0x3e, 0x32, 0xae, 0x95, 0x3b, 0x7e, 0x88, 0x3b, 0x7e, 0xe7, 0xd1, 0x7a, - 0x8f, 0x44, 0x11, 0x06, 0xa9, 0xf2, 0x22, 0x5c, 0xd8, 0x40, 0xf9, 0x03, 0x9f, 0x71, 0xbf, 0xc3, - 0x26, 0xd4, 0x67, 0xe0, 0xd4, 0x06, 0xf2, 0x86, 0x37, 0x21, 0x7e, 0x00, 0xa5, 0x2d, 0x41, 0xb6, - 0x48, 0x83, 0x77, 0xa0, 0x48, 0x3c, 0x8f, 0x22, 0x63, 0x1a, 0xc5, 0xc5, 0xa9, 0x27, 0xbe, 0xa5, - 0x6c, 0x9c, 0xd4, 0x78, 0x5a, 0x9a, 0xd8, 0x0f, 0x01, 0x9a, 0x91, 0xcf, 0xb7, 0x09, 0x25, 0x21, - 0x3b, 0x30, 0xc1, 0x1a, 0x50, 0x65, 0x9c, 0x50, 0xee, 0x26, 0xd2, 0x4e, 0x43, 0x7e, 0x84, 0x6c, - 0xa8, 0xc8, 0x9f, 0x29, 0xef, 0xf6, 0x87, 0x00, 0x2d, 0x4e, 0xfd, 0xa8, 0x7b, 0xcf, 0x67, 0x5c, - 0xec, 0xf5, 0x58, 0xd8, 0x89, 0x20, 0xf2, 0x4b, 0x65, 0x47, 0xaf, 0x46, 0xe8, 0xc8, 0x1d, 0x9d, - 0x8e, 0x1b, 0x50, 0x49, 0xe1, 0xde, 0x64, 0x5d, 0xf3, 0x2a, 0x14, 0xda, 0x84, 0xe1, 0xa1, 0xf0, - 0x6c, 0xb2, 0xee, 0x1a, 0x61, 0xe8, 0x48, 0x4b, 0xfb, 0x57, 0x03, 0xce, 0xad, 0x53, 0x94, 0xc9, - 0x1f, 0x04, 0xd8, 0xe1, 0x7e, 0x1c, 0x69, 0xec, 0x9f, 0xdf, 0x9b, 0x79, 0x0e, 0x8a, 0x5e, 0xdb, - 0x8d, 0x48, 0x98, 0x82, 0x3d, 0xeb, 0xb5, 0xb7, 0x48, 0x88, 0xe6, 0xab, 0x30, 0xdf, 0xc9, 0xfc, - 0x0b, 0x89, 0xcc, 0xb9, 0xb2, 0x33, 0x21, 0x15, 0x54, 0x79, 0xed, 0x66, 0xc3, 0x2a, 0x48, 0x1a, - 0xe4, 0xb7, 0x69, 0x43, 0x75, 0x68, 0xd5, 0x6c, 0x58, 0x33, 0x52, 0x37, 0x26, 0x13, 0xa0, 0xb2, - 0x4e, 0x0f, 0x43, 0x62, 0xcd, 0xd6, 0x8d, 0xa5, 0xaa, 0xa3, 0x57, 0xf6, 0x0f, 0x06, 0x9c, 0x69, - 0xd0, 0x38, 0xf9, 0x27, 0x07, 0x67, 0x7f, 0x9e, 0x83, 0xb3, 0x8a, 0xa3, 0x6d, 0x42, 0xb9, 0xff, - 0x82, 0xa2, 0x78, 0x0d, 0x4e, 0x0c, 0x77, 0x55, 0x06, 0xd3, 0xc3, 0x78, 0x05, 0xe6, 0x93, 0xf4, - 0x1c, 0xca, 0xae, 0x20, 0xed, 0xe6, 0x32, 0xe9, 0x58, 0xb4, 0x33, 0x87, 0x44, 0x3b, 0x3b, 0x85, - 0xca, 0x3a, 0x54, 0x32, 0x47, 0xcd, 0x86, 0x55, 0x94, 0x26, 0xa3, 0x22, 0xfb, 0xb3, 0x1c, 0x9c, - 0x16, 0xa4, 0xfe, 0x87, 0x86, 0x40, 0xe3, 0xbb, 0x1c, 0x98, 0x2a, 0x3b, 0x9a, 0x91, 0x87, 0xfb, - 0x7f, 0x27, 0x16, 0x17, 0x01, 0x76, 0x7d, 0x0c, 0xbc, 0x51, 0x1c, 0xca, 0x52, 0xf2, 0xa7, 0x30, - 0xb0, 0xa0, 0x28, 0x9d, 0x64, 0xf1, 0xa7, 0x4b, 0xd1, 0x9f, 0xd5, 0xac, 0xd6, 0xfd, 0xb9, 0x74, - 0xe4, 0xfe, 0x2c, 0x7f, 0xa6, 0xfb, 0xf3, 0x37, 0x79, 0x98, 0x6b, 0x46, 0x0c, 0x29, 0xff, 0x37, - 0x27, 0x92, 0xb9, 0x08, 0x65, 0x86, 0xdd, 0x50, 0x5c, 0x19, 0x1a, 0x56, 0x49, 0xea, 0x87, 0x02, - 0xa1, 0xed, 0xa8, 0xd1, 0xdc, 0x6c, 0x58, 0x65, 0x45, 0x6d, 0x26, 0x30, 0xff, 0x0f, 0xc0, 0xfd, - 0x10, 0x19, 0x27, 0x61, 0xc2, 0x2c, 0xa8, 0xe7, 0x97, 0x0a, 0xce, 0x88, 0x44, 0xf4, 0x67, 0x1a, - 0xef, 0x35, 0x1b, 0xcc, 0xaa, 0xd4, 0xf3, 0x62, 0xc0, 0xaa, 0x95, 0xf9, 0x16, 0x94, 0x68, 0xbc, - 0xe7, 0x7a, 0x84, 0x13, 0xab, 0x2a, 0xc9, 0x5b, 0x98, 0x0a, 0xf6, 0x5a, 0x10, 0xb7, 0x9d, 0x22, - 0x8d, 0xf7, 0x1a, 0x84, 0x13, 0xfb, 0xb7, 0x1c, 0xcc, 0xb5, 0x90, 0xd0, 0x4e, 0xef, 0xf8, 0x84, - 0xbd, 0x0e, 0x35, 0x8a, 0xac, 0x1f, 0x70, 0x77, 0x18, 0x96, 0x62, 0xee, 0x84, 0x92, 0xaf, 0x67, - 0xc1, 0xa5, 0x90, 0xe7, 0x0f, 0x81, 0xbc, 0x30, 0x05, 0x72, 0x1b, 0xaa, 0x23, 0xf8, 0x32, 0x6b, - 0x46, 0x86, 0x3e, 0x26, 0x33, 0x6b, 0x90, 0xf7, 0x58, 0x20, 0x19, 0x2b, 0x3b, 0xe2, 0xd3, 0xbc, - 0x02, 0x27, 0x93, 0x80, 0x74, 0xb0, 0x17, 0x07, 0x1e, 0x52, 0xb7, 0x4b, 0xe3, 0x7e, 0x22, 0xe9, - 0xaa, 0x3a, 0xb5, 0x11, 0xc5, 0x86, 0x90, 0x9b, 0xd7, 0xa1, 0xe4, 0xb1, 0xc0, 0xe5, 0x83, 0x04, - 0x25, 0x65, 0xf3, 0x07, 0xc4, 0xde, 0x60, 0xc1, 0xce, 0x20, 0x41, 0xa7, 0xe8, 0xa9, 0x0f, 0xf3, - 0x2a, 0x9c, 0x66, 0x48, 0x7d, 0x12, 0xf8, 0x4f, 0xd0, 0x73, 0x71, 0x3f, 0xa1, 0x6e, 0x12, 0x90, - 0x48, 0x33, 0x6b, 0x0e, 0x75, 0xb7, 0xf7, 0x13, 0xba, 0x1d, 0x90, 0xc8, 0xfe, 0xd9, 0x18, 0x82, - 0x2e, 0xf0, 0x61, 0xc7, 0x00, 0xfd, 0x38, 0x77, 0x9c, 0xa9, 0x4c, 0xe5, 0xa7, 0x33, 0x75, 0x09, - 0x2a, 0x21, 0x72, 0xea, 0x77, 0x14, 0x22, 0xaa, 0x80, 0x40, 0x89, 0x64, 0xd8, 0x26, 0x14, 0x7a, - 0x3e, 0x57, 0x54, 0x54, 0x1d, 0xf9, 0x6d, 0xff, 0x64, 0xc0, 0x5c, 0x03, 0x03, 0xe4, 0x78, 0xfc, - 0x6c, 0x9a, 0x52, 0xe5, 0xb9, 0xa9, 0x55, 0x3e, 0x56, 0x46, 0xf9, 0xc3, 0xcb, 0xa8, 0xf0, 0x54, - 0x19, 0x5d, 0x86, 0x6a, 0x42, 0xfd, 0x90, 0xd0, 0x81, 0xfb, 0x08, 0x07, 0x69, 0x46, 0x55, 0xb4, - 0xec, 0x2e, 0x0e, 0x98, 0xfd, 0xb5, 0x01, 0xa5, 0x3b, 0x41, 0x9f, 0xf5, 0x8e, 0x75, 0x1f, 0x1c, - 0x6f, 0x02, 0xb9, 0xc9, 0x26, 0x30, 0x99, 0xf5, 0xf9, 0x67, 0x64, 0xfd, 0x0e, 0xe9, 0x6a, 0x12, - 0xc6, 0x64, 0xf6, 0xef, 0x06, 0x94, 0xef, 0xc5, 0xc4, 0x93, 0x13, 0xeb, 0x2f, 0x3f, 0xe5, 0x22, - 0x0c, 0x87, 0x4e, 0x8a, 0xf1, 0x70, 0x0a, 0x8d, 0x4c, 0x93, 0xc2, 0xf8, 0x34, 0xb9, 0x04, 0x15, - 0x5f, 0x1c, 0xc8, 0x4d, 0x08, 0xef, 0x29, 0x70, 0xcb, 0x0e, 0x48, 0xd1, 0xb6, 0x90, 0x88, 0x71, - 0x93, 0x1a, 0xc8, 0x71, 0x33, 0x7b, 0xe4, 0x71, 0xa3, 0x9d, 0xc8, 0x71, 0xf3, 0x7d, 0x0e, 0xac, - 0x96, 0x3a, 0xec, 0xf0, 0x35, 0x74, 0x3f, 0xf1, 0xe4, 0xa3, 0x6c, 0x11, 0xca, 0xad, 0x2c, 0x32, - 0xf5, 0x18, 0x19, 0x0a, 0x44, 0x7e, 0x6c, 0x62, 0x18, 0xd3, 0x41, 0xcb, 0x7f, 0x82, 0x3a, 0xf0, - 0x11, 0x89, 0x88, 0x6d, 0xab, 0x1f, 0x3a, 0xf1, 0x1e, 0xd3, 0xd4, 0xa4, 0x4b, 0x11, 0x5b, 0x47, - 0x5e, 0x12, 0x5c, 0x91, 0x4e, 0x32, 0xf2, 0x82, 0x03, 0x4a, 0x24, 0x5e, 0x10, 0xe6, 0x02, 0x94, - 0x30, 0xf2, 0x94, 0x76, 0x46, 0x6a, 0x8b, 0x18, 0x79, 0x52, 0xd5, 0x84, 0x79, 0xfd, 0x0a, 0x8a, - 0x99, 0xa4, 0x50, 0xb6, 0xab, 0xca, 0xaa, 0x7d, 0xc0, 0xd3, 0x73, 0x93, 0x75, 0xb7, 0xb5, 0xa5, - 0x33, 0xa7, 0x1e, 0x42, 0x7a, 0x69, 0xde, 0x86, 0xaa, 0xd8, 0x25, 0x73, 0x54, 0x3c, 0xb2, 0xa3, - 0x0a, 0x46, 0x5e, 0xba, 0xb0, 0xbf, 0x34, 0xe0, 0xe4, 0x53, 0x10, 0x1e, 0x23, 0x8f, 0xee, 0x42, - 0xa9, 0x85, 0x5d, 0xe1, 0x22, 0x7d, 0xdb, 0xad, 0x1c, 0xf4, 0x57, 0xc1, 0x01, 0x84, 0x39, 0x99, - 0x03, 0xfb, 0x61, 0x46, 0xab, 0xac, 0x3f, 0xf1, 0x46, 0x16, 0x4d, 0xc5, 0x7b, 0x01, 0x85, 0x68, - 0x7f, 0x6a, 0x88, 0xf7, 0xab, 0x87, 0xfb, 0x72, 0xeb, 0xa7, 0x12, 0xd3, 0x38, 0x4e, 0x62, 0x8a, - 0x99, 0x10, 0xf5, 0x43, 0x97, 0x62, 0x40, 0x38, 0x7a, 0xae, 0xde, 0x8d, 0xe9, 0xdd, 0xcd, 0xa8, - 0x1f, 0x3a, 0x4a, 0xa5, 0xc3, 0x64, 0xf6, 0x17, 0x06, 0xc0, 0x1d, 0x51, 0x3d, 0xea, 0x18, 0x93, - 0xed, 0xc1, 0x38, 0xfc, 0x32, 0x97, 0x1b, 0x2f, 0xbf, 0xb5, 0xb4, 0xfc, 0x98, 0xe4, 0x23, 0x3f, - 0x2d, 0x86, 0x8c, 0x8f, 0x61, 0xf0, 0xba, 0x42, 0x15, 0x07, 0x5f, 0x19, 0x50, 0x1d, 0xa1, 0x8a, - 0x8d, 0xc3, 0x68, 0x4c, 0x76, 0x0a, 0x39, 0x2f, 0x44, 0xf5, 0xb8, 0x6c, 0xa4, 0xa0, 0xc2, 0x61, - 0x41, 0x2d, 0x40, 0x49, 0x42, 0x32, 0x52, 0x51, 0x91, 0xae, 0xa8, 0x2b, 0x70, 0x92, 0x62, 0x07, - 0x23, 0x1e, 0x0c, 0xdc, 0x30, 0xf6, 0xfc, 0x5d, 0x1f, 0x3d, 0x59, 0x57, 0x25, 0xa7, 0x96, 0x2a, - 0x36, 0xb5, 0xdc, 0xfe, 0xd1, 0x80, 0xf9, 0x0f, 0xfa, 0x48, 0x07, 0x5b, 0xb1, 0x87, 0xea, 0x64, - 0xcf, 0x9f, 0x12, 0x37, 0x65, 0x2c, 0x1a, 0x1e, 0x95, 0xae, 0x2f, 0x3d, 0x3b, 0x5d, 0x99, 0x53, - 0x62, 0x3a, 0x45, 0x05, 0xc4, 0xea, 0x82, 0x7e, 0x14, 0x88, 0x87, 0xc4, 0x3a, 0xea, 0x5a, 0xaf, - 0x20, 0xfe, 0xc4, 0x80, 0xca, 0x48, 0x61, 0x8a, 0x99, 0xa4, 0x07, 0x98, 0x9a, 0x7b, 0x86, 0x6c, - 0xb8, 0x15, 0x2d, 0x93, 0x2d, 0xf7, 0x34, 0xcc, 0x84, 0xac, 0xab, 0x19, 0xaf, 0x3a, 0x6a, 0x61, - 0x9e, 0x87, 0x52, 0xc8, 0xba, 0xf2, 0x1e, 0xa3, 0xbb, 0x74, 0xb6, 0x16, 0xb4, 0x65, 0x63, 0x4f, - 0x37, 0xab, 0xa1, 0xe0, 0x8d, 0x77, 0xa1, 0x9c, 0xfd, 0x75, 0x67, 0xd6, 0xa0, 0xda, 0x8c, 0x7c, - 0x2e, 0xaf, 0x2b, 0x7e, 0xd4, 0xad, 0xfd, 0xcf, 0xac, 0x40, 0xf1, 0x7d, 0x24, 0x01, 0xef, 0x0d, - 0x6a, 0x86, 0x59, 0x85, 0xd2, 0xad, 0x76, 0x14, 0xd3, 0x90, 0x04, 0xb5, 0xdc, 0xda, 0xf5, 0x8f, - 0xde, 0xee, 0xfa, 0xbc, 0xd7, 0x6f, 0x0b, 0x84, 0x57, 0x54, 0xdc, 0x6f, 0xfa, 0xb1, 0xfe, 0x5a, - 0x49, 0x63, 0x5f, 0x91, 0x50, 0x64, 0xcb, 0xa4, 0xdd, 0x9e, 0x95, 0x92, 0x6b, 0x7f, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x6d, 0x31, 0x9b, 0x40, 0xd2, 0x14, 0x00, 0x00, + // 1565 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x5b, 0x6f, 0x1b, 0xc5, + 0x17, 0xff, 0xaf, 0xed, 0xc4, 0xf6, 0xd9, 0x4d, 0xea, 0x4e, 0x6f, 0x9b, 0x36, 0xfd, 0xd7, 0x5d, + 0x6e, 0x81, 0x8a, 0xa4, 0x4a, 0x81, 0x22, 0x5e, 0xda, 0x26, 0x6e, 0x83, 0xd5, 0x26, 0x0a, 0xeb, + 0xb4, 0x12, 0xbc, 0xac, 0xc6, 0xde, 0x89, 0xbd, 0xed, 0xde, 0x98, 0x19, 0x37, 0x71, 0x9f, 0x78, + 0xe0, 0x0d, 0xc1, 0x03, 0x12, 0x5f, 0x80, 0x0f, 0xc0, 0x47, 0x00, 0xc4, 0x13, 0x12, 0xef, 0x48, + 0x48, 0x7c, 0x0a, 0x1e, 0x79, 0x42, 0x73, 0xd9, 0xf5, 0xa5, 0x4e, 0x9a, 0x06, 0x2a, 0x84, 0xe0, + 0x6d, 0xe7, 0x9c, 0xe3, 0x33, 0x73, 0x7e, 0xbf, 0x73, 0x99, 0x31, 0xcc, 0x07, 0x31, 0x27, 0x34, + 0xc6, 0xe1, 0x72, 0x4a, 0x13, 0x9e, 0xa0, 0x33, 0x51, 0x10, 0x3e, 0xee, 0x33, 0xb5, 0x5a, 0xce, + 0x94, 0xe7, 0xad, 0x4e, 0x12, 0x45, 0x49, 0xac, 0xc4, 0xce, 0xb7, 0x06, 0xcc, 0xad, 0x27, 0x51, + 0x9a, 0xc4, 0x24, 0xe6, 0xcd, 0x78, 0x37, 0x41, 0x67, 0x61, 0x36, 0x4e, 0x7c, 0xd2, 0x6c, 0xd8, + 0x46, 0xdd, 0x58, 0x2a, 0xba, 0x7a, 0x85, 0x10, 0x94, 0x68, 0x12, 0x12, 0xbb, 0x50, 0x37, 0x96, + 0xaa, 0xae, 0xfc, 0x46, 0x37, 0x00, 0x18, 0xc7, 0x9c, 0x78, 0x9d, 0xc4, 0x27, 0x76, 0xb1, 0x6e, + 0x2c, 0xcd, 0xaf, 0xd6, 0x97, 0xa7, 0xee, 0xbb, 0xdc, 0x12, 0x86, 0xeb, 0x89, 0x4f, 0xdc, 0x2a, + 0xcb, 0x3e, 0xd1, 0x4d, 0x00, 0xb2, 0xcf, 0x29, 0xf6, 0x82, 0x78, 0x37, 0xb1, 0x4b, 0xf5, 0xe2, + 0x92, 0xb9, 0x7a, 0x79, 0xdc, 0x81, 0x3e, 0xee, 0x5d, 0x32, 0x78, 0x80, 0xc3, 0x3e, 0xd9, 0xc6, + 0x01, 0x75, 0xab, 0xf2, 0x47, 0xe2, 0xb8, 0xce, 0x2f, 0x06, 0x9c, 0xc8, 0x03, 0x90, 0x7b, 0x30, + 0xf4, 0x1e, 0xcc, 0xc8, 0x2d, 0x64, 0x04, 0xe6, 0xea, 0xcb, 0x07, 0x9c, 0x68, 0x2c, 0x6e, 0x57, + 0xfd, 0x04, 0xdd, 0x87, 0x53, 0xac, 0xdf, 0xee, 0x64, 0x2a, 0x4f, 0x4a, 0x99, 0x5d, 0x90, 0x47, + 0x3b, 0x9a, 0x27, 0x34, 0xea, 0x40, 0x1f, 0xe9, 0x1a, 0xcc, 0x0a, 0x4f, 0x7d, 0x26, 0x51, 0x32, + 0x57, 0x2f, 0x4c, 0x0d, 0xb2, 0x25, 0x4d, 0x5c, 0x6d, 0xea, 0x5c, 0x80, 0x85, 0x0d, 0xc2, 0x27, + 0xa2, 0x73, 0xc9, 0xc7, 0x7d, 0xc2, 0xb8, 0x56, 0xee, 0x04, 0x11, 0xd9, 0x09, 0x3a, 0x8f, 0xd6, + 0x7b, 0x38, 0x8e, 0x49, 0x98, 0x29, 0x2f, 0xc2, 0x85, 0x0d, 0x22, 0x7f, 0x10, 0x30, 0x1e, 0x74, + 0xd8, 0x84, 0xfa, 0x0c, 0x9c, 0xda, 0x20, 0xbc, 0xe1, 0x4f, 0x88, 0x1f, 0x40, 0x65, 0x4b, 0x90, + 0x2d, 0xd2, 0xe0, 0x1d, 0x28, 0x63, 0xdf, 0xa7, 0x84, 0x31, 0x8d, 0xe2, 0xe2, 0xd4, 0x13, 0xdf, + 0x52, 0x36, 0x6e, 0x66, 0x3c, 0x2d, 0x4d, 0x9c, 0x87, 0x00, 0xcd, 0x38, 0xe0, 0xdb, 0x98, 0xe2, + 0x88, 0x1d, 0x98, 0x60, 0x0d, 0xb0, 0x18, 0xc7, 0x94, 0x7b, 0xa9, 0xb4, 0xd3, 0x90, 0x1f, 0x21, + 0x1b, 0x4c, 0xf9, 0x33, 0xe5, 0xdd, 0xf9, 0x10, 0xa0, 0xc5, 0x69, 0x10, 0x77, 0xef, 0x05, 0x8c, + 0x8b, 0xbd, 0x1e, 0x0b, 0x3b, 0x11, 0x44, 0x71, 0xa9, 0xea, 0xea, 0xd5, 0x08, 0x1d, 0x85, 0xa3, + 0xd3, 0x71, 0x03, 0xcc, 0x0c, 0xee, 0x4d, 0xd6, 0x45, 0x57, 0xa1, 0xd4, 0xc6, 0x8c, 0x1c, 0x0a, + 0xcf, 0x26, 0xeb, 0xae, 0x61, 0x46, 0x5c, 0x69, 0xe9, 0xfc, 0x6a, 0xc0, 0xb9, 0x75, 0x4a, 0x64, + 0xf2, 0x87, 0x21, 0xe9, 0xf0, 0x20, 0x89, 0x35, 0xf6, 0xcf, 0xef, 0x0d, 0x9d, 0x83, 0xb2, 0xdf, + 0xf6, 0x62, 0x1c, 0x65, 0x60, 0xcf, 0xfa, 0xed, 0x2d, 0x1c, 0x11, 0xf4, 0x2a, 0xcc, 0x77, 0x72, + 0xff, 0x42, 0x22, 0x73, 0xae, 0xea, 0x4e, 0x48, 0x05, 0x55, 0x7e, 0xbb, 0xd9, 0xb0, 0x4b, 0x92, + 0x06, 0xf9, 0x8d, 0x1c, 0xb0, 0x86, 0x56, 0xcd, 0x86, 0x3d, 0x23, 0x75, 0x63, 0x32, 0x01, 0x2a, + 0xeb, 0xf4, 0x48, 0x84, 0xed, 0xd9, 0xba, 0xb1, 0x64, 0xb9, 0x7a, 0xe5, 0xfc, 0x60, 0xc0, 0x99, + 0x06, 0x4d, 0xd2, 0x7f, 0x72, 0x70, 0xce, 0xe7, 0x05, 0x38, 0xab, 0x38, 0xda, 0xc6, 0x94, 0x07, + 0x2f, 0x28, 0x8a, 0xd7, 0xe0, 0xc4, 0x70, 0x57, 0x65, 0x30, 0x3d, 0x8c, 0x57, 0x60, 0x3e, 0xcd, + 0xce, 0xa1, 0xec, 0x4a, 0xd2, 0x6e, 0x2e, 0x97, 0x8e, 0x45, 0x3b, 0x73, 0x48, 0xb4, 0xb3, 0x53, + 0xa8, 0xac, 0x83, 0x99, 0x3b, 0x6a, 0x36, 0xec, 0xb2, 0x34, 0x19, 0x15, 0x39, 0x9f, 0x15, 0xe0, + 0xb4, 0x20, 0xf5, 0x3f, 0x34, 0x04, 0x1a, 0xdf, 0x15, 0x00, 0xa9, 0xec, 0x68, 0xc6, 0x3e, 0xd9, + 0xff, 0x3b, 0xb1, 0xb8, 0x08, 0xb0, 0x1b, 0x90, 0xd0, 0x1f, 0xc5, 0xa1, 0x2a, 0x25, 0x7f, 0x0a, + 0x03, 0x1b, 0xca, 0xd2, 0x49, 0x1e, 0x7f, 0xb6, 0x14, 0xfd, 0x59, 0xcd, 0x6a, 0xdd, 0x9f, 0x2b, + 0x47, 0xee, 0xcf, 0xf2, 0x67, 0xba, 0x3f, 0x7f, 0x53, 0x84, 0xb9, 0x66, 0xcc, 0x08, 0xe5, 0xff, + 0xe6, 0x44, 0x42, 0x8b, 0x50, 0x65, 0xa4, 0x1b, 0x89, 0x2b, 0x43, 0xc3, 0xae, 0x48, 0xfd, 0x50, + 0x20, 0xb4, 0x1d, 0x35, 0x9a, 0x9b, 0x0d, 0xbb, 0xaa, 0xa8, 0xcd, 0x05, 0xe8, 0xff, 0x00, 0x3c, + 0x88, 0x08, 0xe3, 0x38, 0x4a, 0x99, 0x0d, 0xf5, 0xe2, 0x52, 0xc9, 0x1d, 0x91, 0x88, 0xfe, 0x4c, + 0x93, 0xbd, 0x66, 0x83, 0xd9, 0x66, 0xbd, 0x28, 0x06, 0xac, 0x5a, 0xa1, 0xb7, 0xa0, 0x42, 0x93, + 0x3d, 0xcf, 0xc7, 0x1c, 0xdb, 0x96, 0x24, 0x6f, 0x61, 0x2a, 0xd8, 0x6b, 0x61, 0xd2, 0x76, 0xcb, + 0x34, 0xd9, 0x6b, 0x60, 0x8e, 0x9d, 0xdf, 0x0a, 0x30, 0xd7, 0x22, 0x98, 0x76, 0x7a, 0xc7, 0x27, + 0xec, 0x75, 0xa8, 0x51, 0xc2, 0xfa, 0x21, 0xf7, 0x86, 0x61, 0x29, 0xe6, 0x4e, 0x28, 0xf9, 0x7a, + 0x1e, 0x5c, 0x06, 0x79, 0xf1, 0x10, 0xc8, 0x4b, 0x53, 0x20, 0x77, 0xc0, 0x1a, 0xc1, 0x97, 0xd9, + 0x33, 0x32, 0xf4, 0x31, 0x19, 0xaa, 0x41, 0xd1, 0x67, 0xa1, 0x64, 0xac, 0xea, 0x8a, 0x4f, 0x74, + 0x05, 0x4e, 0xa6, 0x21, 0xee, 0x90, 0x5e, 0x12, 0xfa, 0x84, 0x7a, 0x5d, 0x9a, 0xf4, 0x53, 0x49, + 0x97, 0xe5, 0xd6, 0x46, 0x14, 0x1b, 0x42, 0x8e, 0xae, 0x43, 0xc5, 0x67, 0xa1, 0xc7, 0x07, 0x29, + 0x91, 0x94, 0xcd, 0x1f, 0x10, 0x7b, 0x83, 0x85, 0x3b, 0x83, 0x94, 0xb8, 0x65, 0x5f, 0x7d, 0xa0, + 0xab, 0x70, 0x9a, 0x11, 0x1a, 0xe0, 0x30, 0x78, 0x42, 0x7c, 0x8f, 0xec, 0xa7, 0xd4, 0x4b, 0x43, + 0x1c, 0x4b, 0x66, 0x2d, 0x17, 0x0d, 0x75, 0xb7, 0xf7, 0x53, 0xba, 0x1d, 0xe2, 0xd8, 0xf9, 0xd9, + 0x18, 0x82, 0x2e, 0xf0, 0x61, 0xc7, 0x00, 0xfd, 0x38, 0x77, 0x9c, 0xa9, 0x4c, 0x15, 0xa7, 0x33, + 0x75, 0x09, 0xcc, 0x88, 0x70, 0x1a, 0x74, 0x14, 0x22, 0xaa, 0x80, 0x40, 0x89, 0x64, 0xd8, 0x08, + 0x4a, 0xbd, 0x80, 0x2b, 0x2a, 0x2c, 0x57, 0x7e, 0x3b, 0x3f, 0x19, 0x30, 0xd7, 0x20, 0x21, 0xe1, + 0xe4, 0xf8, 0xd9, 0x34, 0xa5, 0xca, 0x0b, 0x53, 0xab, 0x7c, 0xac, 0x8c, 0x8a, 0x87, 0x97, 0x51, + 0xe9, 0xa9, 0x32, 0xba, 0x0c, 0x56, 0x4a, 0x83, 0x08, 0xd3, 0x81, 0xf7, 0x88, 0x0c, 0xb2, 0x8c, + 0x32, 0xb5, 0xec, 0x2e, 0x19, 0x30, 0xe7, 0x6b, 0x03, 0x2a, 0x77, 0xc2, 0x3e, 0xeb, 0x1d, 0xeb, + 0x3e, 0x38, 0xde, 0x04, 0x0a, 0x93, 0x4d, 0x60, 0x32, 0xeb, 0x8b, 0xcf, 0xc8, 0xfa, 0x1d, 0xdc, + 0xd5, 0x24, 0x8c, 0xc9, 0x9c, 0xdf, 0x0d, 0xa8, 0xde, 0x4b, 0xb0, 0x2f, 0x27, 0xd6, 0x5f, 0x7e, + 0xca, 0x45, 0x18, 0x0e, 0x9d, 0x0c, 0xe3, 0xe1, 0x14, 0x1a, 0x99, 0x26, 0xa5, 0xf1, 0x69, 0x72, + 0x09, 0xcc, 0x40, 0x1c, 0xc8, 0x4b, 0x31, 0xef, 0x29, 0x70, 0xab, 0x2e, 0x48, 0xd1, 0xb6, 0x90, + 0x88, 0x71, 0x93, 0x19, 0xc8, 0x71, 0x33, 0x7b, 0xe4, 0x71, 0xa3, 0x9d, 0xc8, 0x71, 0xf3, 0x7d, + 0x01, 0xec, 0x96, 0x3a, 0xec, 0xf0, 0x35, 0x74, 0x3f, 0xf5, 0xe5, 0xa3, 0x6c, 0x11, 0xaa, 0xad, + 0x3c, 0x32, 0xf5, 0x18, 0x19, 0x0a, 0x44, 0x7e, 0x6c, 0x92, 0x28, 0xa1, 0x83, 0x56, 0xf0, 0x84, + 0xe8, 0xc0, 0x47, 0x24, 0x22, 0xb6, 0xad, 0x7e, 0xe4, 0x26, 0x7b, 0x4c, 0x53, 0x93, 0x2d, 0x45, + 0x6c, 0x1d, 0x79, 0x49, 0xf0, 0x44, 0x3a, 0xc9, 0xc8, 0x4b, 0x2e, 0x28, 0x91, 0x78, 0x41, 0xa0, + 0x05, 0xa8, 0x90, 0xd8, 0x57, 0xda, 0x19, 0xa9, 0x2d, 0x93, 0xd8, 0x97, 0xaa, 0x26, 0xcc, 0xeb, + 0x57, 0x50, 0xc2, 0x24, 0x85, 0xb2, 0x5d, 0x99, 0xab, 0xce, 0x01, 0x4f, 0xcf, 0x4d, 0xd6, 0xdd, + 0xd6, 0x96, 0xee, 0x9c, 0x7a, 0x08, 0xe9, 0x25, 0xba, 0x0d, 0x96, 0xd8, 0x25, 0x77, 0x54, 0x3e, + 0xb2, 0x23, 0x93, 0xc4, 0x7e, 0xb6, 0x70, 0xbe, 0x34, 0xe0, 0xe4, 0x53, 0x10, 0x1e, 0x23, 0x8f, + 0xee, 0x42, 0xa5, 0x45, 0xba, 0xc2, 0x45, 0xf6, 0xb6, 0x5b, 0x39, 0xe8, 0xaf, 0x82, 0x03, 0x08, + 0x73, 0x73, 0x07, 0xce, 0xc3, 0x9c, 0x56, 0x59, 0x7f, 0xe2, 0x8d, 0x2c, 0x9a, 0x8a, 0xff, 0x02, + 0x0a, 0xd1, 0xf9, 0xd4, 0x10, 0xef, 0x57, 0x9f, 0xec, 0xcb, 0xad, 0x9f, 0x4a, 0x4c, 0xe3, 0x38, + 0x89, 0x29, 0x66, 0x42, 0xdc, 0x8f, 0x3c, 0x4a, 0x42, 0xcc, 0x89, 0xef, 0xe9, 0xdd, 0x98, 0xde, + 0x1d, 0xc5, 0xfd, 0xc8, 0x55, 0x2a, 0x1d, 0x26, 0x73, 0xbe, 0x30, 0x00, 0xee, 0x88, 0xea, 0x51, + 0xc7, 0x98, 0x6c, 0x0f, 0xc6, 0xe1, 0x97, 0xb9, 0xc2, 0x78, 0xf9, 0xad, 0x65, 0xe5, 0xc7, 0x24, + 0x1f, 0xc5, 0x69, 0x31, 0xe4, 0x7c, 0x0c, 0x83, 0xd7, 0x15, 0xaa, 0x38, 0xf8, 0xca, 0x00, 0x6b, + 0x84, 0x2a, 0x36, 0x0e, 0xa3, 0x31, 0xd9, 0x29, 0xe4, 0xbc, 0x10, 0xd5, 0xe3, 0xb1, 0x91, 0x82, + 0x8a, 0x86, 0x05, 0xb5, 0x00, 0x15, 0x09, 0xc9, 0x48, 0x45, 0xc5, 0xba, 0xa2, 0xae, 0xc0, 0x49, + 0x4a, 0x3a, 0x24, 0xe6, 0xe1, 0xc0, 0x8b, 0x12, 0x3f, 0xd8, 0x0d, 0x88, 0x2f, 0xeb, 0xaa, 0xe2, + 0xd6, 0x32, 0xc5, 0xa6, 0x96, 0x3b, 0x3f, 0x1a, 0x30, 0xff, 0x41, 0x9f, 0xd0, 0xc1, 0x56, 0xe2, + 0x13, 0x75, 0xb2, 0xe7, 0x4f, 0x89, 0x9b, 0x32, 0x16, 0x0d, 0x8f, 0x4a, 0xd7, 0x97, 0x9e, 0x9d, + 0xae, 0xcc, 0xad, 0x30, 0x9d, 0xa2, 0x02, 0x62, 0x75, 0x41, 0x3f, 0x0a, 0xc4, 0x43, 0x62, 0x5d, + 0x75, 0xad, 0x57, 0x10, 0x7f, 0x62, 0x80, 0x39, 0x52, 0x98, 0x62, 0x26, 0xe9, 0x01, 0xa6, 0xe6, + 0x9e, 0x21, 0x1b, 0xae, 0xa9, 0x65, 0xb2, 0xe5, 0x9e, 0x86, 0x99, 0x88, 0x75, 0x35, 0xe3, 0x96, + 0xab, 0x16, 0xe8, 0x3c, 0x54, 0x22, 0xd6, 0x95, 0xf7, 0x18, 0xdd, 0xa5, 0xf3, 0xb5, 0xa0, 0x2d, + 0x1f, 0x7b, 0xba, 0x59, 0x0d, 0x05, 0x6f, 0xbc, 0x0b, 0xd5, 0xfc, 0xaf, 0x3b, 0x54, 0x03, 0xab, + 0x19, 0x07, 0x5c, 0x5e, 0x57, 0x82, 0xb8, 0x5b, 0xfb, 0x1f, 0x32, 0xa1, 0xfc, 0x3e, 0xc1, 0x21, + 0xef, 0x0d, 0x6a, 0x06, 0xb2, 0xa0, 0x72, 0xab, 0x1d, 0x27, 0x34, 0xc2, 0x61, 0xad, 0xb0, 0x76, + 0xfd, 0xa3, 0xb7, 0xbb, 0x01, 0xef, 0xf5, 0xdb, 0x02, 0xe1, 0x15, 0x15, 0xf7, 0x9b, 0x41, 0xa2, + 0xbf, 0x56, 0xb2, 0xd8, 0x57, 0x24, 0x14, 0xf9, 0x32, 0x6d, 0xb7, 0x67, 0xa5, 0xe4, 0xda, 0x1f, + 0x01, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xcf, 0xed, 0x82, 0xd2, 0x14, 0x00, 0x00, } diff --git a/internal/proxynode/task.go b/internal/proxynode/task.go index bc48563e7e..0859bfaf89 100644 --- a/internal/proxynode/task.go +++ b/internal/proxynode/task.go @@ -605,7 +605,10 @@ func (st *SearchTask) PreExecute(ctx context.Context) error { } st.SearchRequest.DslType = commonpb.DslType_BoolExprV1 - st.SearchRequest.SerializedExprPlan = proto.MarshalTextString(plan) + st.SearchRequest.SerializedExprPlan, err = proto.Marshal(plan) + if err != nil { + return err + } } st.SearchRequest.ResultChannelID = Params.SearchResultChannelNames[0] diff --git a/internal/querynode/plan.go b/internal/querynode/plan.go index 5bfa627342..29858b775d 100644 --- a/internal/querynode/plan.go +++ b/internal/querynode/plan.go @@ -45,11 +45,9 @@ func createPlan(col Collection, dsl string) (*Plan, error) { return newPlan, nil } -func createPlanByExpr(col Collection, expr string) (*Plan, error) { - cExpr := C.CString(expr) - defer C.free(unsafe.Pointer(cExpr)) +func createPlanByExpr(col Collection, expr []byte) (*Plan, error) { var cPlan C.CPlan - status := C.CreatePlanByExpr(col.collectionPtr, cExpr, &cPlan) + status := C.CreatePlanByExpr(col.collectionPtr, (*C.char)(unsafe.Pointer(&expr[0])), (C.int64_t)(len(expr)), &cPlan) err1 := HandleCStatus(&status, "Create Plan by expr failed") if err1 != nil {