Merge pull request #58 from eastfisher/fix-aggregation

fix: return 0 when no result in sum()
XiaoMi · Nov 20, 2019 · 3a218c7 · 3a218c7
2 parents bcc9542 + 9c08ae7
commit 3a218c7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/proxy/plan/merge_result.go b/proxy/plan/merge_result.go
@@ -173,6 +173,13 @@ func (a *AggregateFuncSumMerger) MergeTo(from, to ResultRow) error {
 		return fmt.Errorf("field index out of bound: %d", a.fieldIndex)
 	}
 
+	fromValueI := from.GetValue(idx)
+
+	// nil对应NULL, NULL不参与比较
+	if fromValueI == nil {
+		return nil
+	}
+
 	switch to.GetValue(idx).(type) {
 	case int64:
 		return a.sumToInt64(from, to)