Merge branch 'master' into host

vesoft-inc · May 30, 2019 · 2e09077 · 2e09077
2 parents 2b4ce6a + af8ea8d
commit 2e09077
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/common/filter/Expressions.cpp b/src/common/filter/Expressions.cpp
@@ -1047,12 +1047,16 @@ std::string LogicalExpression::toString() const {
 
 
 VariantType LogicalExpression::eval() const {
-    auto left = left_->eval();
-    auto right = right_->eval();
     if (op_ == AND) {
-        return asBool(left) && asBool(right);
+        if (!asBool(left_->eval())) {
+            return false;
+        }
+        return asBool(right_->eval());
     } else {
-        return asBool(left) || asBool(right);
+        if (asBool(left_->eval())) {
+            return true;
+        }
+        return asBool(right_->eval());
     }
 }