Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add experimental support for first/last for double/float/long #10702 #14462

Merged
merged 17 commits into from
Dec 12, 2023
Merged

Add experimental support for first/last for double/float/long #10702 #14462

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
32bca40
Add support for first/last for double/float/long #10702
ankit0811 Jun 21, 2023
e35a906
Addressing comments
ankit0811 Aug 2, 2023
b309b2d
Merge remote-tracking branch 'upstream/master' into feature_FirstLast…
Aug 2, 2023
5389438
static check jdk-17 fix
ankit0811 Aug 2, 2023
90fd6e7
update index/query for tests-ex/IT cases
ankit0811 Aug 3, 2023
8fc6276
fixing batch IT failure
ankit0811 Aug 7, 2023
258213b
avoid GenericIndexed for creating columns in favor of SerializablePai…
ankit0811 Oct 2, 2023
2955d00
Merge remote-tracking branch 'upstream/master' into feature_FirstLast…
Oct 2, 2023
ea8fea5
post merge fix
ankit0811 Oct 2, 2023
97d1dac
failure (firstVectorAggregator) fix
ankit0811 Oct 3, 2023
f5a1c50
Change *VectorAggregator to support pair serdes
ankit0811 Oct 12, 2023
33c7d85
fix UT + static check failures
ankit0811 Oct 12, 2023
c4fa03e
address comments
ankit0811 Dec 1, 2023
e3cc206
address comments + fix failure checks
ankit0811 Dec 1, 2023
edd7a88
intellij-inspections failure fix
ankit0811 Dec 7, 2023
17a74dc
Merge remote-tracking branch 'upstream/master' into feature_FirstLast…
Dec 7, 2023
3397717
addressing comments + extending LongString to the abstract classes
ankit0811 Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion integration-tests-ex/cases/src/test/resources/indexer/wikipedia_merge_index_queries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,36 @@
"type":"stringLast",
"name":"latest_user",
"fieldName":"last_user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "double_first_delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "double_last_delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "long_first_delta"
},
{
"type": "longFirst",
"name": "long_last_delta",
"fieldName": "long_last_delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "float_first_delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "float_last_delta"
}
]
},
Expand All @@ -35,7 +65,13 @@
"event" : {
"continent":"Asia",
"earliest_user":"masterYi",
"latest_user":"stringer"
"latest_user":"stringer",
"double_first_delta": 111.0,
"double_last_delta": -9.0,
"long_first_delta": 111,
"long_last_delta": -9,
"float_first_delta": 111.0,
"float_last_delta": -9.0
}
} ]
}
Expand Down
30 changes: 30 additions & 0 deletions integration-tests-ex/cases/src/test/resources/indexer/wikipedia_merge_index_task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,36 @@
"type": "stringLast",
"name": "last_user",
"fieldName": "user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "delta"
},
{
"type": "longLast",
"name": "long_last_delta",
"fieldName": "delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "delta"
}
],
"granularitySpec": {
Expand Down
30 changes: 30 additions & 0 deletions ...-ex/cases/src/test/resources/indexer/wikipedia_merge_reindex_druid_input_source_task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,36 @@
"type": "stringLast",
"name": "last_user",
"fieldName": "last_user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "double_first_delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "double_last_delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "long_first_delta"
},
{
"type": "longLast",
"name": "long_last_delta",
"fieldName": "long_last_delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "float_first_delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "float_last_delta"
}
]
}
Expand Down
30 changes: 30 additions & 0 deletions integration-tests-ex/cases/src/test/resources/indexer/wikipedia_merge_reindex_task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,36 @@
"type": "stringLast",
"name": "last_user",
"fieldName": "last_user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "double_first_delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "double_last_delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "long_first_delta"
},
{
"type": "longLast",
"name": "long_last_delta",
"fieldName": "long_last_delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "float_first_delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "float_last_delta"
}
],
"granularitySpec": {
Expand Down
38 changes: 37 additions & 1 deletion integration-tests/src/test/resources/indexer/wikipedia_merge_index_queries.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,36 @@
"type":"stringLast",
"name":"latest_user",
"fieldName":"last_user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "double_first_delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "double_last_delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "long_first_delta"
},
{
"type": "longFirst",
"name": "long_last_delta",
"fieldName": "long_last_delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "float_first_delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "float_last_delta"
}
]
},
Expand All @@ -35,7 +65,13 @@
"event" : {
"continent":"Asia",
"earliest_user":"masterYi",
"latest_user":"stringer"
"latest_user":"stringer",
"double_first_delta": 111.0,
"double_last_delta": -9.0,
"long_first_delta": 111,
"long_last_delta": -9,
"float_first_delta": 111.0,
"float_last_delta": -9.0
}
} ]
}
Expand Down
30 changes: 30 additions & 0 deletions integration-tests/src/test/resources/indexer/wikipedia_merge_index_task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,36 @@
"type": "stringLast",
"name": "last_user",
"fieldName": "user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "delta"
},
{
"type": "longLast",
"name": "long_last_delta",
"fieldName": "delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "delta"
}
],
"granularitySpec": {
Expand Down
30 changes: 30 additions & 0 deletions ...ion-tests/src/test/resources/indexer/wikipedia_merge_reindex_druid_input_source_task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,36 @@
"type": "stringLast",
"name": "last_user",
"fieldName": "last_user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "double_first_delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "double_last_delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "long_first_delta"
},
{
"type": "longLast",
"name": "long_last_delta",
"fieldName": "long_last_delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "float_first_delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "float_last_delta"
}
]
}
Expand Down
30 changes: 30 additions & 0 deletions integration-tests/src/test/resources/indexer/wikipedia_merge_reindex_task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,36 @@
"type": "stringLast",
"name": "last_user",
"fieldName": "last_user"
},
{
"type": "doubleFirst",
"name": "double_first_delta",
"fieldName": "double_first_delta"
},
{
"type": "doubleLast",
"name": "double_last_delta",
"fieldName": "double_last_delta"
},
{
"type": "longFirst",
"name": "long_first_delta",
"fieldName": "long_first_delta"
},
{
"type": "longLast",
"name": "long_last_delta",
"fieldName": "long_last_delta"
},
{
"type": "floatFirst",
"name": "float_first_delta",
"fieldName": "float_first_delta"
},
{
"type": "floatLast",
"name": "float_last_delta",
"fieldName": "float_last_delta"
}
],
"granularitySpec": {
Expand Down
7 changes: 7 additions & 0 deletions processing/src/main/java/org/apache/druid/jackson/AggregatorsModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
import org.apache.druid.query.aggregation.LongMinAggregatorFactory;
import org.apache.druid.query.aggregation.LongSumAggregatorFactory;
import org.apache.druid.query.aggregation.PostAggregator;
import org.apache.druid.query.aggregation.SerializablePairLongDoubleComplexMetricSerde;
import org.apache.druid.query.aggregation.SerializablePairLongFloatComplexMetricSerde;
import org.apache.druid.query.aggregation.SerializablePairLongLongComplexMetricSerde;
import org.apache.druid.query.aggregation.SerializablePairLongStringComplexMetricSerde;
import org.apache.druid.query.aggregation.any.DoubleAnyAggregatorFactory;
import org.apache.druid.query.aggregation.any.FloatAnyAggregatorFactory;
Expand Down Expand Up @@ -83,6 +86,10 @@ public AggregatorsModule()
ComplexMetrics.registerSerde(PreComputedHyperUniquesSerde.TYPE_NAME, new PreComputedHyperUniquesSerde());
ComplexMetrics.registerSerde(SerializablePairLongStringComplexMetricSerde.TYPE_NAME, new SerializablePairLongStringComplexMetricSerde());

ComplexMetrics.registerSerde(SerializablePairLongFloatComplexMetricSerde.TYPE_NAME, new SerializablePairLongFloatComplexMetricSerde());
ComplexMetrics.registerSerde(SerializablePairLongDoubleComplexMetricSerde.TYPE_NAME, new SerializablePairLongDoubleComplexMetricSerde());
ComplexMetrics.registerSerde(SerializablePairLongLongComplexMetricSerde.TYPE_NAME, new SerializablePairLongLongComplexMetricSerde());

setMixInAnnotation(AggregatorFactory.class, AggregatorFactoryMixin.class);
setMixInAnnotation(PostAggregator.class, PostAggregatorMixin.class);

Expand Down
Loading
Loading