From b90b4f20589ac5fb05bbc3880d3ba3606e665201 Mon Sep 17 00:00:00 2001 From: FluorineDog Date: Wed, 30 Jun 2021 10:18:26 +0800 Subject: [PATCH] renaming (#6192) Signed-off-by: fluorinedog --- internal/core/src/query/Expr.h | 8 ++++---- internal/core/src/query/Plan.cpp | 16 ++++++++-------- internal/core/src/query/PlanProto.cpp | 10 +++++----- .../core/src/query/generated/ExecExprVisitor.h | 4 ++-- internal/core/src/query/generated/Expr.cpp | 4 ++-- internal/core/src/query/generated/ExprVisitor.h | 4 ++-- .../src/query/generated/ExtractInfoExprVisitor.h | 4 ++-- .../core/src/query/generated/ShowExprVisitor.h | 8 ++++---- .../core/src/query/generated/VerifyExprVisitor.h | 4 ++-- .../core/src/query/visitors/ExecExprVisitor.cpp | 8 ++++---- .../query/visitors/ExtractInfoExprVisitor.cpp | 4 ++-- .../core/src/query/visitors/ShowExprVisitor.cpp | 12 ++++++------ .../src/query/visitors/VerifyExprVisitor.cpp | 4 ++-- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/internal/core/src/query/Expr.h b/internal/core/src/query/Expr.h index 54aacc513b..e76c7917af 100644 --- a/internal/core/src/query/Expr.h +++ b/internal/core/src/query/Expr.h @@ -31,16 +31,16 @@ struct Expr { using ExprPtr = std::unique_ptr; -struct BinaryExpr : Expr { +struct BinaryExprBase : Expr { ExprPtr left_; ExprPtr right_; }; -struct UnaryExpr : Expr { +struct UnaryExprBase : Expr { ExprPtr child_; }; -struct BoolUnaryExpr : UnaryExpr { +struct LogicalUnaryExpr : UnaryExprBase { enum class OpType { Invalid = 0, LogicalNot = 1 }; OpType op_type_; @@ -49,7 +49,7 @@ struct BoolUnaryExpr : UnaryExpr { accept(ExprVisitor&) override; }; -struct BoolBinaryExpr : BinaryExpr { +struct LogicalBinaryExpr : BinaryExprBase { // Note: bitA - bitB == bitA & ~bitB, alias to LogicalMinus enum class OpType { Invalid = 0, LogicalAnd = 1, LogicalOr = 2, LogicalXor = 3, LogicalMinus = 4 }; OpType op_type_; diff --git a/internal/core/src/query/Plan.cpp b/internal/core/src/query/Plan.cpp index ab581a9cfe..e6364f3993 100644 --- a/internal/core/src/query/Plan.cpp +++ b/internal/core/src/query/Plan.cpp @@ -422,8 +422,8 @@ ExprPtr Parser::ParseMustNode(const Json& body) { auto item_list = ParseItemList(body); auto merger = [](ExprPtr left, ExprPtr right) { - using OpType = BoolBinaryExpr::OpType; - auto res = std::make_unique(); + using OpType = LogicalBinaryExpr::OpType; + auto res = std::make_unique(); res->op_type_ = OpType::LogicalAnd; res->left_ = std::move(left); res->right_ = std::move(right); @@ -437,8 +437,8 @@ Parser::ParseShouldNode(const Json& body) { auto item_list = ParseItemList(body); Assert(item_list.size() >= 1); auto merger = [](ExprPtr left, ExprPtr right) { - using OpType = BoolBinaryExpr::OpType; - auto res = std::make_unique(); + using OpType = LogicalBinaryExpr::OpType; + auto res = std::make_unique(); res->op_type_ = OpType::LogicalOr; res->left_ = std::move(left); res->right_ = std::move(right); @@ -452,8 +452,8 @@ Parser::ParseMustNotNode(const Json& body) { auto item_list = ParseItemList(body); Assert(item_list.size() >= 1); auto merger = [](ExprPtr left, ExprPtr right) { - using OpType = BoolBinaryExpr::OpType; - auto res = std::make_unique(); + using OpType = LogicalBinaryExpr::OpType; + auto res = std::make_unique(); res->op_type_ = OpType::LogicalAnd; res->left_ = std::move(left); res->right_ = std::move(right); @@ -461,8 +461,8 @@ Parser::ParseMustNotNode(const Json& body) { }; auto subtree = ConstructTree(merger, std::move(item_list)); - using OpType = BoolUnaryExpr::OpType; - auto res = std::make_unique(); + using OpType = LogicalUnaryExpr::OpType; + auto res = std::make_unique(); res->op_type_ = OpType::LogicalNot; res->child_ = std::move(subtree); diff --git a/internal/core/src/query/PlanProto.cpp b/internal/core/src/query/PlanProto.cpp index 9c22fb4765..2a871d32b0 100644 --- a/internal/core/src/query/PlanProto.cpp +++ b/internal/core/src/query/PlanProto.cpp @@ -216,10 +216,10 @@ ProtoParser::ParseTermExpr(const proto::plan::TermExpr& expr_pb) { ExprPtr ProtoParser::ParseUnaryExpr(const proto::plan::UnaryExpr& expr_pb) { - auto op = static_cast(expr_pb.op()); - Assert(op == BoolUnaryExpr::OpType::LogicalNot); + auto op = static_cast(expr_pb.op()); + Assert(op == LogicalUnaryExpr::OpType::LogicalNot); auto expr = this->ParseExpr(expr_pb.child()); - auto result = std::make_unique(); + auto result = std::make_unique(); result->child_ = std::move(expr); result->op_type_ = op; return result; @@ -227,10 +227,10 @@ ProtoParser::ParseUnaryExpr(const proto::plan::UnaryExpr& expr_pb) { ExprPtr ProtoParser::ParseBinaryExpr(const proto::plan::BinaryExpr& expr_pb) { - auto op = static_cast(expr_pb.op()); + auto op = static_cast(expr_pb.op()); auto left_expr = this->ParseExpr(expr_pb.left()); auto right_expr = this->ParseExpr(expr_pb.right()); - auto result = std::make_unique(); + auto result = std::make_unique(); result->op_type_ = op; result->left_ = std::move(left_expr); result->right_ = std::move(right_expr); diff --git a/internal/core/src/query/generated/ExecExprVisitor.h b/internal/core/src/query/generated/ExecExprVisitor.h index 8f4b38f67f..4baaff0e4b 100644 --- a/internal/core/src/query/generated/ExecExprVisitor.h +++ b/internal/core/src/query/generated/ExecExprVisitor.h @@ -24,10 +24,10 @@ namespace milvus::query { class ExecExprVisitor : public ExprVisitor { public: void - visit(BoolUnaryExpr& expr) override; + visit(LogicalUnaryExpr& expr) override; void - visit(BoolBinaryExpr& expr) override; + visit(LogicalBinaryExpr& expr) override; void visit(TermExpr& expr) override; diff --git a/internal/core/src/query/generated/Expr.cpp b/internal/core/src/query/generated/Expr.cpp index 4da3c4d385..401fb932bb 100644 --- a/internal/core/src/query/generated/Expr.cpp +++ b/internal/core/src/query/generated/Expr.cpp @@ -16,12 +16,12 @@ namespace milvus::query { void -BoolUnaryExpr::accept(ExprVisitor& visitor) { +LogicalUnaryExpr::accept(ExprVisitor& visitor) { visitor.visit(*this); } void -BoolBinaryExpr::accept(ExprVisitor& visitor) { +LogicalBinaryExpr::accept(ExprVisitor& visitor) { visitor.visit(*this); } diff --git a/internal/core/src/query/generated/ExprVisitor.h b/internal/core/src/query/generated/ExprVisitor.h index 3417270875..5b8d6cf403 100644 --- a/internal/core/src/query/generated/ExprVisitor.h +++ b/internal/core/src/query/generated/ExprVisitor.h @@ -20,10 +20,10 @@ class ExprVisitor { public: virtual void - visit(BoolUnaryExpr&) = 0; + visit(LogicalUnaryExpr&) = 0; virtual void - visit(BoolBinaryExpr&) = 0; + visit(LogicalBinaryExpr&) = 0; virtual void visit(TermExpr&) = 0; diff --git a/internal/core/src/query/generated/ExtractInfoExprVisitor.h b/internal/core/src/query/generated/ExtractInfoExprVisitor.h index 20b429cd8a..ca3cadfa17 100644 --- a/internal/core/src/query/generated/ExtractInfoExprVisitor.h +++ b/internal/core/src/query/generated/ExtractInfoExprVisitor.h @@ -19,10 +19,10 @@ namespace milvus::query { class ExtractInfoExprVisitor : public ExprVisitor { public: void - visit(BoolUnaryExpr& expr) override; + visit(LogicalUnaryExpr& expr) override; void - visit(BoolBinaryExpr& expr) override; + visit(LogicalBinaryExpr& expr) override; void visit(TermExpr& expr) override; diff --git a/internal/core/src/query/generated/ShowExprVisitor.h b/internal/core/src/query/generated/ShowExprVisitor.h index 035fed5818..44142a3f03 100644 --- a/internal/core/src/query/generated/ShowExprVisitor.h +++ b/internal/core/src/query/generated/ShowExprVisitor.h @@ -22,10 +22,10 @@ namespace milvus::query { class ShowExprVisitor : public ExprVisitor { public: void - visit(BoolUnaryExpr& expr) override; + visit(LogicalUnaryExpr& expr) override; void - visit(BoolBinaryExpr& expr) override; + visit(LogicalBinaryExpr& expr) override; void visit(TermExpr& expr) override; @@ -48,14 +48,14 @@ class ShowExprVisitor : public ExprVisitor { } Json - combine(Json&& extra, UnaryExpr& expr) { + combine(Json&& extra, UnaryExprBase& expr) { auto result = std::move(extra); result["child"] = call_child(*expr.child_); return result; } Json - combine(Json&& extra, BinaryExpr& expr) { + combine(Json&& extra, BinaryExprBase& expr) { auto result = std::move(extra); result["left_child"] = call_child(*expr.left_); result["right_child"] = call_child(*expr.right_); diff --git a/internal/core/src/query/generated/VerifyExprVisitor.h b/internal/core/src/query/generated/VerifyExprVisitor.h index 940240c9b4..28b41ecb9e 100644 --- a/internal/core/src/query/generated/VerifyExprVisitor.h +++ b/internal/core/src/query/generated/VerifyExprVisitor.h @@ -24,10 +24,10 @@ namespace milvus::query { class VerifyExprVisitor : public ExprVisitor { public: void - visit(BoolUnaryExpr& expr) override; + visit(LogicalUnaryExpr& expr) override; void - visit(BoolBinaryExpr& expr) override; + visit(LogicalBinaryExpr& expr) override; void visit(TermExpr& expr) override; diff --git a/internal/core/src/query/visitors/ExecExprVisitor.cpp b/internal/core/src/query/visitors/ExecExprVisitor.cpp index b89a095a02..01844f543a 100644 --- a/internal/core/src/query/visitors/ExecExprVisitor.cpp +++ b/internal/core/src/query/visitors/ExecExprVisitor.cpp @@ -60,8 +60,8 @@ class ExecExprVisitor : ExprVisitor { #endif void -ExecExprVisitor::visit(BoolUnaryExpr& expr) { - using OpType = BoolUnaryExpr::OpType; +ExecExprVisitor::visit(LogicalUnaryExpr& expr) { + using OpType = LogicalUnaryExpr::OpType; auto vec = call_child(*expr.child_); RetType ret; for (int chunk_id = 0; chunk_id < vec.size(); ++chunk_id) { @@ -81,8 +81,8 @@ ExecExprVisitor::visit(BoolUnaryExpr& expr) { } void -ExecExprVisitor::visit(BoolBinaryExpr& expr) { - using OpType = BoolBinaryExpr::OpType; +ExecExprVisitor::visit(LogicalBinaryExpr& expr) { + using OpType = LogicalBinaryExpr::OpType; RetType ret; auto left = call_child(*expr.left_); auto right = call_child(*expr.right_); diff --git a/internal/core/src/query/visitors/ExtractInfoExprVisitor.cpp b/internal/core/src/query/visitors/ExtractInfoExprVisitor.cpp index 97e20c9185..2f63f369eb 100644 --- a/internal/core/src/query/visitors/ExtractInfoExprVisitor.cpp +++ b/internal/core/src/query/visitors/ExtractInfoExprVisitor.cpp @@ -29,12 +29,12 @@ class ExtractInfoExprVisitor : ExprVisitor { #endif void -ExtractInfoExprVisitor::visit(BoolUnaryExpr& expr) { +ExtractInfoExprVisitor::visit(LogicalUnaryExpr& expr) { expr.child_->accept(*this); } void -ExtractInfoExprVisitor::visit(BoolBinaryExpr& expr) { +ExtractInfoExprVisitor::visit(LogicalBinaryExpr& expr) { expr.left_->accept(*this); expr.right_->accept(*this); } diff --git a/internal/core/src/query/visitors/ShowExprVisitor.cpp b/internal/core/src/query/visitors/ShowExprVisitor.cpp index 2ffcda312d..2a1d11ec1b 100644 --- a/internal/core/src/query/visitors/ShowExprVisitor.cpp +++ b/internal/core/src/query/visitors/ShowExprVisitor.cpp @@ -39,14 +39,14 @@ class ShowExprNodeVisitor : ExprVisitor { } Json - combine(Json&& extra, UnaryExpr& expr) { + combine(Json&& extra, UnaryExprBase& expr) { auto result = std::move(extra); result["child"] = call_child(*expr.child_); return result; } Json - combine(Json&& extra, BinaryExpr& expr) { + combine(Json&& extra, BinaryExprBase& expr) { auto result = std::move(extra); result["left_child"] = call_child(*expr.left_); result["right_child"] = call_child(*expr.right_); @@ -60,9 +60,9 @@ class ShowExprNodeVisitor : ExprVisitor { #endif void -ShowExprVisitor::visit(BoolUnaryExpr& expr) { +ShowExprVisitor::visit(LogicalUnaryExpr& expr) { Assert(!ret_.has_value()); - using OpType = BoolUnaryExpr::OpType; + using OpType = LogicalUnaryExpr::OpType; // TODO: use magic_enum if available Assert(expr.op_type_ == OpType::LogicalNot); @@ -76,9 +76,9 @@ ShowExprVisitor::visit(BoolUnaryExpr& expr) { } void -ShowExprVisitor::visit(BoolBinaryExpr& expr) { +ShowExprVisitor::visit(LogicalBinaryExpr& expr) { Assert(!ret_.has_value()); - using OpType = BoolBinaryExpr::OpType; + using OpType = LogicalBinaryExpr::OpType; // TODO: use magic_enum if available auto op_name = [](OpType op) { diff --git a/internal/core/src/query/visitors/VerifyExprVisitor.cpp b/internal/core/src/query/visitors/VerifyExprVisitor.cpp index 9b3326c74a..c2661a67cb 100644 --- a/internal/core/src/query/visitors/VerifyExprVisitor.cpp +++ b/internal/core/src/query/visitors/VerifyExprVisitor.cpp @@ -13,12 +13,12 @@ namespace milvus::query { void -VerifyExprVisitor::visit(BoolUnaryExpr& expr) { +VerifyExprVisitor::visit(LogicalUnaryExpr& expr) { // TODO } void -VerifyExprVisitor::visit(BoolBinaryExpr& expr) { +VerifyExprVisitor::visit(LogicalBinaryExpr& expr) { // TODO }