fix error

vesoft-inc · Jul 23, 2022 · 796131c · 796131c
1 parent 71f6901
commit 796131c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/graph/executor/query/UnwindExecutor.cpp b/src/graph/executor/query/UnwindExecutor.cpp
@@ -26,7 +26,7 @@ folly::Future<Status> UnwindExecutor::execute() {
     std::vector<Value> vals = extractList(list);
     for (auto &v : vals) {
       Row row;
-      if (!emptyInput) {
+      if (!unwind->fromPipe() && !emptyInput) {
         row = *(iter->row());
       }
       row.values.emplace_back(std::move(v));

diff --git a/src/graph/planner/plan/Query.h b/src/graph/planner/plan/Query.h
@@ -841,6 +841,14 @@ class Unwind final : public SingleInputNode {
     return alias_;
   }
 
+  bool fromPipe() const {
+    return fromPipe_;
+  }
+
+  void setFromPipe() {
+    fromPipe_ = true;
+  }
+
   PlanNode* clone() const override;
   std::unique_ptr<PlanNodeDescription> explain() const override;
 
@@ -854,6 +862,7 @@ class Unwind final : public SingleInputNode {
  private:
   Expression* unwindExpr_{nullptr};
   std::string alias_;
+  bool fromPipe_{false};
 };
 
 // Sort the given record set.

diff --git a/src/graph/validator/UnwindValidator.cpp b/src/graph/validator/UnwindValidator.cpp
@@ -34,6 +34,7 @@ Status UnwindValidator::validateImpl() {
 Status UnwindValidator::toPlan() {
   auto *unwind = Unwind::make(qctx_, nullptr, unwindExpr_, alias_);
   unwind->setColNames({alias_});
+  unwind->setFromPipe();
   root_ = tail_ = unwind;
   return Status::OK();
 }