fix tck

src/graph/util/ExpressionUtils.cpp

@@ -390,6 +390,32 @@ Expression *ExpressionUtils::rewriteStartsWithExpr(const Expression *expr) {
   return LogicalExpression::makeAnd(pool, resultLeft, resultRight);
 }
 
+Expression *ExpressionUtils::foldInnerLogicalExpr(const Expression *originExpr) {
+  auto matcher = [](const Expression *e) -> bool {
+    return e->kind() == Expression::Kind::kLogicalAnd || e->kind() == Expression::Kind::kLogicalOr;
+  };
+  auto rewriter = [](const Expression *e) -> Expression * {
+    auto expr = e->clone();
+    auto &operands = static_cast<LogicalExpression *>(expr)->operands();
+    for (auto iter = operands.begin(); iter != operands.end();) {
+      if (*iter == nullptr) {
+        operands.erase(iter);
+      } else {
+        iter++;
+      }
+    }
+    auto n = operands.size();
+    if (n == 0) {
+      return nullptr;
+    } else if (n == 1) {
+      return operands[0];
+    }
+    return expr;
+  };
+
+  return RewriteVisitor::transform(originExpr, std::move(matcher), std::move(rewriter));
+}
+
 Expression *ExpressionUtils::rewriteLogicalAndToLogicalOr(const Expression *expr) {
   DCHECK(expr->kind() == Expression::Kind::kLogicalAnd);
 

src/graph/util/ExpressionUtils.h

@@ -104,6 +104,8 @@ class ExpressionUtils {
   // (A or B) and (C or D)  =>  (A and C) or (A and D) or (B and C) or (B or D)
   static Expression* rewriteLogicalAndToLogicalOr(const Expression* expr);
 
+  static Expression* foldInnerLogicalExpr(const Expression* expr);
+
   // Returns the operands of container expressions
   // For list and set, return the operands
   // For map, return the keys

src/graph/validator/MatchValidator.cpp

@@ -1124,8 +1124,10 @@ Status MatchValidator::validatePathInWhere(
   if (extractMultiPathPredicate(expr, pathPreds)) {
     wctx.filter = nullptr;
   } else {
-    // Flatten the inner logical expressions that already have operands that can be compacted
-    wctx.filter = ExpressionUtils::flattenInnerLogicalExpr(expr);
+    // Flatten and fold the inner logical expressions that already have operands that can be
+    // compacted
+    wctx.filter =
+        ExpressionUtils::foldInnerLogicalExpr(ExpressionUtils::flattenInnerLogicalExpr(expr));
   }
   for (auto &pred : pathPreds) {
     NG_RETURN_IF_ERROR(checkMatchPathExpr(pred, availableAliases));