Revert "Enhancement/optimize edge all predicate (vesoft-inc#2576)" (v…

…esoft-inc#2579)
yixinglu · Apr 10, 2023 · 3a9df7c · 3a9df7c
1 parent 087b3b0
commit 3a9df7c
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 671 deletions.
diff --git a/src/graph/executor/query/TraverseExecutor.cpp b/src/graph/executor/query/TraverseExecutor.cpp
@@ -62,12 +62,8 @@ Status TraverseExecutor::buildRequestVids() {
     auto vidType = SchemaUtil::propTypeToValueType(metaVidType.get_type());
     for (; iter->valid(); iter->next()) {
       const auto& vid = src->eval(ctx(iter));
-      // FIXME(czp): Remove this DCHECK for now, we should check vid type at compile-time
-      if (vid.type() != vidType) {
-        return Status::Error("Vid type mismatched.");
-      }
-      // DCHECK_EQ(vid.type(), vidType)
-      //     << "Mismatched vid type: " << vid.type() << ", space vid type: " << vidType;
+      DCHECK_EQ(vid.type(), vidType)
+          << "Mismatched vid type: " << vid.type() << ", space vid type: " << vidType;
       if (vid.type() == vidType) {
         vids_.emplace(vid);
       }

diff --git a/src/graph/optimizer/CMakeLists.txt b/src/graph/optimizer/CMakeLists.txt
@@ -35,7 +35,6 @@ nebula_add_library(
     rule/PushFilterDownInnerJoinRule.cpp
     rule/PushFilterDownNodeRule.cpp
     rule/PushFilterDownScanVerticesRule.cpp
-    rule/PushFilterDownTraverseRule.cpp
     rule/PushVFilterDownScanVerticesRule.cpp
     rule/OptimizeEdgeIndexScanByFilterRule.cpp
     rule/OptimizeTagIndexScanByFilterRule.cpp
@@ -61,9 +60,8 @@ nebula_add_library(
     rule/PushLimitDownTraverseRule.cpp
     rule/PushLimitDownAppendVerticesRule.cpp
     rule/PushLimitDownScanEdgesRule.cpp
-    rule/PushFilterThroughAppendVerticesRule.cpp
+    rule/PushFilterDownTraverseRule.cpp
     rule/RemoveAppendVerticesBelowJoinRule.cpp
-    rule/EmbedEdgeAllPredIntoTraverseRule.cpp
     rule/PushFilterThroughAppendVerticesRule.cpp
 )
 

diff --git a/src/graph/optimizer/rule/EmbedEdgeAllPredIntoTraverseRule.cpp b/src/graph/optimizer/rule/EmbedEdgeAllPredIntoTraverseRule.cpp
diff --git a/src/graph/optimizer/rule/EmbedEdgeAllPredIntoTraverseRule.h b/src/graph/optimizer/rule/EmbedEdgeAllPredIntoTraverseRule.h
diff --git a/src/graph/optimizer/rule/GeoPredicateIndexScanBaseRule.cpp b/src/graph/optimizer/rule/GeoPredicateIndexScanBaseRule.cpp
@@ -164,7 +164,7 @@ StatusOr<TransformResult> GeoPredicateIndexScanBaseRule::transform(
   }
   TransformResult result;
   result.newGroupNodes.emplace_back(optScanNode);
-  result.eraseAll = true;
+  result.eraseCurr = true;
   return result;
 }
 

diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
@@ -1038,11 +1038,6 @@ void ExpressionUtils::splitFilter(const Expression *expr,
 
   std::vector<Expression *> &operands = logicExpr->operands();
   for (auto &operand : operands) {
-    // TODO(czp): Sink all NOTs to second layer [[Refactor]]
-    // TODO(czp): If find any not, dont pick this operand for now
-    if (ExpressionUtils::findAny(operand, {Expression::Kind::kUnaryNot})) {
-      filterUnpickedPtr->addOperand(operand->clone());
-    }
     if (picker(operand)) {
       filterPickedPtr->addOperand(operand->clone());
     } else {
@@ -1708,40 +1703,5 @@ bool ExpressionUtils::isOneStepEdgeProp(const std::string &edgeAlias, const Expr
   return graph::RewriteVisitor::transform(expr, matcher, rewriter);
 }
 
-// Transform Label Tag property expression like $-.v.player.name to Tag property like player.name
-// for more friendly to push down
-// \param pool object pool to hold ownership of objects alloacted
-// \param node the name of node, i.e. v in pattern (v)
-// \param expr the filter expression
-/*static*/ Expression *ExpressionUtils::rewriteVertexPropertyFilter(ObjectPool *pool,
-                                                                    const std::string &node,
-                                                                    Expression *expr) {
-  graph::RewriteVisitor::Matcher matcher = [&node](const Expression *e) -> bool {
-    if (e->kind() != Expression::Kind::kLabelTagProperty) {
-      return false;
-    }
-    auto *ltpExpr = static_cast<const LabelTagPropertyExpression *>(e);
-    auto *labelExpr = ltpExpr->label();
-    DCHECK(labelExpr->kind() == Expression::Kind::kInputProperty ||
-           labelExpr->kind() == Expression::Kind::kVarProperty);
-    if (labelExpr->kind() != Expression::Kind::kInputProperty &&
-        labelExpr->kind() != Expression::Kind::kVarProperty) {
-      return false;
-    }
-    auto *inputExpr = static_cast<const PropertyExpression *>(labelExpr);
-    if (inputExpr->prop() != node) {
-      return false;
-    }
-    return true;
-  };
-  graph::RewriteVisitor::Rewriter rewriter = [pool](const Expression *e) -> Expression * {
-    DCHECK_EQ(e->kind(), Expression::Kind::kLabelTagProperty);
-    auto *ltpExpr = static_cast<const LabelTagPropertyExpression *>(e);
-    auto *tagPropExpr = TagPropertyExpression::make(pool, ltpExpr->sym(), ltpExpr->prop());
-    return tagPropExpr;
-  };
-  return graph::RewriteVisitor::transform(expr, matcher, rewriter);
-}
-
 }  // namespace graph
 }  // namespace nebula
diff --git a/src/graph/util/ExpressionUtils.h b/src/graph/util/ExpressionUtils.h
@@ -259,10 +259,6 @@ class ExpressionUtils {
   static Expression* rewriteEdgePropertyFilter(ObjectPool* pool,
                                                const std::string& edgeAlias,
                                                Expression* expr);
-
-  static Expression* rewriteVertexPropertyFilter(ObjectPool* pool,
-                                                 const std::string& node,
-                                                 Expression* expr);
 };
 
 }  // namespace graph