Revert "Revert "Fix aggregate default value (vesoft-inc#477)" (vesoft…

…-inc#478)" This reverts commit a8d0723.
czpmango · Apr 1, 2021 · 225855d · 225855d
1 parent a8d0723
commit 225855d
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 6 deletions.
diff --git a/src/common/expression/AggregateExpression.h b/src/common/expression/AggregateExpression.h
@@ -27,6 +27,8 @@ class AggregateExpression final : public Expression {
 
     const Value& eval(ExpressionContext& ctx) override;
 
+    void apply(AggData* aggData, const Value& val);
+
     bool operator==(const Expression& rhs) const override;
 
     std::string toString() const override;
@@ -78,8 +80,6 @@ class AggregateExpression final : public Expression {
 
 
 private:
-    void apply(AggData* aggData, const Value& val);
-
     void writeTo(Encoder& encoder) const override;
     void resetFrom(Decoder& decoder) override;
 

diff --git a/src/common/expression/test/ExpressionTest.cpp b/src/common/expression/test/ExpressionTest.cpp
@@ -4327,8 +4327,8 @@ TEST_F(ExpressionTest, AggregateExpression) {
         TEST_AGG(COUNT, true, isConst, vals5_, expected2);
         TEST_AGG(COUNT, false, abs, vals9_, expected5);
         TEST_AGG(COUNT, true, abs, vals9_, expected5);
-        TEST_AGG(SUM, false, isConst, vals5_, expected1);
-        TEST_AGG(SUM, true, isConst, vals5_, expected1);
+        TEST_AGG(SUM, false, isConst, vals5_, expected2);
+        TEST_AGG(SUM, true, isConst, vals5_, expected2);
         TEST_AGG(SUM, false, isConst, vals9_, expected5);
         TEST_AGG(SUM, true, isConst, vals9_, expected5);
         TEST_AGG(AVG, false, isConst, vals5_, expected1);

diff --git a/src/common/function/AggFunctionManager.cpp b/src/common/function/AggFunctionManager.cpp
@@ -54,6 +54,9 @@ AggFunctionManager::AggFunctionManager() {
             if (res.isBadNull()) {
                 return;
             }
+            if (res.isNull()) {
+                res = 0;
+            }
             if (UNLIKELY(val.isBadNull() || (!val.isNull() && !val.empty() && !val.isNumeric()))) {
                 res = Value::kNullBadType;
                 return;

diff --git a/src/common/function/test/AggFunctionManagerTest.cpp b/src/common/function/test/AggFunctionManagerTest.cpp
@@ -9,6 +9,7 @@
 #include "common/function/AggFunctionManager.h"
 #include "common/datatypes/Set.h"
 #include "common/time/TimeUtils.h"
+#include "common/datatypes/List.h"
 
 namespace nebula {
 
@@ -56,8 +57,8 @@ TEST_F(AggFunctionManagerTest, aggFunc) {
         TEST_FUNCTION(count, testData_["mixed"], 2);
     }
     {
-        TEST_FUNCTION(sum, testData_["empty"], Value::kNullValue);
-        TEST_FUNCTION(sum, testData_["null"], Value::kNullValue);
+        TEST_FUNCTION(sum, testData_["empty"], 0);
+        TEST_FUNCTION(sum, testData_["null"], 0);
         TEST_FUNCTION(sum, testData_["int"], 6);
         TEST_FUNCTION(sum, testData_["float"], 6.6);
         TEST_FUNCTION(sum, testData_["mixed"], 3.0);
@@ -90,6 +91,41 @@ TEST_F(AggFunctionManagerTest, aggFunc) {
         TEST_FUNCTION(std, testData_["float"], 0.8981462390204984);
         TEST_FUNCTION(std, testData_["mixed"], 0.5);
     }
+    {
+        TEST_FUNCTION(bit_and, testData_["empty"], Value::kNullValue);
+        TEST_FUNCTION(bit_and, testData_["null"], Value::kNullValue);
+        TEST_FUNCTION(bit_and, testData_["int"], 0);
+        TEST_FUNCTION(bit_and, testData_["float"], Value::kNullValue);
+        TEST_FUNCTION(bit_and, testData_["mixed"], Value::kNullValue);
+    }
+    {
+        TEST_FUNCTION(bit_or, testData_["empty"], Value::kNullValue);
+        TEST_FUNCTION(bit_or, testData_["null"], Value::kNullValue);
+        TEST_FUNCTION(bit_or, testData_["int"], 3);
+        TEST_FUNCTION(bit_or, testData_["float"], Value::kNullValue);
+        TEST_FUNCTION(bit_or, testData_["mixed"], Value::kNullValue);
+    }
+    {
+        TEST_FUNCTION(bit_xor, testData_["empty"], Value::kNullValue);
+        TEST_FUNCTION(bit_xor, testData_["null"], Value::kNullValue);
+        TEST_FUNCTION(bit_xor, testData_["int"], 0);
+        TEST_FUNCTION(bit_xor, testData_["float"], Value::kNullValue);
+        TEST_FUNCTION(bit_xor, testData_["mixed"], Value::kNullValue);
+    }
+    {
+        TEST_FUNCTION(collect, testData_["empty"], List());
+        TEST_FUNCTION(collect, testData_["null"], List());
+        TEST_FUNCTION(collect, testData_["int"], List({1, 2, 3}));
+        TEST_FUNCTION(collect, testData_["float"], List({1.1, 2.2, 3.3}));
+        TEST_FUNCTION(collect, testData_["mixed"], List({1, 2.0}));
+    }
+    {
+        TEST_FUNCTION(collect_set, testData_["empty"], Set());
+        TEST_FUNCTION(collect_set, testData_["null"], Set());
+        TEST_FUNCTION(collect_set, testData_["int"], Set({1, 2, 3}));
+        TEST_FUNCTION(collect_set, testData_["float"], Set({1.1, 2.2, 3.3}));
+        TEST_FUNCTION(collect_set, testData_["mixed"], Set({1, 2.0}));
+    }
 }
 
 }   // namespace nebula