Merge AggregateDataCount and AggregateDataCountAll

h2/src/main/org/h2/expression/aggregate/AggregateData.java

@@ -25,10 +25,10 @@ abstract class AggregateData {
     static AggregateData create(AggregateType aggregateType, boolean distinct) {
         switch (aggregateType) {
         case COUNT_ALL:
-            return new AggregateDataCountAll();
+            return new AggregateDataCount(true);
         case COUNT:
             if (!distinct) {
-                return new AggregateDataCount();
+                return new AggregateDataCount(false);
             }
             break;
         case GROUP_CONCAT:

h2/src/main/org/h2/expression/aggregate/AggregateDataCount.java

@@ -11,14 +11,21 @@ import org.h2.value.ValueLong;
 import org.h2.value.ValueNull;
 
 /**
- * Data stored while calculating an aggregate.
+ * Data stored while calculating a COUNT aggregate.
  */
 class AggregateDataCount extends AggregateData {
+
+    private final boolean all;
+
     private long count;
 
+    AggregateDataCount(boolean all) {
+        this.all = all;
+    }
+
     @Override
     void add(Database database, int dataType, Value v) {
-        if (v != ValueNull.INSTANCE) {
+        if (all || v != ValueNull.INSTANCE) {
             count++;
         }
     }

h2/src/main/org/h2/expression/aggregate/AggregateDataCountAll.java

-/*
- * Copyright 2004-2018 H2 Group. Multiple-Licensed under the MPL 2.0,
- * and the EPL 1.0 (http://h2database.com/html/license.html).
- * Initial Developer: H2 Group
- */
-package org.h2.expression.aggregate;
-
-import org.h2.engine.Database;
-import org.h2.value.Value;
-import org.h2.value.ValueLong;
-
-/**
- * Data stored while calculating a COUNT(*) aggregate.
- */
-class AggregateDataCountAll extends AggregateData {
-
-    private long count;
-
-    @Override
-    void add(Database database, int dataType, Value v) {
-        count++;
-    }
-
-    @Override
-    Value getValue(Database database, int dataType) {
-        return ValueLong.get(count).convertTo(dataType);
-    }
-
-}