Convert min_by/max_by N to annotated aggregate function

trinodb · May 27, 2022 · 78bae25 · 78bae25
1 parent 62fecd0
commit 78bae25
Show file tree

Hide file tree

Showing 21 changed files with 848 additions and 442 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java b/core/trino-main/src/main/java/io/trino/metadata/SystemFunctionBundle.java
@@ -57,11 +57,13 @@
 import io.trino.operator.aggregation.MapAggregationFunction;
 import io.trino.operator.aggregation.MapUnionAggregation;
 import io.trino.operator.aggregation.MaxAggregationFunction;
+import io.trino.operator.aggregation.MaxByAggregationFunction;
 import io.trino.operator.aggregation.MaxDataSizeForStats;
 import io.trino.operator.aggregation.MergeHyperLogLogAggregation;
 import io.trino.operator.aggregation.MergeQuantileDigestFunction;
 import io.trino.operator.aggregation.MergeTDigestAggregation;
 import io.trino.operator.aggregation.MinAggregationFunction;
+import io.trino.operator.aggregation.MinByAggregationFunction;
 import io.trino.operator.aggregation.QuantileDigestAggregationFunction.BigintQuantileDigestAggregationFunction;
 import io.trino.operator.aggregation.QuantileDigestAggregationFunction.DoubleQuantileDigestAggregationFunction;
 import io.trino.operator.aggregation.QuantileDigestAggregationFunction.RealQuantileDigestAggregationFunction;
@@ -78,10 +80,8 @@
 import io.trino.operator.aggregation.VarianceAggregation;
 import io.trino.operator.aggregation.histogram.Histogram;
 import io.trino.operator.aggregation.listagg.ListaggAggregationFunction;
-import io.trino.operator.aggregation.minmaxby.MaxByAggregationFunction;
-import io.trino.operator.aggregation.minmaxby.MaxByNAggregationFunction;
-import io.trino.operator.aggregation.minmaxby.MinByAggregationFunction;
-import io.trino.operator.aggregation.minmaxby.MinByNAggregationFunction;
+import io.trino.operator.aggregation.minmaxbyn.MaxByNAggregationFunction;
+import io.trino.operator.aggregation.minmaxbyn.MinByNAggregationFunction;
 import io.trino.operator.aggregation.minmaxn.MaxNAggregationFunction;
 import io.trino.operator.aggregation.minmaxn.MinNAggregationFunction;
 import io.trino.operator.aggregation.multimapagg.MultimapAggregationFunction;
@@ -544,13 +544,14 @@ public static FunctionBundle create(FeaturesConfig featuresConfig, TypeOperators
                 .aggregates(ChecksumAggregationFunction.class)
                 .aggregates(ArbitraryAggregationFunction.class)
                 .functions(GREATEST, LEAST)
-                .functions(new MaxByNAggregationFunction(blockTypeOperators), new MinByNAggregationFunction(blockTypeOperators))
                 .aggregates(MinAggregationFunction.class)
                 .aggregates(MaxAggregationFunction.class)
                 .aggregates(MinByAggregationFunction.class)
                 .aggregates(MaxByAggregationFunction.class)
                 .aggregates(MaxNAggregationFunction.class)
                 .aggregates(MinNAggregationFunction.class)
+                .aggregates(MinByNAggregationFunction.class)
+                .aggregates(MaxByNAggregationFunction.class)
                 .aggregates(CountColumn.class)
                 .functions(JSON_TO_ROW, JSON_STRING_TO_ROW, ROW_TO_ROW_CAST)
                 .functions(VARCHAR_CONCAT, VARBINARY_CONCAT)

diff --git a/...on/minmaxby/MaxByAggregationFunction.java → ...aggregation/MaxByAggregationFunction.java b/...on/minmaxby/MaxByAggregationFunction.java → ...aggregation/MaxByAggregationFunction.java
@@ -11,9 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.operator.aggregation.minmaxby;
+package io.trino.operator.aggregation;
 
-import io.trino.operator.aggregation.NullablePosition;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AggregationFunction;

diff --git a/...on/minmaxby/MinByAggregationFunction.java → ...aggregation/MinByAggregationFunction.java b/...on/minmaxby/MinByAggregationFunction.java → ...aggregation/MinByAggregationFunction.java
@@ -11,9 +11,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.trino.operator.aggregation.minmaxby;
+package io.trino.operator.aggregation;
 
-import io.trino.operator.aggregation.NullablePosition;
 import io.trino.spi.block.Block;
 import io.trino.spi.block.BlockBuilder;
 import io.trino.spi.function.AggregationFunction;

diff --git a/...ain/java/io/trino/operator/aggregation/minmaxby/AbstractMinMaxByNAggregationFunction.java b/...ain/java/io/trino/operator/aggregation/minmaxby/AbstractMinMaxByNAggregationFunction.java
diff --git a/...rino-main/src/main/java/io/trino/operator/aggregation/minmaxby/MinMaxByNStateFactory.java b/...rino-main/src/main/java/io/trino/operator/aggregation/minmaxby/MinMaxByNStateFactory.java