fix conflict

vesoft-inc · Aug 18, 2022 · 7a98297 · 7a98297
1 parent 16ff6e1
commit 7a98297
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/graph/visitor/PropertyTrackerVisitor.cpp b/src/graph/visitor/PropertyTrackerVisitor.cpp
@@ -224,10 +224,9 @@ void PropertyTrackerVisitor::visit(AggregateExpression *expr) {
   auto funName = expr->name();
   std::transform(funName.begin(), funName.end(), funName.begin(), ::tolower);
   if (funName == "count") {
-    auto *argExpr = expr->arg();
-    if (argExpr->kind() == Expression::Kind::kConstant ||
-        argExpr->kind() == Expression::Kind::kInputProperty ||
-        argExpr->kind() == Expression::Kind::kVarProperty) {
+    auto kind = expr->arg()->kind();
+    if (kind == Expression::Kind::kConstant || kind == Expression::Kind::kInputProperty ||
+        kind == Expression::Kind::kVarProperty) {
       return;
     }
   }

diff --git a/tests/tck/features/optimizer/PrunePropertiesRule.feature b/tests/tck/features/optimizer/PrunePropertiesRule.feature
@@ -499,7 +499,6 @@ Feature: Prune Properties rule
       | "Steve Nash"        |
     And the execution plan should be:
       | id | name           | dependencies | operator info                                                                                                                                                   |
-      | 15 | DataCollect    | 14           |                                                                                                                                                                 |
       | 14 | Dedup          | 13           |                                                                                                                                                                 |
       | 13 | Union          | 18, 19       |                                                                                                                                                                 |
       | 18 | Project        | 4            |                                                                                                                                                                 |