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

Jump to bottom

Latest aggregator factories should accept time as VectorValueSelecto… #14753

Merged
merged 3 commits into from
Aug 4, 2023
Merged

Latest aggregator factories should accept time as VectorValueSelecto… #14753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b4297a
Latest aggregator factorizes should accept time as VectorValueSelecto…
somu-imply Aug 4, 2023
081b7e1
Update sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTes…
somu-imply Aug 4, 2023
1e39f8d
Update sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTes…
somu-imply Aug 4, 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
4 changes: 2 additions & 2 deletions processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstLastUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.apache.druid.segment.NilColumnValueSelector;
import org.apache.druid.segment.column.ColumnCapabilities;
import org.apache.druid.segment.column.ValueType;
import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.VectorObjectSelector;
import org.apache.druid.segment.vector.VectorValueSelector;

import javax.annotation.Nullable;
import java.nio.ByteBuffer;
Expand Down Expand Up @@ -79,7 +79,7 @@ public static boolean objectNeedsFoldCheck(Object obj)
* index of bounds issues is the responsibility of the caller
*/
public static SerializablePairLongString readPairFromVectorSelectorsAtIndex(
BaseLongVectorValueSelector timeSelector,
VectorValueSelector timeSelector,
VectorObjectSelector valueSelector,
int index
)
Expand Down
5 changes: 2 additions & 3 deletions ...ng/src/main/java/org/apache/druid/query/aggregation/last/DoubleLastAggregatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.apache.druid.segment.column.ColumnCapabilities;
import org.apache.druid.segment.column.ColumnHolder;
import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.VectorColumnSelectorFactory;
import org.apache.druid.segment.vector.VectorValueSelector;

