clean

kuzudb · Jun 21, 2023 · 56828dd · 56828dd
1 parent 08c550f
commit 56828dd
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 19 deletions.
diff --git a/src/include/optimizer/acc_hash_join_optimizer.h b/src/include/optimizer/acc_hash_join_optimizer.h
@@ -22,7 +22,7 @@ class HashJoinSIPOptimizer : public LogicalOperatorVisitor {
 
     void visitIntersect(planner::LogicalOperator* op) override;
 
-    void visitPathPropertyProbe(planner::LogicalOperator *op) override;
+    void visitPathPropertyProbe(planner::LogicalOperator* op) override;
 
     bool isProbeSideQualified(planner::LogicalOperator* probeRoot);
 

diff --git a/src/include/optimizer/projection_push_down_optimizer.h b/src/include/optimizer/projection_push_down_optimizer.h
@@ -19,7 +19,7 @@ class ProjectionPushDownOptimizer : public LogicalOperatorVisitor {
 private:
     void visitOperator(planner::LogicalOperator* op);
 
-    void visitPathPropertyProbe(planner::LogicalOperator *op) override;
+    void visitPathPropertyProbe(planner::LogicalOperator* op) override;
     void visitExtend(planner::LogicalOperator* op) override;
     void visitAccumulate(planner::LogicalOperator* op) override;
     void visitFilter(planner::LogicalOperator* op) override;

diff --git a/src/include/planner/logical_plan/logical_operator/logical_semi_masker.h b/src/include/planner/logical_plan/logical_operator/logical_semi_masker.h
@@ -30,7 +30,7 @@ class LogicalSemiMasker : public LogicalOperator {
     inline std::vector<LogicalOperator*> getOperators() const { return ops; }
 
     inline std::unique_ptr<LogicalOperator> copy() override {
-        assert(false);
+        throw common::RuntimeException("LogicalSemiMasker::copy() should not be called.");
     }
 
 private:

diff --git a/src/include/processor/operator/semi_masker.h b/src/include/processor/operator/semi_masker.h
@@ -100,7 +100,7 @@ class PathSingleTableSemiMasker : public PathSemiMasker {
         std::unique_ptr<PhysicalOperator> child, uint32_t id, const std::string& paramsString)
         : PathSemiMasker{std::move(info), std::move(child), id, paramsString} {}
 
-    bool getNextTuplesInternal(ExecutionContext *context) override;
+    bool getNextTuplesInternal(ExecutionContext* context) final;
 
     inline std::unique_ptr<PhysicalOperator> clone() final {
         return std::make_unique<PathSingleTableSemiMasker>(
@@ -114,7 +114,7 @@ class PathMultipleTableSemiMasker : public PathSemiMasker {
         std::unique_ptr<PhysicalOperator> child, uint32_t id, const std::string& paramsString)
         : PathSemiMasker{std::move(info), std::move(child), id, paramsString} {}
 
-    bool getNextTuplesInternal(ExecutionContext *context) override;
+    bool getNextTuplesInternal(ExecutionContext* context) final;
 
     inline std::unique_ptr<PhysicalOperator> clone() final {
         return std::make_unique<PathMultipleTableSemiMasker>(

diff --git a/src/optimizer/acc_hash_join_optimizer.cpp b/src/optimizer/acc_hash_join_optimizer.cpp
@@ -128,7 +128,7 @@ void HashJoinSIPOptimizer::visitPathPropertyProbe(planner::LogicalOperator* op)
     if (pathPropertyProbe->getSIP() == planner::SidewaysInfoPassing::PROHIBIT_PROBE_TO_BUILD) {
         return;
     }
-    if (pathPropertyProbe->getNumChildren() == 1) { // No
+    if (pathPropertyProbe->getNumChildren() == 1) { // No path being tracked.
         return;
     }
     auto recursiveRel = pathPropertyProbe->getRel();

diff --git a/src/optimizer/logical_operator_visitor.cpp b/src/optimizer/logical_operator_visitor.cpp
@@ -24,7 +24,7 @@ void LogicalOperatorVisitor::visitOperatorSwitch(planner::LogicalOperator* op) {
     } break;
     case LogicalOperatorType::PATH_PROPERTY_PROBE: {
         visitPathPropertyProbe(op);
-    } break ;
+    } break;
     case LogicalOperatorType::HASH_JOIN: {
         visitHashJoin(op);
     } break;

diff --git a/src/optimizer/projection_push_down_optimizer.cpp b/src/optimizer/projection_push_down_optimizer.cpp
@@ -48,6 +48,7 @@ void ProjectionPushDownOptimizer::visitPathPropertyProbe(planner::LogicalOperato
     auto recursiveInfo = rel->getRecursiveInfo();
     if (!variablesInUse.contains(rel)) {
         recursiveExtend->setJoinType(planner::RecursiveJoinType::TRACK_NONE);
+        // TODO(Xiyang): we should remove pathPropertyProbe if we don't need to track path
         pathPropertyProbe->setChildren(
             std::vector<std::shared_ptr<LogicalOperator>>{pathPropertyProbe->getChild(0)});
     } else {

diff --git a/src/planner/join_order/append_extend.cpp b/src/planner/join_order/append_extend.cpp
@@ -82,7 +82,7 @@ void JoinOrderEnumerator::appendRecursiveExtend(std::shared_ptr<NodeExpression>
     // Update cardinality
     auto hasAtMostOneNbr = extendHasAtMostOneNbrGuarantee(*rel, *boundNode, direction, catalog);
     if (!hasAtMostOneNbr) {
-        auto group = extend->getSchema()->getGroup(nbrNode->getInternalIDProperty());
+        auto group = pathPropertyProbe->getSchema()->getGroup(nbrNode->getInternalIDProperty());
         group->setMultiplier(extensionRate);
     }
     plan.setLastOperator(std::move(pathPropertyProbe));

diff --git a/src/planner/join_order/append_join.cpp b/src/planner/join_order/append_join.cpp
@@ -85,4 +85,4 @@ void JoinOrderEnumerator::appendIntersect(const std::shared_ptr<Expression>& int
 }
 
 } // namespace planner
-} // namespace kuzu
+} // namespace kuzu
diff --git a/src/processor/mapper/map_path_property_probe.cpp b/src/processor/mapper/map_path_property_probe.cpp
@@ -62,7 +62,7 @@ std::unique_ptr<PhysicalOperator> PlanMapper::mapLogicalPathPropertyProbeToPhysi
     auto relBuild = std::make_unique<HashJoinBuild>(
         std::make_unique<ResultSetDescriptor>(relBuildSchema), relBuildSharedState,
         std::move(relBuildInfo), std::move(relBuildPrvOperator), getOperatorID(), "");
-    // Map recursive join
+    // Map child
     auto prevOperator = mapLogicalOperatorToPhysical(logicalOperator->getChild(0));
     // Map probe
     auto relDataType = rel->getDataType();
@@ -90,4 +90,4 @@ std::unique_ptr<PhysicalOperator> PlanMapper::mapLogicalPathPropertyProbeToPhysi
 }
 
 } // namespace processor
-} // namespace kuzu
+} // namespace kuzu
diff --git a/src/processor/mapper/map_semi_masker.cpp b/src/processor/mapper/map_semi_masker.cpp
@@ -32,13 +32,6 @@ std::unique_ptr<PhysicalOperator> PlanMapper::mapLogicalSemiMaskerToPhysical(
                     tableState->getSemiMask(), 0 /* initial mask idx */);
             }
         } break;
-        case PhysicalOperatorType::PATH_PROPERTY_PROBE: {
-            auto recursiveJoin = (RecursiveJoin*)physicalOp->getChild(0);
-            for (auto& semiMask : recursiveJoin->getSharedState()->semiMasks) {
-                auto tableID = semiMask->getNodeTable()->getTableID();
-                masksPerTable.at(tableID).emplace_back(semiMask.get(), 0 /* initial mask idx */);
-            }
-        } break;
         case PhysicalOperatorType::RECURSIVE_JOIN: {
             auto recursiveJoin = (RecursiveJoin*)physicalOp;
             for (auto& semiMask : recursiveJoin->getSharedState()->semiMasks) {

diff --git a/src/processor/mapper/plan_mapper.cpp b/src/processor/mapper/plan_mapper.cpp
@@ -49,7 +49,7 @@ std::unique_ptr<PhysicalOperator> PlanMapper::mapLogicalOperatorToPhysical(
     } break;
     case LogicalOperatorType::PATH_PROPERTY_PROBE: {
         physicalOperator = mapLogicalPathPropertyProbeToPhysical(logicalOperator.get());
-    } break ;
+    } break;
     case LogicalOperatorType::FLATTEN: {
         physicalOperator = mapLogicalFlattenToPhysical(logicalOperator.get());
     } break;