Implement the multi query parts of openCypher.

src/graph/context/Iterator.cpp

@@ -647,6 +647,20 @@ void SequentialIter::doReset(size_t pos) {
   iter_ = rows_->begin() + pos;
 }
 
+const Value& SequentialIter::getColumn(const std::string& col) const {
+  if (!valid()) {
+    return Value::kNullValue;
+  }
+  auto& row = *iter_;
+  auto index = colIndices_.find(col);
+  if (index == colIndices_.end()) {
+    return Value::kNullValue;
+  }
+
+  DCHECK_LT(index->second, row.values.size()) << "index: " << index->second << " row" << row;
+  return row.values[index->second];
+}
+
 const Value& SequentialIter::getColumn(int32_t index) const {
   return getColumnByIndex(index, iter_);
 }

src/graph/context/Iterator.h

@@ -465,19 +465,7 @@ class SequentialIter : public Iterator {
     return rows_->size();
   }
 
-  const Value& getColumn(const std::string& col) const override {
-    if (!valid()) {
-      return Value::kNullValue;
-    }
-    auto& row = *iter_;
-    auto index = colIndices_.find(col);
-    if (index == colIndices_.end()) {
-      return Value::kNullValue;
-    }
-
-    DCHECK_LT(index->second, row.values.size());
-    return row.values[index->second];
-  }
+  const Value& getColumn(const std::string& col) const override;
 
   const Value& getColumn(int32_t index) const override;
 

src/graph/context/Symbols.cpp

@@ -34,5 +34,103 @@ std::string SymbolTable::toString() const {
   return ss.str();
 }
 
+SymbolTable::SymbolTable(ObjectPool* objPool) {
+  DCHECK(objPool != nullptr);
+  objPool_ = objPool;
+}
+
+Variable* SymbolTable::newVariable(std::string name) {
+  VLOG(1) << "New variable for: " << name;
+  auto* variable = objPool_->makeAndAdd<Variable>(name);
+  addVar(std::move(name), variable);
+  return variable;
+}
+
+void SymbolTable::addVar(std::string varName, Variable* variable) {
+  vars_.emplace(std::move(varName), variable);
+}
+
+bool SymbolTable::readBy(const std::string& varName, PlanNode* node) {
+  auto var = vars_.find(varName);
+  if (var == vars_.end()) {
+    return false;
+  }
+  var->second->readBy.emplace(node);
+  return true;
+}
+
+bool SymbolTable::writtenBy(const std::string& varName, PlanNode* node) {
+  auto var = vars_.find(varName);
+  if (var == vars_.end()) {
+    return false;
+  }
+  var->second->writtenBy.emplace(node);
+  return true;
+}
+
+bool SymbolTable::deleteReadBy(const std::string& varName, PlanNode* node) {
+  auto var = vars_.find(varName);
+  if (var == vars_.end()) {
+    return false;
+  }
+  var->second->readBy.erase(node);
+  return true;
+}
+
+bool SymbolTable::deleteWrittenBy(const std::string& varName, PlanNode* node) {
+  auto var = vars_.find(varName);
+  if (var == vars_.end()) {
+    return false;
+  }
+  for (auto& alias : var->second->colNames) {
+    auto found = aliasGeneratedBy_.find(alias);
+    if (found != aliasGeneratedBy_.end()) {
+      if (found->second == varName) {
+        aliasGeneratedBy_.erase(alias);
+      }
+    }
+  }
+  var->second->writtenBy.erase(node);
+  return true;
+}
+
+bool SymbolTable::updateReadBy(const std::string& oldVar,
+                               const std::string& newVar,
+                               PlanNode* node) {
+  return deleteReadBy(oldVar, node) && readBy(newVar, node);
+}
+
+bool SymbolTable::updateWrittenBy(const std::string& oldVar,
+                                  const std::string& newVar,
+                                  PlanNode* node) {
+  return deleteWrittenBy(oldVar, node) && writtenBy(newVar, node);
+}
+
+Variable* SymbolTable::getVar(const std::string& varName) {
+  auto var = vars_.find(varName);
+  if (var == vars_.end()) {
+    return nullptr;
+  } else {
+    return var->second;
+  }
+}
+
+void SymbolTable::setAliasGeneratedBy(const std::vector<std::string>& aliases,
+                                      const std::string& varName) {
+  for (auto& alias : aliases) {
+    if (aliasGeneratedBy_.count(alias) == 0) {
+      aliasGeneratedBy_.emplace(alias, varName);
+    }
+  }
+}
+
+StatusOr<std::string> SymbolTable::getAliasGeneratedBy(const std::string& alias) {
+  auto found = aliasGeneratedBy_.find(alias);
+  if (found == aliasGeneratedBy_.end()) {
+    return Status::Error("Not found a variable that generates the alias: %s", alias.c_str());
+  } else {
+    return found->second;
+  }
+}
 }  // namespace graph
 }  // namespace nebula

src/graph/context/Symbols.h

