This is an automated email from the ASF dual-hosted git repository.

lakshsingla pushed a change to branch 30.0.0
in repository https://gitbox.apache.org/repos/asf/druid.git


    from 6b29f7d1952 [Backport] 15705 & 16368 to Druid 30  (#16384)
     add 358b06e292c Improve code flow in the First/Last vector aggregators and 
unify the numeric aggregators with the String implementations  (#16230) (#16396)

No new revisions were added by this update.

Summary of changes:
 .../indexing/common/task/CompactionTaskTest.java   |   4 +-
 .../apache/druid/jackson/AggregatorsModule.java    |  20 +-
 .../any/StringAnyAggregatorFactory.java            |   2 +-
 .../query/aggregation/first/FirstLastUtils.java    |  69 ------
 .../first/NumericFirstVectorAggregator.java        | 225 -----------------
 ...SingleStringFirstDimensionVectorAggregator.java | 125 ----------
 .../first/StringFirstVectorAggregator.java         | 184 --------------
 .../firstlast/DoubleFirstLastVectorAggregator.java | 123 ++++++++++
 .../aggregation/firstlast/FirstLastUtils.java      | 155 ++++++++++++
 .../firstlast/FirstLastVectorAggregator.java       | 266 +++++++++++++++++++++
 .../firstlast/FloatFirstLastVectorAggregator.java  | 122 ++++++++++
 .../firstlast/LongFirstLastVectorAggregator.java   | 121 ++++++++++
 .../aggregation/firstlast/SelectionPredicate.java  |  70 ++++++
 ...leStringFirstLastDimensionVectorAggregator.java | 185 ++++++++++++++
 .../{first => firstlast}/StringFirstLastUtils.java |  24 +-
 .../firstlast/StringFirstLastVectorAggregator.java | 110 +++++++++
 .../first/DoubleFirstAggregator.java               |   2 +-
 .../first/DoubleFirstAggregatorFactory.java        |   3 +-
 .../first/DoubleFirstBufferAggregator.java         |   2 +-
 .../first/DoubleFirstVectorAggregator.java         |  40 +---
 .../first/FloatFirstAggregator.java                |   2 +-
 .../first/FloatFirstAggregatorFactory.java         |   3 +-
 .../first/FloatFirstBufferAggregator.java          |   2 +-
 .../first/FloatFirstVectorAggregator.java          |  39 +--
 .../first/GenericFirstAggregateCombiner.java       |   2 +-
 .../{ => firstlast}/first/LongFirstAggregator.java |   2 +-
 .../first/LongFirstAggregatorFactory.java          |   3 +-
 .../first/LongFirstBufferAggregator.java           |   2 +-
 .../first/LongFirstVectorAggregator.java           |  38 +--
 .../first/NumericFirstAggregator.java              |   2 +-
 .../first/NumericFirstBufferAggregator.java        |   2 +-
 ...ingleStringFirstDimensionVectorAggregator.java} |  27 +--
 .../first/StringFirstAggregator.java               |   3 +-
 .../first/StringFirstAggregatorFactory.java        |  12 +-
 .../first/StringFirstBufferAggregator.java         |   3 +-
 .../first/StringFirstFoldingAggregatorFactory.java |   2 +-
 .../first/StringFirstVectorAggregator.java}        |  30 ++-
 .../{ => firstlast}/last/DoubleLastAggregator.java |   2 +-
 .../last/DoubleLastAggregatorFactory.java          |   6 +-
 .../last/DoubleLastBufferAggregator.java           |   2 +-
 .../last/DoubleLastVectorAggregator.java           |  43 +---
 .../{ => firstlast}/last/FloatLastAggregator.java  |   2 +-
 .../last/FloatLastAggregatorFactory.java           |   6 +-
 .../last/FloatLastBufferAggregator.java            |   2 +-
 .../last/FloatLastVectorAggregator.java            |  44 +---
 .../last/GenericLastAggregateCombiner.java         |   2 +-
 .../{ => firstlast}/last/LongLastAggregator.java   |   2 +-
 .../last/LongLastAggregatorFactory.java            |  10 +-
 .../last/LongLastBufferAggregator.java             |   2 +-
 .../last/LongLastVectorAggregator.java}            |  23 +-
 .../last/NumericLastAggregator.java                |   4 +-
 .../last/NumericLastBufferAggregator.java          |   4 +-
 ...SingleStringLastDimensionVectorAggregator.java} |  27 +--
 .../{ => firstlast}/last/StringLastAggregator.java |   4 +-
 .../last/StringLastAggregatorFactory.java          |  12 +-
 .../last/StringLastBufferAggregator.java           |   4 +-
 .../last/StringLastFoldingAggregatorFactory.java   |   2 +-
 .../last/StringLastVectorAggregator.java}          |  30 ++-
 .../aggregation/last/LongLastVectorAggregator.java |  72 ------
 .../last/NumericLastVectorAggregator.java          | 228 ------------------
 .../SingleStringLastDimensionVectorAggregator.java | 124 ----------
 .../last/StringLastVectorAggregator.java           | 200 ----------------
 .../query/aggregation/AggregatorFactoryTest.java   |  16 +-
 .../first/DoubleFirstAggregationTest.java          |   2 +-
 .../first/DoubleFirstVectorAggregatorTest.java}    |  48 +++-
 .../first/FloatFirstAggregationTest.java           |   2 +-
 .../first/FloatFirstVectorAggregatorTest.java}     |  26 +-
 .../first/LongFirstAggregationTest.java            |   2 +-
 .../first/LongFirstVectorAggregatorTest.java}      |  24 +-
 .../first/StringFirstAggregationTest.java          |   2 +-
 .../first/StringFirstBufferAggregatorTest.java     |   2 +-
 .../first/StringFirstLastUtilsTest.java            |   3 +-
 .../first/StringFirstTimeseriesQueryTest.java      |   2 +-
 .../first/StringFirstVectorAggregatorTest.java     |  15 +-
 .../last/DoubleLastAggregationTest.java            |   2 +-
 .../last/DoubleLastVectorAggregatorTest.java       |  46 +++-
 .../last/FloatLastAggregationTest.java             |   2 +-
 .../last/FloatLastVectorAggregatorTest.java        |  23 +-
 .../last/LongLastAggregationTest.java              |   2 +-
 .../last/LongLastVectorAggregatorTest.java         |  84 ++++++-
 .../last/StringLastAggregationTest.java            |   2 +-
 .../last/StringLastBufferAggregatorTest.java       |   2 +-
 .../last/StringLastTimeseriesQueryTest.java        |   2 +-
 .../last/StringLastVectorAggregatorTest.java       |  25 +-
 .../FinalizingFieldAccessPostAggregatorTest.java   |   2 +-
 .../groupby/GroupByQueryQueryToolChestTest.java    |   8 +-
 .../query/groupby/GroupByQueryRunnerTest.java      |   4 +-
 .../TimeseriesQueryQueryToolChestTest.java         |   2 +-
 .../timeseries/TimeseriesQueryRunnerTest.java      |   4 +-
 .../query/topn/TopNQueryQueryToolChestTest.java    |   8 +-
 .../druid/query/topn/TopNQueryRunnerTest.java      |  10 +-
 .../query/topn/UnnestTopNQueryRunnerTest.java      |   2 +-
 .../druid/segment/IndexMergerRollupTest.java       |  16 +-
 .../segment/column/SchemaPayloadPlusTest.java      |   2 +-
 .../druid/segment/column/SchemaPayloadTest.java    |   2 +-
 .../segment/column/SegmentSchemaMappingTest.java   |   2 +-
 .../segment/metadata/FingerprintGeneratorTest.java |   2 +-
 .../metadata/SegmentSchemaBackFillQueueTest.java   |   2 +-
 .../segment/metadata/SegmentSchemaManagerTest.java |   2 +-
 .../builtin/EarliestLatestAnySqlAggregator.java    |  16 +-
 .../apache/druid/sql/calcite/CalciteQueryTest.java |  16 +-
 .../druid/sql/calcite/CalciteSimpleQueryTest.java  |   4 +-
 .../druid/sql/calcite/util/TestDataBuilder.java    |  10 +-
 103 files changed, 1614 insertions(+), 1717 deletions(-)
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/first/FirstLastUtils.java
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/first/NumericFirstVectorAggregator.java
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/first/SingleStringFirstDimensionVectorAggregator.java
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstVectorAggregator.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/DoubleFirstLastVectorAggregator.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/FirstLastUtils.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/FirstLastVectorAggregator.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/FloatFirstLastVectorAggregator.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/LongFirstLastVectorAggregator.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/SelectionPredicate.java
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/SingleStringFirstLastDimensionVectorAggregator.java
 rename processing/src/main/java/org/apache/druid/query/aggregation/{first => 
firstlast}/StringFirstLastUtils.java (90%)
 create mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/firstlast/StringFirstLastVectorAggregator.java
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/DoubleFirstAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/DoubleFirstAggregatorFactory.java (98%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/DoubleFirstBufferAggregator.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/DoubleFirstVectorAggregator.java (50%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/FloatFirstAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/FloatFirstAggregatorFactory.java (98%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/FloatFirstBufferAggregator.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/FloatFirstVectorAggregator.java (51%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/GenericFirstAggregateCombiner.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/LongFirstAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/LongFirstAggregatorFactory.java (98%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/LongFirstBufferAggregator.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/LongFirstVectorAggregator.java (51%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/NumericFirstAggregator.java (98%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/NumericFirstBufferAggregator.java (98%)
 copy 
processing/src/main/java/org/apache/druid/query/aggregation/{last/StringLastFoldingAggregatorFactory.java
 => firstlast/first/SingleStringFirstDimensionVectorAggregator.java} (51%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstAggregatorFactory.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstBufferAggregator.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstFoldingAggregatorFactory.java (96%)
 copy 
processing/src/main/java/org/apache/druid/query/aggregation/{last/StringLastFoldingAggregatorFactory.java
 => firstlast/first/StringFirstVectorAggregator.java} (53%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/DoubleLastAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/DoubleLastAggregatorFactory.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/DoubleLastBufferAggregator.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/DoubleLastVectorAggregator.java (50%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/FloatLastAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/FloatLastAggregatorFactory.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/FloatLastBufferAggregator.java (97%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/FloatLastVectorAggregator.java (50%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/GenericLastAggregateCombiner.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/LongLastAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/LongLastAggregatorFactory.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/LongLastBufferAggregator.java (97%)
 copy 
processing/src/main/java/org/apache/druid/query/aggregation/{last/StringLastFoldingAggregatorFactory.java
 => firstlast/last/LongLastVectorAggregator.java} (51%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/NumericLastAggregator.java (95%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/NumericLastBufferAggregator.java (96%)
 copy 
processing/src/main/java/org/apache/druid/query/aggregation/{last/StringLastFoldingAggregatorFactory.java
 => firstlast/last/SingleStringLastDimensionVectorAggregator.java} (51%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastAggregator.java (96%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastAggregatorFactory.java (94%)
 rename processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastBufferAggregator.java (97%)
 copy processing/src/main/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastFoldingAggregatorFactory.java (96%)
 rename 
processing/src/main/java/org/apache/druid/query/aggregation/{last/StringLastFoldingAggregatorFactory.java
 => firstlast/last/StringLastVectorAggregator.java} (53%)
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/last/LongLastVectorAggregator.java
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/last/NumericLastVectorAggregator.java
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/last/SingleStringLastDimensionVectorAggregator.java
 delete mode 100644 
processing/src/main/java/org/apache/druid/query/aggregation/last/StringLastVectorAggregator.java
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/DoubleFirstAggregationTest.java (99%)
 rename 
processing/src/test/java/org/apache/druid/query/aggregation/{first/DoubleFirstVectorAggregationTest.java
 => firstlast/first/DoubleFirstVectorAggregatorTest.java} (86%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/FloatFirstAggregationTest.java (99%)
 rename 
processing/src/test/java/org/apache/druid/query/aggregation/{first/FloatFirstVectorAggregationTest.java
 => firstlast/first/FloatFirstVectorAggregatorTest.java} (92%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/LongFirstAggregationTest.java (99%)
 rename 
processing/src/test/java/org/apache/druid/query/aggregation/{first/LongFirstVectorAggregationTest.java
 => firstlast/first/LongFirstVectorAggregatorTest.java} (92%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstAggregationTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstBufferAggregatorTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstLastUtilsTest.java (94%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstTimeseriesQueryTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/first/StringFirstVectorAggregatorTest.java (96%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/DoubleLastAggregationTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/DoubleLastVectorAggregatorTest.java (87%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/FloatLastAggregationTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/FloatLastVectorAggregatorTest.java (92%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/LongLastAggregationTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/LongLastVectorAggregatorTest.java (80%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastAggregationTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastBufferAggregatorTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastTimeseriesQueryTest.java (99%)
 rename processing/src/test/java/org/apache/druid/query/aggregation/{ => 
firstlast}/last/StringLastVectorAggregatorTest.java (95%)


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to