Enhancement

src/graph/optimizer/Optimizer.cpp

@@ -151,15 +151,7 @@ Status rewriteArgumentInputVarInternal(PlanNode *root,
             if (bpn->right() == path[i + 1]) {
               // Argument is in the right side dependency of binary plan node, check the left child
               // output columns
-              const auto &colNames = bpn->left()->colNames();
-              bool found = true;
-              for (const auto &col : root->colNames()) {
-                if (std::find(colNames.begin(), colNames.end(), col) == colNames.end()) {
-                  found = false;
-                  break;
-                }
-              }
-              if (found) {
+              if (root->isColumnsIncludedIn(bpn->left())) {
                 root->setInputVar(bpn->left()->outputVar());
                 break;
               }

src/graph/planner/plan/PlanNode.cpp

@@ -354,18 +354,15 @@ void PlanNode::setInputVar(const std::string& varname, size_t idx) {
   }
 }
 
-Status PlanNode::isColumnsIncluded(const std::string& varname) const {
-  auto* refVar = qctx()->symTable()->getVar(varname);
-  // The referenced variable should have all columns used in current node
+bool PlanNode::isColumnsIncludedIn(const PlanNode* other) const {
+  const auto& otherColNames = other->colNames();
   for (auto& colName : colNames()) {
-    auto iter = std::find(refVar->colNames.begin(), refVar->colNames.end(), colName);
-    if (iter == refVar->colNames.end()) {
-      return Status::Error("the column referenced by Argument is not included in variable `%s': %s",
-                           varname.c_str(),
-                           colName.c_str());
+    auto iter = std::find(otherColNames.begin(), otherColNames.end(), colName);
+    if (iter == otherColNames.end()) {
+      return false;
     }
   }
-  return Status::OK();
+  return true;
 }
 
 std::unique_ptr<PlanNodeDescription> PlanNode::explain() const {

src/graph/planner/plan/PlanNode.h

@@ -304,7 +304,7 @@ class PlanNode {
     return static_cast<const T*>(this);
   }
 
-  Status isColumnsIncluded(const std::string& varname) const;
+  bool isColumnsIncludedIn(const PlanNode* other) const;
 
  protected:
   PlanNode(QueryContext* qctx, Kind kind);