rewrite attribute expresion to labeltagprop for unwind.

vesoft-inc · Dec 14, 2022 · 4220333 · 4220333
1 parent 9097f5f
commit 4220333
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 18 deletions.
diff --git a/src/common/expression/AttributeExpression.cpp b/src/common/expression/AttributeExpression.cpp
@@ -23,17 +23,8 @@ const Value &AttributeExpression::eval(ExpressionContext &ctx) {
     case Value::Type::MAP:
       return lvalue.getMap().at(rvalue.getStr());
     case Value::Type::VERTEX: {
-      if (rvalue.getStr() == kVid) {
-        result_ = lvalue.getVertex().vid;
-        return result_;
-      }
-      for (auto &tag : lvalue.getVertex().tags) {
-        auto iter = tag.props.find(rvalue.getStr());
-        if (iter != tag.props.end()) {
-          return iter->second;
-        }
-      }
-      return Value::kNullValue;
+      LOG(ERROR) << "Var.tar.prop cannot be evaluated as an attribute expression.";
+      return Value::kNullBadType;
     }
     case Value::Type::EDGE: {
       DCHECK(!rvalue.getStr().empty());

diff --git a/src/graph/executor/query/UnwindExecutor.cpp b/src/graph/executor/query/UnwindExecutor.cpp
@@ -23,12 +23,6 @@ folly::Future<Status> UnwindExecutor::execute() {
   ds.colNames = unwind->colNames();
   for (; iter->valid(); iter->next()) {
     const Value &list = unwindExpr->eval(ctx(iter.get()));
-    if (!list.isList()) {
-      std::stringstream ss;
-      ss << "Unwind on types other than list for " << unwindExpr->toString()
-         << ". This is not supported.";
-      return Status::Error(ss.str());
-    }
     std::vector<Value> vals = extractList(list);
     for (auto &v : vals) {
       Row row;

diff --git a/src/graph/validator/MatchValidator.cpp b/src/graph/validator/MatchValidator.cpp
@@ -636,7 +636,8 @@ Status MatchValidator::validateUnwind(const UnwindClause *unwindClause,
     return Status::SemanticError("Expression in UNWIND must be aliased (use AS)");
   }
   unwindCtx.alias = unwindClause->alias();
-  unwindCtx.unwindExpr = unwindClause->expr()->clone();
+  unwindCtx.unwindExpr = ExpressionUtils::rewriteAttr2LabelTagProp(unwindClause->expr()->clone(),
+                                                                   unwindCtx.aliasesAvailable);
   if (ExpressionUtils::hasAny(unwindCtx.unwindExpr, {Expression::Kind::kAggregate})) {
     return Status::SemanticError("Can't use aggregating expressions in unwind clause, `%s'",
                                  unwindCtx.unwindExpr->toString().c_str());