Address comments

vesoft-inc · Nov 23, 2020 · f2d5b35 · f2d5b35
1 parent 0077f03
commit f2d5b35
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/common/expression/PathBuildExpression.cpp b/src/common/expression/PathBuildExpression.cpp
@@ -59,10 +59,7 @@ const Value& PathBuildExpression::eval(ExpressionContext& ctx) {
             }
             path.steps.insert(path.steps.end(), p.steps.begin(), p.steps.end());
         } else {
-            if ((i & 1) == 1) {
-                return Value::kNullBadData;
-            }
-            if (path.steps.empty() || !getVertex(value, path.steps.back().dst)) {
+            if ((i & 1) == 1 || path.steps.empty() || !getVertex(value, path.steps.back().dst)) {
                 return Value::kNullBadData;
             }
         }

diff --git a/src/common/function/FunctionManager.cpp b/src/common/function/FunctionManager.cpp
@@ -176,7 +176,7 @@ std::unordered_map<std::string, std::vector<TypeSignature>> FunctionManager::typ
     {"head", {TypeSignature({Value::Type::LIST}, Value::Type::__EMPTY__), }},
     {"last", { TypeSignature({Value::Type::LIST}, Value::Type::__EMPTY__), }},
     {"coalesce", { TypeSignature({Value::Type::LIST}, Value::Type::__EMPTY__), }},
-    {"cyclePath", { TypeSignature({Value::Type::PATH}, Value::Type::BOOL), }},
+    {"hasSameEdgeInPath", { TypeSignature({Value::Type::PATH}, Value::Type::BOOL), }},
 };
 
 // static
@@ -1190,7 +1190,7 @@ FunctionManager::FunctionManager() {
         };
     }
     {
-        auto &attr = functions_["cyclePath"];
+        auto &attr = functions_["hasSameEdgeInPath"];
         attr.minArity_ = 1;
         attr.maxArity_ = 1;
         attr.isPure_ = true;