This is an automated email from the ASF dual-hosted git repository.
cwylie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 2b7f2c5119 use VectorValueSelector instead of
BaseLongVectorValueSelector for StringFirstAggregatorFactory.factorizeVector
(#14957)
2b7f2c5119 is described below
commit 2b7f2c51190adfe0368b76abfa4059974f3910ef
Author: Clint Wylie <[email protected]>
AuthorDate: Sat Sep 9 04:03:05 2023 -0700
use VectorValueSelector instead of BaseLongVectorValueSelector for
StringFirstAggregatorFactory.factorizeVector (#14957)
---
.../first/SingleStringFirstDimensionVectorAggregator.java | 6 +++---
.../druid/query/aggregation/first/StringFirstAggregatorFactory.java | 5 ++---
.../druid/query/aggregation/first/StringFirstVectorAggregator.java | 3 +--
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/processing/src/main/java/org/apache/druid/query/aggregation/first/SingleStringFirstDimensionVectorAggregator.java
b/processing/src/main/java/org/apache/druid/query/aggregation/first/SingleStringFirstDimensionVectorAggregator.java
index d5aa31444e..22fa50ea46 100644
---
a/processing/src/main/java/org/apache/druid/query/aggregation/first/SingleStringFirstDimensionVectorAggregator.java
+++
b/processing/src/main/java/org/apache/druid/query/aggregation/first/SingleStringFirstDimensionVectorAggregator.java
@@ -23,22 +23,22 @@ import org.apache.druid.common.config.NullHandling;
import org.apache.druid.java.util.common.StringUtils;
import org.apache.druid.query.aggregation.SerializablePairLongString;
import org.apache.druid.query.aggregation.VectorAggregator;
-import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.SingleValueDimensionVectorSelector;
+import org.apache.druid.segment.vector.VectorValueSelector;
import javax.annotation.Nullable;
import java.nio.ByteBuffer;
public class SingleStringFirstDimensionVectorAggregator implements
VectorAggregator
{
- private final BaseLongVectorValueSelector timeSelector;
+ private final VectorValueSelector timeSelector;
private final SingleValueDimensionVectorSelector
valueDimensionVectorSelector;
private long firstTime;
private final int maxStringBytes;
private final boolean useDefault = NullHandling.replaceWithDefault();
public SingleStringFirstDimensionVectorAggregator(
- BaseLongVectorValueSelector timeSelector,
+ VectorValueSelector timeSelector,
SingleValueDimensionVectorSelector valueDimensionVectorSelector,
int maxStringBytes
)
diff --git
a/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java
b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java
index 33dafa8610..193acaf25a 100644
---
a/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java
+++
b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstAggregatorFactory.java
@@ -43,10 +43,10 @@ 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.column.ValueType;
-import org.apache.druid.segment.vector.BaseLongVectorValueSelector;
import org.apache.druid.segment.vector.SingleValueDimensionVectorSelector;
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;
@@ -186,8 +186,7 @@ public class StringFirstAggregatorFactory extends
AggregatorFactory
@Override
public VectorAggregator factorizeVector(VectorColumnSelectorFactory
selectorFactory)
{
- BaseLongVectorValueSelector timeSelector = (BaseLongVectorValueSelector)
selectorFactory.makeValueSelector(
- timeColumn);
+ final VectorValueSelector timeSelector =
selectorFactory.makeValueSelector(timeColumn);
ColumnCapabilities capabilities =
selectorFactory.getColumnCapabilities(fieldName);
if (capabilities != null) {
if (capabilities.is(ValueType.STRING) &&
capabilities.isDictionaryEncoded().isTrue()) {
diff --git
a/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstVectorAggregator.java
b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstVectorAggregator.java
index 7082b4c3dd..3e31300bad 100644
---
a/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstVectorAggregator.java
+++
b/processing/src/main/java/org/apache/druid/query/aggregation/first/StringFirstVectorAggregator.java
@@ -23,7 +23,6 @@ import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.query.aggregation.SerializablePairLongString;
import org.apache.druid.query.aggregation.VectorAggregator;
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;
@@ -42,7 +41,7 @@ public class StringFirstVectorAggregator implements
VectorAggregator
public StringFirstVectorAggregator(
- BaseLongVectorValueSelector timeSelector,
+ VectorValueSelector timeSelector,
VectorObjectSelector valueSelector,
int maxStringBytes
)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
