check whether 'e.prop == bool' expr is evaluable before rewriting them.

vesoft-inc · Nov 9, 2022 · 4283b0c · 4283b0c
1 parent d9c4a6c
commit 4283b0c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
@@ -614,10 +614,13 @@ Expression *ExpressionUtils::rewriteRelExpr(const Expression *expr) {
     auto rExpr = relExpr->right();
 
     // Simplify relational expressions involving boolean literals
-    auto simplifiedExpr = simplifyBoolOperand(relExpr, lExpr, rExpr);
-    if (simplifiedExpr) {
-      return simplifiedExpr;
+    if (isEvaluableExpr(lExpr) && isEvaluableExpr(rExpr)) {
+      auto simplifiedExpr = simplifyBoolOperand(relExpr, lExpr, rExpr);
+      if (simplifiedExpr) {
+        return simplifiedExpr;
+      }
     }
+
     // Move all evaluable expression to the right side
     auto relRightOperandExpr = relExpr->right()->clone();
     auto relLeftOperandExpr = rewriteRelExprHelper(relExpr->left(), relRightOperandExpr);