Fix compile

vesoft-inc · Dec 3, 2022 · 32e9e65 · 32e9e65
1 parent 90e497b
commit 32e9e65
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 15 deletions.
diff --git a/src/graph/executor/query/InnerJoinExecutor.cpp b/src/graph/executor/query/InnerJoinExecutor.cpp
@@ -246,15 +246,15 @@ void InnerJoinExecutor::buildNewRow(const std::unordered_map<T, std::vector<cons
 
 const std::string& InnerJoinExecutor::leftVar() const {
  if (node_->kind() == PlanNode::Kind::kHashInnerJoin) {
- return node_->asNode<BiJoin>()->leftInputVar();
+ return node_->asNode<HashJoin>()->leftInputVar();
  } else {
  return node_->asNode<Join>()->leftVar().first;
  }
 }
 
 const std::string& InnerJoinExecutor::rightVar() const {
  if (node_->kind() == PlanNode::Kind::kHashInnerJoin) {
- return node_->asNode<BiJoin>()->rightInputVar();
+ return node_->asNode<HashJoin>()->rightInputVar();
  } else {
  return node_->asNode<Join>()->rightVar().first;
  }
@@ -267,7 +267,7 @@ HashInnerJoinExecutor::HashInnerJoinExecutor(const PlanNode* node, QueryContext*
 
 folly::Future<Status> HashInnerJoinExecutor::execute() {
  SCOPED_TIMER(&execTime_);
- auto* joinNode = asNode<BiJoin>(node());
+ auto* joinNode = asNode<HashJoin>(node());
  NG_RETURN_IF_ERROR(checkBiInputDataSets());
  return join(joinNode->hashKeys(), joinNode->probeKeys(), joinNode->colNames());
 }

diff --git a/src/graph/executor/query/JoinExecutor.cpp b/src/graph/executor/query/JoinExecutor.cpp
@@ -33,7 +33,7 @@ Status JoinExecutor::checkInputDataSets() {
 }
 
 Status JoinExecutor::checkBiInputDataSets() {
- auto* join = asNode<BiJoin>(node());
+ auto* join = asNode<HashJoin>(node());
  lhsIter_ = ectx_->getResult(join->leftInputVar()).iter();
  DCHECK(!!lhsIter_);
  if (lhsIter_->isGetNeighborsIter() || lhsIter_->isDefaultIter()) {

diff --git a/src/graph/executor/query/LeftJoinExecutor.cpp b/src/graph/executor/query/LeftJoinExecutor.cpp
@@ -228,7 +228,7 @@ HashLeftJoinExecutor::HashLeftJoinExecutor(const PlanNode* node, QueryContext* q
 
 folly::Future<Status> HashLeftJoinExecutor::execute() {
  SCOPED_TIMER(&execTime_);
- auto* joinNode = asNode<BiJoin>(node());
+ auto* joinNode = asNode<HashJoin>(node());
  auto& rhsResult = ectx_->getResult(joinNode->rightInputVar());
  rightColSize_ = rhsResult.valuePtr()->getDataSet().colNames.size();
  NG_RETURN_IF_ERROR(checkBiInputDataSets());

diff --git a/src/graph/planner/match/ShortestPathPlanner.cpp b/src/graph/planner/match/ShortestPathPlanner.cpp
@@ -30,7 +30,7 @@ namespace graph {
 // +------------+---------------+
 // |
 // +--------+---------+
-// |CrossJoin|
+// | CrossJoin |
 // +--------+---------+
 // |
 // +--------+---------+

diff --git a/src/graph/visitor/PrunePropertiesVisitor.cpp b/src/graph/visitor/PrunePropertiesVisitor.cpp
@@ -427,7 +427,7 @@ void PrunePropertiesVisitor::pruneCurrent(AppendVertices *node) {
  node->setVertexProps(std::move(prunedVertexProps));
 }
 
-void PrunePropertiesVisitor::visit(BiJoin *node) {
+void PrunePropertiesVisitor::visit(HashJoin *node) {
  status_ = depsPruneProperties(node->dependencies());
 }
 

diff --git a/src/graph/visitor/PrunePropertiesVisitor.h b/src/graph/visitor/PrunePropertiesVisitor.h
@@ -66,7 +66,7 @@ class PrunePropertiesVisitor final : public PlanNodeVisitor {
  // prune properties in AppendVertices according to the used properties collected previous
  void pruneCurrent(AppendVertices *node);
 
- void visit(BiJoin *node) override;
+ void visit(HashJoin *node) override;
 
  void visit(Union *node) override;
  void visit(CrossJoin *node) override;

diff --git a/tests/tck/features/optimizer/PrunePropertiesRule.feature b/tests/tck/features/optimizer/PrunePropertiesRule.feature