Push recursive join length into operator

kuzudb · May 20, 2023 · ac685e4 · ac685e4
1 parent d831e85
commit ac685e4
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/src/binder/bind_expression/bind_function_expression.cpp b/src/binder/bind_expression/bind_function_expression.cpp
@@ -237,7 +237,7 @@ std::unique_ptr<Expression> ExpressionBinder::createInternalLengthExpression(
 
 std::shared_ptr<Expression> ExpressionBinder::bindRecursiveJoinLengthFunction(
     const Expression& expression) {
-    if ( expression.getDataType().getLogicalTypeID() != common::LogicalTypeID::RECURSIVE_REL) {
+    if (expression.getDataType().getLogicalTypeID() != common::LogicalTypeID::RECURSIVE_REL) {
         return nullptr;
     }
     auto& rel = (RelExpression&)expression;

diff --git a/src/optimizer/projection_push_down_optimizer.cpp b/src/optimizer/projection_push_down_optimizer.cpp
@@ -214,8 +214,18 @@ binder::expression_vector ProjectionPushDownOptimizer::pruneExpressions(
     const binder::expression_vector& expressions) {
     expression_set expressionsAfterPruning;
     for (auto& expression : expressions) {
-        if (expression->expressionType != common::PROPERTY ||
-            propertiesInUse.contains(expression)) {
+        switch (expression->expressionType) {
+        case common::VARIABLE: {
+            if (variablesInUse.contains(expression)) {
+                expressionsAfterPruning.insert(expression);
+            }
+        } break;
+        case common::PROPERTY: {
+            if (propertiesInUse.contains(expression)) {
+                expressionsAfterPruning.insert(expression);
+            }
+        } break;
+        default: // We don't track other expression types so always assume they will be in use.
             expressionsAfterPruning.insert(expression);
         }
     }

diff --git a/src/planner/projection_planner.cpp b/src/planner/projection_planner.cpp
@@ -196,7 +196,8 @@ expression_vector ProjectionPlanner::rewriteExpressionsToProject(
             }
         } break;
         case LogicalTypeID::RECURSIVE_REL: {
-            // TODO
+            auto& rel = (RelExpression&)*expression;
+            result.push_back(rel.getInternalLengthExpression());
             result.push_back(expression);
         } break;
         default:

diff --git a/test/optimizer/optimizer_test.cpp b/test/optimizer/optimizer_test.cpp
@@ -1,4 +1,5 @@
 #include "graph_test/graph_test.h"
+#include "planner/logical_plan/logical_operator/logical_recursive_extend.h"
 #include "planner/logical_plan/logical_plan_util.h"
 
 namespace kuzu {
@@ -92,5 +93,14 @@ TEST_F(OptimizerTest, RecursiveJoinTest) {
     ASSERT_STREQ(encodedPlan.c_str(), "HJ(a._id){RE(a)S(b)}{S(a)}");
 }
 
+TEST_F(OptimizerTest, RecursiveJoinNoTrackPathTest) {
+    auto op = getRoot("MATCH (a:person)-[e:knows* SHORTEST 2..3]->(b:person) RETURN length(e);");
+    while (op->getOperatorType() != planner::LogicalOperatorType::RECURSIVE_EXTEND) {
+        op = op->getChild(0);
+    }
+    auto recursiveExtend = (planner::LogicalRecursiveExtend*)op.get();
+    ASSERT_FALSE(recursiveExtend->trackPath());
+}
+
 } // namespace testing
 } // namespace kuzu