return false on unkown prop in logical expr eval.

vesoft-inc · Nov 10, 2022 · 299f672 · 299f672
1 parent d9c4a6c
commit 299f672
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/src/common/datatypes/Value.h b/src/common/datatypes/Value.h
@@ -151,6 +151,10 @@ struct Value {
  bool isNull() const {
  return type_ == Type::NULLVALUE;
  }
+ bool isUnkonwnProp() const {
+ auto& null = value_.nVal;
+ return null == NullType::UNKNOWN_PROP;
+ }
  bool isBadNull() const {
  if (!isNull()) {
  return false;

diff --git a/src/common/expression/LogicalExpression.cpp b/src/common/expression/LogicalExpression.cpp
@@ -28,7 +28,10 @@ const Value &LogicalExpression::evalAnd(ExpressionContext &ctx) {
  result_ = true;
  for (auto i = 0u; i < operands_.size(); i++) {
  auto &value = operands_[i]->eval(ctx);
- if (value.isBadNull() || (value.isImplicitBool() && !value.implicitBool())) {
+ if (value.isUnkonwnProp()) {
+ result_ = false;
+ return result_;
+ } else if (value.isBadNull() || (value.isImplicitBool() && !value.implicitBool())) {
  result_ = value;
  return result_;
  }

diff --git a/src/graph/util/ExpressionUtils.cpp b/src/graph/util/ExpressionUtils.cpp
@@ -618,6 +618,7 @@ Expression *ExpressionUtils::rewriteRelExpr(const Expression *expr) {
  if (simplifiedExpr) {
  return simplifiedExpr;
  }
+
  // Move all evaluable expression to the right side
  auto relRightOperandExpr = relExpr->right()->clone();
  auto relLeftOperandExpr = rewriteRelExprHelper(relExpr->left(), relRightOperandExpr);