Vectorize earliest aggregator for both numeric and string types #14408
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| * 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.first; | ||
|
|
||
| import org.apache.druid.collections.SerializablePair; | ||
| import org.apache.druid.segment.vector.VectorValueSelector; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.nio.ByteBuffer; | ||
|
|
||
| /** | ||
| * Vectorized version of on heap 'earliest' aggregator for column selectors with type LONG.. | ||
| */ | ||
| public class DoubleFirstVectorAggregator extends NumericFirstVectorAggregator | ||
| { | ||
| double firstValue; | ||
|
|
||
| public DoubleFirstVectorAggregator(VectorValueSelector timeSelector, VectorValueSelector valueSelector) | ||
| { | ||
| super(timeSelector, valueSelector); | ||
| firstValue = 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void initValue(ByteBuffer buf, int position) | ||
| { | ||
| buf.putDouble(position, 0); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| void putValue(ByteBuffer buf, int position, int index) | ||
| { | ||
| firstValue = valueSelector.getDoubleVector()[index]; | ||
| buf.putDouble(position, firstValue); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @return The primitive object stored at the position in the buffer. | ||
|
There was a problem hiding this comment. This comment says that it's returning a primitive, but the method is returning a SerializablePair. Which one is supposed to be correct? |
||
| */ | ||
| @Nullable | ||
| @Override | ||
| public Object get(ByteBuffer buf, int position) | ||
| { | ||
| final boolean rhsNull = isValueNull(buf, position); | ||
| return new SerializablePair<>(buf.getLong(position), rhsNull ? null : buf.getDouble(position + VALUE_OFFSET)); | ||
| } | ||
| } | ||
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,66 @@ | ||
| /* | ||
| * 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.first; | ||
|
|
||
| import org.apache.druid.collections.SerializablePair; | ||
| import org.apache.druid.segment.vector.VectorValueSelector; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.nio.ByteBuffer; | ||
|
|
||
| /** | ||
| * Vectorized version of on heap 'earliest' aggregator for column selectors with type LONG.. | ||
| */ | ||
| public class FloatFirstVectorAggregator extends NumericFirstVectorAggregator | ||
| { | ||
| float firstValue; | ||
|
|
||
| public FloatFirstVectorAggregator(VectorValueSelector timeSelector, VectorValueSelector valueSelector) | ||
| { | ||
| super(timeSelector, valueSelector); | ||
| firstValue = 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void initValue(ByteBuffer buf, int position) | ||
| { | ||
| buf.putFloat(position, 0); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| void putValue(ByteBuffer buf, int position, int index) | ||
| { | ||
| firstValue = valueSelector.getFloatVector()[index]; | ||
| buf.putFloat(position, firstValue); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @return The primitive object stored at the position in the buffer. | ||
| */ | ||
| @Nullable | ||
| @Override | ||
| public Object get(ByteBuffer buf, int position) | ||
| { | ||
| final boolean rhsNull = isValueNull(buf, position); | ||
| return new SerializablePair<>(buf.getLong(position), rhsNull ? null : buf.getFloat(position + VALUE_OFFSET)); | ||
| } | ||
| } |
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,66 @@ | ||
| /* | ||
| * 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.first; | ||
|
|
||
| import org.apache.druid.collections.SerializablePair; | ||
| import org.apache.druid.segment.vector.VectorValueSelector; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.nio.ByteBuffer; | ||
|
|
||
| /** | ||
| * Vectorized version of on heap 'earliest' aggregator for column selectors with type LONG.. | ||
| */ | ||
| public class LongFirstVectorAggregator extends NumericFirstVectorAggregator | ||
| { | ||
| long firstValue; | ||
|
There was a problem hiding this comment. any reason these are fields instead of just a local variable? |
||
|
|
||
| public LongFirstVectorAggregator(VectorValueSelector timeSelector, VectorValueSelector valueSelector) | ||
| { | ||
| super(timeSelector, valueSelector); | ||
| firstValue = 0; | ||
| } | ||
|
|
||
| @Override | ||
| public void initValue(ByteBuffer buf, int position) | ||
| { | ||
| buf.putLong(position, 0); | ||
| } | ||
|
|
||
|
|
||
| @Override | ||
| void putValue(ByteBuffer buf, int position, int index) | ||
| { | ||
| firstValue = valueSelector.getLongVector()[index]; | ||
| buf.putLong(position, firstValue); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @return The primitive object stored at the position in the buffer. | ||
| */ | ||
| @Nullable | ||
| @Override | ||
| public Object get(ByteBuffer buf, int position) | ||
| { | ||
| final boolean rhsNull = isValueNull(buf, position); | ||
| return new SerializablePair<>(buf.getLong(position), rhsNull ? null : buf.getLong(position + VALUE_OFFSET)); | ||
| } | ||
| } | ||
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.
Two things:
BaseLongVectorValueSelector, but the arguments onDoubleFirstVectorAggregatordon't seem to care about the cast at all. Either it's important that we cast and we force the case, OR it's not important and we shouldn't force the case. The current code makes me think that it's not important.