for comparisions of any two values, as long as one operand is EMPTY, …

…we return NULL.
vesoft-inc · Mar 24, 2023 · af4d809 · af4d809
1 parent c74acf8
commit af4d809
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/src/common/datatypes/Value.cpp b/src/common/datatypes/Value.cpp
@@ -1778,7 +1778,7 @@ Value Value::toSet() const {
 }
 Value Value::lessThan(const Value& v) const {
   if (empty() || v.empty()) {
-    return (v.isNull() || isNull()) ? Value::kNullValue : Value::kEmpty;
+    return Value::kNullValue;
   }
   auto vType = v.type();
   auto hasNull = (type_ | vType) & Value::Type::NULLVALUE;

diff --git a/src/common/expression/test/RelationalExpressionTest.cpp b/src/common/expression/test/RelationalExpressionTest.cpp
@@ -100,8 +100,8 @@ TEST_F(ExpressionTest, LiteralConstantsRelational) {
     auto *operand2 = ConstantExpression::make(&pool, Value());
     auto *expr = RelationalExpression::makeEQ(&pool, operand1, operand2);
     auto eval = Expression::eval(expr, gExpCtxt);
-    EXPECT_EQ(eval.type(), Value(true).type()) << "type check failed: " << expr->toString();
-    EXPECT_EQ(eval, Value(true)) << "check failed: " << expr->toString();
+    EXPECT_EQ(eval.type(), Value::kNullValue.type()) << "type check failed: " << expr->toString();
+    EXPECT_EQ(eval, Value::kNullValue) << "check failed: " << expr->toString();
   }
   {
     // empty == null
@@ -127,44 +127,44 @@ TEST_F(ExpressionTest, LiteralConstantsRelational) {
     auto *operand2 = ConstantExpression::make(&pool, Value(1));
     auto *expr = RelationalExpression::makeNE(&pool, operand1, operand2);
     auto eval = Expression::eval(expr, gExpCtxt);
-    EXPECT_EQ(eval.type(), Value(true).type()) << "type check failed: " << expr->toString();
-    EXPECT_EQ(eval, Value(true)) << "check failed: " << expr->toString();
+    EXPECT_EQ(eval.type(), Value::kNullValue.type()) << "type check failed: " << expr->toString();
+    EXPECT_EQ(eval, Value::kNullValue) << "check failed: " << expr->toString();
   }
   {
     // empty != true
     auto *operand1 = ConstantExpression::make(&pool, Value());
     auto *operand2 = ConstantExpression::make(&pool, Value(true));
     auto *expr = RelationalExpression::makeNE(&pool, operand1, operand2);
     auto eval = Expression::eval(expr, gExpCtxt);
-    EXPECT_EQ(eval.type(), Value(true).type()) << "type check failed: " << expr->toString();
-    EXPECT_EQ(eval, Value(true)) << "check failed: " << expr->toString();
+    EXPECT_EQ(eval.type(), Value::kNullValue.type()) << "type check failed: " << expr->toString();
+    EXPECT_EQ(eval, Value::kNullValue) << "check failed: " << expr->toString();
   }
   {
     // empty > "1"
     auto *operand1 = ConstantExpression::make(&pool, Value());
     auto *operand2 = ConstantExpression::make(&pool, Value("1"));
     auto *expr = RelationalExpression::makeGT(&pool, operand1, operand2);
     auto eval = Expression::eval(expr, gExpCtxt);
-    EXPECT_EQ(eval.type(), Value::kEmpty.type()) << "type check failed: " << expr->toString();
-    EXPECT_EQ(eval, Value::kEmpty) << "check failed: " << expr->toString();
+    EXPECT_EQ(eval.type(), Value::kNullValue.type()) << "type check failed: " << expr->toString();
+    EXPECT_EQ(eval, Value::kNullValue) << "check failed: " << expr->toString();
   }
   {
     // empty < 1
     auto *operand1 = ConstantExpression::make(&pool, Value());
     auto *operand2 = ConstantExpression::make(&pool, Value(1));
     auto *expr = RelationalExpression::makeLT(&pool, operand1, operand2);
     auto eval = Expression::eval(expr, gExpCtxt);
-    EXPECT_EQ(eval.type(), Value::kEmpty.type()) << "type check failed: " << expr->toString();
-    EXPECT_EQ(eval, Value::kEmpty) << "check failed: " << expr->toString();
+    EXPECT_EQ(eval.type(), Value::kNullValue.type()) << "type check failed: " << expr->toString();
+    EXPECT_EQ(eval, Value::kNullValue) << "check failed: " << expr->toString();
   }
   {
     // empty >= 1.11
     auto *operand1 = ConstantExpression::make(&pool, Value());
     auto *operand2 = ConstantExpression::make(&pool, Value(1.11));
     auto *expr = RelationalExpression::makeGE(&pool, operand1, operand2);
     auto eval = Expression::eval(expr, gExpCtxt);
-    EXPECT_EQ(eval.type(), Value::kEmpty.type()) << "type check failed: " << expr->toString();
-    EXPECT_EQ(eval, Value::kEmpty) << "check failed: " << expr->toString();
+    EXPECT_EQ(eval.type(), Value::kNullValue.type()) << "type check failed: " << expr->toString();
+    EXPECT_EQ(eval, Value::kNullValue) << "check failed: " << expr->toString();
   }
   {
     TEST_EXPR(null != 1, Value::kNullValue);