@@ -52,81 +52,38 @@ struct Variable {
 
 class SymbolTable final {
  public:
-  explicit SymbolTable(ObjectPool* objPool) {
-    DCHECK(objPool != nullptr);
-    objPool_ = objPool;
-  }
+  explicit SymbolTable(ObjectPool* objPool);
 
-  Variable* newVariable(std::string name) {
-    VLOG(1) << "New variable for: " << name;
-    auto* variable = objPool_->makeAndAdd<Variable>(name);
-    addVar(std::move(name), variable);
-    return variable;
-  }
+  Variable* newVariable(std::string name);
 
-  void addVar(std::string varName, Variable* variable) {
-    vars_.emplace(std::move(varName), variable);
-  }
+  void addVar(std::string varName, Variable* variable);
 
-  bool readBy(const std::string& varName, PlanNode* node) {
-    auto var = vars_.find(varName);
-    if (var == vars_.end()) {
-      return false;
-    }
-    var->second->readBy.emplace(node);
-    return true;
-  }
+  bool readBy(const std::string& varName, PlanNode* node);
 
-  bool writtenBy(const std::string& varName, PlanNode* node) {
-    auto var = vars_.find(varName);
-    if (var == vars_.end()) {
-      return false;
-    }
-    var->second->writtenBy.emplace(node);
-    return true;
-  }
+  bool writtenBy(const std::string& varName, PlanNode* node);
 
-  bool deleteReadBy(const std::string& varName, PlanNode* node) {
-    auto var = vars_.find(varName);
-    if (var == vars_.end()) {
-      return false;
-    }
-    var->second->readBy.erase(node);
-    return true;
-  }
+  bool deleteReadBy(const std::string& varName, PlanNode* node);
 
-  bool deleteWrittenBy(const std::string& varName, PlanNode* node) {
-    auto var = vars_.find(varName);
-    if (var == vars_.end()) {
-      return false;
-    }
-    var->second->writtenBy.erase(node);
-    return true;
-  }
+  bool deleteWrittenBy(const std::string& varName, PlanNode* node);
 
-  bool updateReadBy(const std::string& oldVar, const std::string& newVar, PlanNode* node) {
-    return deleteReadBy(oldVar, node) && readBy(newVar, node);
-  }
+  bool updateReadBy(const std::string& oldVar, const std::string& newVar, PlanNode* node);
 
-  bool updateWrittenBy(const std::string& oldVar, const std::string& newVar, PlanNode* node) {
-    return deleteWrittenBy(oldVar, node) && writtenBy(newVar, node);
-  }
+  bool updateWrittenBy(const std::string& oldVar, const std::string& newVar, PlanNode* node);
 
-  Variable* getVar(const std::string& varName) {
-    auto var = vars_.find(varName);
-    if (var == vars_.end()) {
-      return nullptr;
-    } else {
-      return var->second;
-    }
-  }
+  Variable* getVar(const std::string& varName);
+
+  void setAliasGeneratedBy(const std::vector<std::string>& aliases, const std::string& varName);
+
+  StatusOr<std::string> getAliasGeneratedBy(const std::string& alias);
 
   std::string toString() const;
 
  private:
   ObjectPool* objPool_{nullptr};
   // var name -> variable
   std::unordered_map<std::string, Variable*> vars_;
+  // alias -> first variable that generate the alias
+  std::unordered_map<std::string, std::string> aliasGeneratedBy_;
 };
 
 }  // namespace graph

src/graph/context/ast/CypherAstContext.h

