Rebase.

vesoft-inc · Jun 7, 2022 · a018dc5 · a018dc5
1 parent 39fa479
commit a018dc5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/graph/executor/Executor.cpp b/src/graph/executor/Executor.cpp
@@ -547,7 +547,7 @@ Executor *Executor::makeExecutor(QueryContext *qctx, const PlanNode *node) {
       return pool->makeAndAdd<AlterSpaceExecutor>(node, qctx);
     }
     case PlanNode::Kind::kShortestPath: {
-      return pool->add(new ShortestPathExecutor(node, qctx));
+      return pool->makeAndAdd<ShortestPathExecutor>(node, qctx);
     }
     case PlanNode::Kind::kUnknown: {
       LOG(FATAL) << "Unknown plan node kind " << static_cast<int32_t>(node->kind());

diff --git a/src/graph/planner/plan/Algo.h b/src/graph/planner/plan/Algo.h
@@ -158,7 +158,7 @@ class ShortestPath final : public SingleInputNode {
                             PlanNode* node,
                             GraphSpaceID space,
                             bool singleShortest) {
-    return qctx->objPool()->add(new ShortestPath(qctx, node, space, singleShortest));
+    return qctx->objPool()->makeAndAdd<ShortestPath>(qctx, node, space, singleShortest);
   }
 
   PlanNode* clone() const override;
@@ -214,6 +214,7 @@ class ShortestPath final : public SingleInputNode {
   }
 
  private:
+  friend ObjectPool;
   ShortestPath(QueryContext* qctx, PlanNode* node, GraphSpaceID space, bool singleShortest)
       : SingleInputNode(qctx, Kind::kShortestPath, node),
         space_(space),