-
Notifications
You must be signed in to change notification settings - Fork 3.7k
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.
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
Vectorize earliest aggregator for both numeric and string types #14408
Merged
Merged
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
2b556f6
Vectorizing earliest for numeric
somu-imply 59118ae
Vectorizing earliest string aggregator
somu-imply 6c139de
checkstyle fix
somu-imply 556b3de
Removing unnecessary exceptions
somu-imply cf6fe0f
Ignoring tests in MSQ as earliest is not supported for numeric there
somu-imply df3db6e
Merge remote-tracking branch 'upstream/master' into vectorize_earlies…
somu-imply cf88e00
Fixing benchmarks
somu-imply a9a6fc2
Updating tests as MSQ does not support earliest for some cases
somu-imply 5f65c42
Merge remote-tracking branch 'upstream/master' into vectorize_earlies…
somu-imply f78ca05
Addressing review comments by adding the following:
somu-imply 6cae490
Addressing issues for dictionary encoded single string columns where …
somu-imply ef87989
Adding a flag for multi value dimension selector
somu-imply 4c5813d
Addressing comments
somu-imply 67fce5f
1 more change
somu-imply ccfd600
Merge remote-tracking branch 'upstream/master' into vectorize_earlies…
somu-imply 1c372af
Handling review comments part 1
somu-imply aa97181
Merge remote-tracking branch 'upstream/master' into vectorize_earlies…
somu-imply f585412
Handling review comments and correctness fix for latest_by when the t…
somu-imply 4291709
Updating numeric first vector agg
somu-imply 44c3a4c
Merge remote-tracking branch 'upstream/master' into vectorize_earlies…
somu-imply 890c865
Revert "Updating numeric first vector agg"
somu-imply 6e75540
Updating code for correctness issues
somu-imply 3664b87
fixing an issue with latest agg
somu-imply 83a784a
Adding more comments and removing an unnecessary check
somu-imply 47762c4
Merge remote-tracking branch 'upstream/master' into vectorize_earlies…
somu-imply f4ddb7c
Addressing null checks for tie selector and only vectorize false for …
somu-imply File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
61 changes: 61 additions & 0 deletions
61
...g/src/main/java/org/apache/druid/query/aggregation/first/DoubleFirstVectorAggregator.java
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,61 @@ | ||
/* | ||
* 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; | ||
|
||
public class DoubleFirstVectorAggregator extends NumericFirstVectorAggregator | ||
{ | ||
|
||
public DoubleFirstVectorAggregator(VectorValueSelector timeSelector, VectorValueSelector valueSelector) | ||
{ | ||
super(timeSelector, valueSelector); | ||
} | ||
|
||
@Override | ||
public void initValue(ByteBuffer buf, int position) | ||
{ | ||
buf.putDouble(position, 0); | ||
} | ||
|
||
|
||
@Override | ||
void putValue(ByteBuffer buf, int position, int index) | ||
{ | ||
double firstValue = valueSelector.getDoubleVector()[index]; | ||
buf.putDouble(position, firstValue); | ||
} | ||
|
||
|
||
/** | ||
* @return The object as a pair with the position and the value 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.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
61 changes: 61 additions & 0 deletions
61
...ng/src/main/java/org/apache/druid/query/aggregation/first/FloatFirstVectorAggregator.java
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,61 @@ | ||
/* | ||
* 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; | ||
|
||
public class FloatFirstVectorAggregator extends NumericFirstVectorAggregator | ||
{ | ||
|
||
public FloatFirstVectorAggregator(VectorValueSelector timeSelector, VectorValueSelector valueSelector) | ||
{ | ||
super(timeSelector, valueSelector); | ||
} | ||
|
||
@Override | ||
public void initValue(ByteBuffer buf, int position) | ||
{ | ||
buf.putFloat(position, 0); | ||
} | ||
|
||
|
||
@Override | ||
void putValue(ByteBuffer buf, int position, int index) | ||
{ | ||
float firstValue = valueSelector.getFloatVector()[index]; | ||
buf.putFloat(position, firstValue); | ||
} | ||
|
||
|
||
/** | ||
* @return The object as a pair with the position and the value 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
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.
nit: fwiw these benchmarks were primarily meant for testing vectorized expression virtual columns,
SqlBenchmark
is the general purpose place for measuring stuff, that said these don't hurt being here and they have a bit less baggage thanSqlBenchmark