From 34a66d2a0a0b1ffbd2de77dfbeab6214e0b3f683 Mon Sep 17 00:00:00 2001
From: Aiee <18348405+Aiee@users.noreply.github.com>
Date: Thu, 6 Jan 2022 11:58:13 +0800
Subject: [PATCH] Fix conflicts

---
 src/graph/util/ExpressionUtils.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
index b0d61ae174c..02071529eac 100644
--- a/src/graph/util/ExpressionUtils.cpp
+++ b/src/graph/util/ExpressionUtils.cpp
@@ -10,8 +10,8 @@
 #include <unordered_set>
 
 #include "common/base/ObjectPool.h"
-#include "common/expression/Expression.h"
 #include "common/expression/ArithmeticExpression.h"
+#include "common/expression/Expression.h"
 #include "common/expression/PropertyExpression.h"
 #include "common/function/AggFunctionManager.h"
 #include "graph/context/QueryContext.h"
@@ -462,7 +462,10 @@ Expression *ExpressionUtils::rewriteRelExpr(const Expression *expr) {
     if (lExpr->isArithmeticExpr()) {
       auto arithmExpr = static_cast<const ArithmeticExpression *>(lExpr);
       checkLeftOperand = checkArithmExpr(arithmExpr);
-    } else if (lExpr->isRelExpr()) {  // for expressions that contain boolean literals
+    } else if (lExpr->isRelExpr() ||
+               lExpr->kind() == Expression::Kind::kLabelAttribute) {  // for expressions that
+                                                                      // contain boolean literals
+                                                                      // such as (v.age <= null)
       checkLeftOperand = true;
     }
     return checkLeftOperand;