Aggregation ORDER BY & DISTINCT spilling

presto-main/src/main/java/com/facebook/presto/operator/HashAggregationOperator.java

@@ -367,7 +367,7 @@ public void addInput(Page page)
 
         if (aggregationBuilder == null) {
             // TODO: We ignore spillEnabled here if any aggregate has ORDER BY clause or DISTINCT because they are not yet implemented for spilling.
-            if (step.isOutputPartial() || !spillEnabled || hasOrderBy() || hasDistinct()) {
+            if (step.isOutputPartial() || !spillEnabled) {
                 aggregationBuilder = new InMemoryHashAggregationBuilder(
                         accumulatorFactories,
                         step,
@@ -411,16 +411,6 @@ public void addInput(Page page)
         aggregationBuilder.updateMemory();
     }
 
-    private boolean hasOrderBy()
-    {
-        return accumulatorFactories.stream().anyMatch(AccumulatorFactory::hasOrderBy);
-    }
-
-    private boolean hasDistinct()
-    {
-        return accumulatorFactories.stream().anyMatch(AccumulatorFactory::hasDistinct);
-    }
-
     @Override
     public ListenableFuture<?> startMemoryRevoke()
     {

presto-main/src/main/java/com/facebook/presto/operator/aggregation/AccumulatorFactoryBinder.java

@@ -34,5 +34,6 @@ AccumulatorFactory bind(
             boolean distinct,
             JoinCompiler joinCompiler,
             List<LambdaProvider> lambdaProviders,
+            boolean spillEnabled,
             Session session);
 }

presto-main/src/main/java/com/facebook/presto/operator/aggregation/FinalOnlyGroupedAccumulator.java

@@ -0,0 +1,45 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.facebook.presto.operator.aggregation;
+
+import com.facebook.presto.common.block.Block;
+import com.facebook.presto.common.block.BlockBuilder;
+import com.facebook.presto.common.type.Type;
+import com.facebook.presto.operator.GroupByIdBlock;
+
+/**
+ * {@link FinalOnlyGroupedAccumulator} is an accumulator that does not support partial aggregation
+ * This is for spilling purposes so any underlying accumulator must support spilling
+ */
+public abstract class FinalOnlyGroupedAccumulator
+        implements GroupedAccumulator
+{
+    @Override
+    public final Type getIntermediateType()
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final void addIntermediate(GroupByIdBlock groupIdsBlock, Block block)
+    {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final void evaluateIntermediate(int groupId, BlockBuilder output)
+    {
+        throw new UnsupportedOperationException();
+    }
+}