Add support to first/last aggregators for numeric types during ingestion #10949
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,116 @@ | ||||||
| /* | ||||||
| * Licensed to the Apache Software Foundation (ASF) under one | ||||||
| * or more contributor license agreements. See the NOTICE file | ||||||
| * distributed with this work for additional information | ||||||
| * regarding copyright ownership. The ASF licenses this file | ||||||
| * to you 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 org.apache.druid.query.aggregation; | ||||||
|
|
||||||
| import com.google.common.primitives.Longs; | ||||||
| import org.apache.druid.collections.SerializablePair; | ||||||
| import org.apache.druid.data.input.InputRow; | ||||||
| import org.apache.druid.segment.GenericColumnSerializer; | ||||||
| import org.apache.druid.segment.column.ColumnBuilder; | ||||||
| import org.apache.druid.segment.data.GenericIndexed; | ||||||
| import org.apache.druid.segment.data.ObjectStrategy; | ||||||
| import org.apache.druid.segment.serde.ComplexColumnPartSupplier; | ||||||
| import org.apache.druid.segment.serde.ComplexMetricExtractor; | ||||||
| import org.apache.druid.segment.serde.ComplexMetricSerde; | ||||||
| import org.apache.druid.segment.serde.LargeColumnSupportedComplexColumnSerializer; | ||||||
| import org.apache.druid.segment.writeout.SegmentWriteOutMedium; | ||||||
|
|
||||||
| import javax.annotation.Nullable; | ||||||
| import java.nio.ByteBuffer; | ||||||
|
|
||||||
| /** | ||||||
| * The class serializes a Pair<Long, ?> object for double/float/longFirst and double/float/longLast aggregators | ||||||
| */ | ||||||
| public abstract class AbstractSerializablePairSerde<T extends SerializablePair<Long, ?>> extends ComplexMetricSerde | ||||||
|
There was a problem hiding this comment. nit: change class name to
Suggested change
|
||||||
| { | ||||||
| private final Class<T> pairClassObject; | ||||||
|
|
||||||
| public AbstractSerializablePairSerde(Class<T> pairClassObject) | ||||||
| { | ||||||
| this.pairClassObject = pairClassObject; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public ComplexMetricExtractor getExtractor() | ||||||
| { | ||||||
| return new ComplexMetricExtractor() | ||||||
| { | ||||||
| @Override | ||||||
| public Class<T> extractedClass() | ||||||
| { | ||||||
| return pairClassObject; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public Object extractValue(InputRow inputRow, String metricName) | ||||||
| { | ||||||
| return inputRow.getRaw(metricName); | ||||||
| } | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public void deserializeColumn(ByteBuffer buffer, ColumnBuilder columnBuilder) | ||||||
| { | ||||||
| final GenericIndexed column = GenericIndexed.read(buffer, getObjectStrategy(), columnBuilder.getFileMapper()); | ||||||
| columnBuilder.setComplexColumnSupplier(new ComplexColumnPartSupplier(getTypeName(), column)); | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public ObjectStrategy<T> getObjectStrategy() | ||||||
| { | ||||||
| return new ObjectStrategy<T>() | ||||||
| { | ||||||
| @Override | ||||||
| public int compare(@Nullable T o1, @Nullable T o2) | ||||||
| { | ||||||
| return Longs.compare(o1.lhs, o2.lhs); | ||||||
|
There was a problem hiding this comment. This does not correctly handle if either o1 or o2 is null. See Would it be possible to update the integration tests that were added to surface this error? There was a problem hiding this comment. I will check if UT is able to check this error first because IT cases share some data sources with other cases. |
||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public Class<T> getClazz() | ||||||
| { | ||||||
| return pairClassObject; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public T fromByteBuffer(ByteBuffer buffer, int numBytes) | ||||||
| { | ||||||
| return toPairObject(buffer); | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public byte[] toBytes(T val) | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| { | ||||||
| return pairToBytes(val); | ||||||
| } | ||||||
| }; | ||||||
| } | ||||||
|
|
||||||
| @Override | ||||||
| public GenericColumnSerializer<T> getSerializer(SegmentWriteOutMedium segmentWriteOutMedium, String column) | ||||||
| { | ||||||
| return LargeColumnSupportedComplexColumnSerializer.create(segmentWriteOutMedium, column, this.getObjectStrategy()); | ||||||
| } | ||||||
|
|
||||||
| protected abstract T toPairObject(ByteBuffer buffer); | ||||||
|
|
||||||
| protected abstract byte[] pairToBytes(T val); | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. In the new commit, null check is added to the caller of this method, so it's not necessary to declare this parameter as |
||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.druid.query.aggregation; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonProperty; | ||
| import org.apache.druid.collections.SerializablePair; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| public class SerializablePairLongDouble extends SerializablePair<Long, Double> | ||
| { | ||
| @JsonCreator | ||
| public SerializablePairLongDouble(@JsonProperty("lhs") Long lhs, @JsonProperty("rhs") @Nullable Double rhs) | ||
| { | ||
| super(lhs, rhs); | ||
| } | ||
| } | ||
|
|
||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you describe why you chose not to also make
SerializablePairLongStringSerdenot extend this class?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's reasonable to refactor
SerializablePairLongStringSerdeto be subclass ofAbstractSerializablePairSerde, but I think this kind of change is not tightly related to this PR because this PR is already a little bit large. I think a coming PR would resolve this problem once this PR is merged.