Expand Down Expand Up @@ -129,8 +128,8 @@ public VectorAggregator factorizeVector(
{
ColumnCapabilities capabilities = columnSelectorFactory.getColumnCapabilities(fieldName);
VectorValueSelector valueSelector = columnSelectorFactory.makeValueSelector(fieldName);
//time is always long
BaseLongVectorValueSelector timeSelector = (BaseLongVectorValueSelector) columnSelectorFactory.makeValueSelector(

VectorValueSelector timeSelector = columnSelectorFactory.makeValueSelector(
timeColumn);
if (capabilities == null || capabilities.isNumeric()) {
return new DoubleLastVectorAggregator(timeSelector, valueSelector);
Expand Down
5 changes: 2 additions & 3 deletions ...ing/src/main/java/org/apache/druid/query/aggregation/last/FloatLastAggregatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.apache.druid.segment.column.ColumnCapabilities;
import org.apache.druid.segment.column.ColumnHolder;
import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.VectorColumnSelectorFactory;
import org.apache.druid.segment.vector.VectorValueSelector;

Expand Down Expand Up @@ -141,8 +140,8 @@ public VectorAggregator factorizeVector(
{
ColumnCapabilities capabilities = columnSelectorFactory.getColumnCapabilities(fieldName);
VectorValueSelector valueSelector = columnSelectorFactory.makeValueSelector(fieldName);
//time is always long
BaseLongVectorValueSelector timeSelector = (BaseLongVectorValueSelector) columnSelectorFactory.makeValueSelector(

VectorValueSelector timeSelector = columnSelectorFactory.makeValueSelector(
timeColumn);
if (capabilities == null || capabilities.isNumeric()) {
return new FloatLastVectorAggregator(timeSelector, valueSelector);
Expand Down
3 changes: 1 addition & 2 deletions ...sing/src/main/java/org/apache/druid/query/aggregation/last/LongLastAggregatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import org.apache.druid.segment.column.ColumnCapabilities;
import org.apache.druid.segment.column.ColumnHolder;
import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.VectorColumnSelectorFactory;
import org.apache.druid.segment.vector.VectorValueSelector;

Expand Down Expand Up @@ -140,7 +139,7 @@ public VectorAggregator factorizeVector(
{
ColumnCapabilities capabilities = columnSelectorFactory.getColumnCapabilities(fieldName);
VectorValueSelector valueSelector = columnSelectorFactory.makeValueSelector(fieldName);
BaseLongVectorValueSelector timeSelector = (BaseLongVectorValueSelector) columnSelectorFactory.makeValueSelector(
VectorValueSelector timeSelector = columnSelectorFactory.makeValueSelector(
timeColumn);
if (capabilities == null || capabilities.isNumeric()) {
return new LongLastVectorAggregator(timeSelector, valueSelector);
Expand Down
4 changes: 2 additions & 2 deletions ...ng/src/main/java/org/apache/druid/query/aggregation/last/StringLastAggregatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
import org.apache.druid.segment.column.ColumnCapabilities;
import org.apache.druid.segment.column.ColumnHolder;
import org.apache.druid.segment.column.ColumnType;
import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.VectorColumnSelectorFactory;
import org.apache.druid.segment.vector.VectorObjectSelector;
import org.apache.druid.segment.vector.VectorValueSelector;

import javax.annotation.Nullable;
import java.nio.ByteBuffer;
Expand Down Expand Up @@ -159,7 +159,7 @@ public VectorAggregator factorizeVector(VectorColumnSelectorFactory selectorFact

ColumnCapabilities capabilities = selectorFactory.getColumnCapabilities(fieldName);
VectorObjectSelector vSelector = selectorFactory.makeObjectSelector(fieldName);
BaseLongVectorValueSelector timeSelector = (BaseLongVectorValueSelector) selectorFactory.makeValueSelector(
VectorValueSelector timeSelector = selectorFactory.makeValueSelector(
timeColumn);
if (capabilities != null) {
return new StringLastVectorAggregator(timeSelector, vSelector, maxStringBytes);
Expand Down
6 changes: 3 additions & 3 deletions ...ing/src/main/java/org/apache/druid/query/aggregation/last/StringLastVectorAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import org.apache.druid.query.aggregation.VectorAggregator;
import org.apache.druid.query.aggregation.first.StringFirstLastUtils;
import org.apache.druid.segment.DimensionHandlerUtils;
import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.VectorObjectSelector;
import org.apache.druid.segment.vector.VectorValueSelector;

import javax.annotation.Nullable;
import java.nio.ByteBuffer;
Expand All @@ -36,13 +36,13 @@ public class StringLastVectorAggregator implements VectorAggregator
DateTimes.MIN.getMillis(),
null
);
private final BaseLongVectorValueSelector timeSelector;
private final VectorValueSelector timeSelector;
private final VectorObjectSelector valueSelector;
private final int maxStringBytes;
protected long lastTime;

public StringLastVectorAggregator(
@Nullable final BaseLongVectorValueSelector timeSelector,
@Nullable final VectorValueSelector timeSelector,
final VectorObjectSelector valueSelector,
final int maxStringBytes
)
Expand Down
32 changes: 32 additions & 0 deletions sql/src/test/java/org/apache/druid/sql/calcite/CalciteQueryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,38 @@ public void testAnyAggregatorsOnHeapNumericNulls()
);
}

// This test is to check if time expressions are accepted properly by the vectorized last aggregator
@Test
public void testLatestVectorAggregatorsOnTimeExpression()
{
notMsqCompatible();
testQuery(
"SELECT \n"
+ " LATEST_BY(m1, MILLIS_TO_TIMESTAMP(BITWISE_SHIFT_RIGHT(TIMESTAMP_TO_MILLIS(__time), 3)))\n"
+ " FROM druid.foo GROUP BY TIME_FLOOR(__time, 'P1Y', null, 'America/Los_Angeles')",
ImmutableList.of(
Druids.newTimeseriesQueryBuilder()
.dataSource(CalciteTests.DATASOURCE1)
.intervals(querySegmentSpec(Filtration.eternity()))
.granularity(new PeriodGranularity(Period.years(1), null, DateTimes.inferTzFromString(LOS_ANGELES)))
.virtualColumns(
expressionVirtualColumn("v1", "bitwiseShiftRight(\"__time\",3)", ColumnType.LONG)
)
.aggregators(
aggregators(
new FloatLastAggregatorFactory("a0", "m1", "v1")
)
)
.context(QUERY_CONTEXT_DEFAULT)
.build()
),
ImmutableList.of(
new Object[]{1.0f},
new Object[]{4.0f},
new Object[]{6.0f}
)
);
}
// This test the off-heap (buffer) version of the AnyAggregator (Double/Float/Long) against numeric columns
// that have null values (when run in SQL compatible null mode)
@Test
Expand Down
Loading