@@ -78,7 +78,7 @@ struct WhereClauseContext final : CypherClauseContextBase {
   WhereClauseContext() : CypherClauseContextBase(CypherClauseKind::kWhere) {}
 
   Expression* filter{nullptr};
-  std::unordered_map<std::string, AliasType>* aliasesUsed{nullptr};
+  std::unordered_map<std::string, AliasType> aliasesAvailable;
 };
 
 struct OrderByClauseContext final : CypherClauseContextBase {
@@ -99,7 +99,7 @@ struct YieldClauseContext final : CypherClauseContextBase {
 
   bool distinct{false};
   const YieldColumns* yieldColumns{nullptr};
-  std::unordered_map<std::string, AliasType>* aliasesUsed{nullptr};
+  std::unordered_map<std::string, AliasType> aliasesAvailable;
 
   bool hasAgg_{false};
   bool needGenProject_{false};
@@ -128,14 +128,19 @@ struct WithClauseContext final : CypherClauseContextBase {
   std::unordered_map<std::string, AliasType> aliasesGenerated;
 };
 
-struct MatchClauseContext final : CypherClauseContextBase {
-  MatchClauseContext() : CypherClauseContextBase(CypherClauseKind::kMatch) {}
-
+struct Path final {
   std::vector<NodeInfo> nodeInfos;
   std::vector<EdgeInfo> edgeInfos;
   PathBuildExpression* pathBuild{nullptr};
+};
+
+struct MatchClauseContext final : CypherClauseContextBase {
+  MatchClauseContext() : CypherClauseContextBase(CypherClauseKind::kMatch) {}
+
+  bool isOptional{false};
+  std::vector<Path> paths;
   std::unique_ptr<WhereClauseContext> where;
-  std::unordered_map<std::string, AliasType>* aliasesUsed{nullptr};
+  std::unordered_map<std::string, AliasType> aliasesAvailable;
   std::unordered_map<std::string, AliasType> aliasesGenerated;
 };
 
@@ -145,14 +150,25 @@ struct UnwindClauseContext final : CypherClauseContextBase {
   Expression* unwindExpr{nullptr};
   std::string alias;
 
-  // TODO: refactor alias
-  std::unordered_map<std::string, AliasType>* aliasesUsed{nullptr};
+  std::unordered_map<std::string, AliasType> aliasesAvailable;
+  std::unordered_map<std::string, AliasType> aliasesGenerated;
+};
+
+// A QueryPart begin with an arbitrary number of MATCH clauses, followed by either
+// (1) WITH and an optional UNWIND,
+// (2) a single UNWIND,
+// (3) a RETURN in case of the last query part.
+struct QueryPart final {
+  std::vector<std::unique_ptr<MatchClauseContext>> matchs;
+  // A with/unwind/return
+  std::unique_ptr<CypherClauseContextBase> boundary;
+  std::unordered_map<std::string, AliasType> aliasesAvailable;
   std::unordered_map<std::string, AliasType> aliasesGenerated;
 };
 
-struct MatchAstContext final : AstContext {
-  // Alternative of Match/Unwind/With and ends with Return.
-  std::vector<std::unique_ptr<CypherClauseContextBase>> clauses;
+// A cypher query is made up of many QueryPart
+struct CypherContext final : AstContext {
+  std::vector<QueryPart> queryParts;
 };
 
 struct PatternContext {
@@ -166,6 +182,7 @@ struct NodeContext final : PatternContext {
       : PatternContext(PatternKind::kNode, m), info(i) {}
 
   NodeInfo* info{nullptr};
+  std::unordered_set<std::string>* nodeAliasesAvailable;
 
   // Output fields
   ScanInfo scanInfo;

src/graph/executor/CMakeLists.txt

@@ -10,6 +10,7 @@ nebula_add_library(
     logic/PassThroughExecutor.cpp
     logic/StartExecutor.cpp
     logic/SelectExecutor.cpp
+    logic/ArgumentExecutor.cpp
     query/AggregateExecutor.cpp
     query/DedupExecutor.cpp
     query/FilterExecutor.cpp

src/graph/executor/Executor.cpp

@@ -55,6 +55,7 @@
 #include "graph/executor/algo/ProduceAllPathsExecutor.h"
 #include "graph/executor/algo/ProduceSemiShortestPathExecutor.h"
 #include "graph/executor/algo/SubgraphExecutor.h"
+#include "graph/executor/logic/ArgumentExecutor.h"
 #include "graph/executor/logic/LoopExecutor.h"
 #include "graph/executor/logic/PassThroughExecutor.h"
 #include "graph/executor/logic/SelectExecutor.h"
@@ -524,6 +525,18 @@ Executor *Executor::makeExecutor(QueryContext *qctx, const PlanNode *node) {
     case PlanNode::Kind::kAppendVertices: {
       return pool->add(new AppendVerticesExecutor(node, qctx));
     }
+    case PlanNode::Kind::kBiLeftJoin: {
+      return pool->add(new BiLeftJoinExecutor(node, qctx));
+    }
+    case PlanNode::Kind::kBiInnerJoin: {
+      return pool->add(new BiInnerJoinExecutor(node, qctx));
+    }
+    case PlanNode::Kind::kBiCartesianProduct: {
+      return pool->add(new BiCartesianProductExecutor(node, qctx));
+    }
+    case PlanNode::Kind::kArgument: {
+      return pool->add(new ArgumentExecutor(node, qctx));
+    }
     case PlanNode::Kind::kUnknown: {
       LOG(FATAL) << "Unknown plan node kind " << static_cast<int32_t>(node->kind());
       break;

src/graph/executor/algo/CartesianProductExecutor.cpp

@@ -52,5 +52,22 @@ void CartesianProductExecutor::doCartesianProduct(const DataSet& lds,
   }
 }
 
+BiCartesianProductExecutor::BiCartesianProductExecutor(const PlanNode* node, QueryContext* qctx)
+    : CartesianProductExecutor(node, qctx) {
+  name_ = "BiCartesianProductExecutor";
+}
+
+folly::Future<Status> BiCartesianProductExecutor::execute() {
+  SCOPED_TIMER(&execTime_);
+
+  auto* BiCP = asNode<BiCartesianProduct>(node());
+  const auto& lds = ectx_->getResult(BiCP->leftInputVar()).value().getDataSet();
+  const auto& rds = ectx_->getResult(BiCP->rightInputVar()).value().getDataSet();
+  DataSet result;
+  doCartesianProduct(lds, rds, result);
+  result.colNames = BiCP->colNames();
+  VLOG(1) << "Cartesian Product is : " << result;
+  return finish(ResultBuilder().value(Value(std::move(result))).build());
+}
 }  // namespace graph
 }  // namespace nebula