You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by GitBox <gi...@apache.org> on 2020/09/12 01:43:33 UTC
[GitHub] [druid] clintropolis opened a new pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
clintropolis opened a new pull request #10388:
URL: https://github.com/apache/druid/pull/10388
### Description
This PR adds support for vectorized virtual columns to be used by vectorized timeseries and group by query engines. This just wires everything up to query engines, a follow-up PR will add a vectorization support to `ExpressionVirtualColumn`.
Tests have been added using a fake `VirtualColumn` and `VectorAggregator` implementation to ensure that vectorized virtual columns using any of the added vector selector functions work with both group by and timeseries queries.
<hr>
This PR has:
- [ ] been self-reviewed.
- [ ] added documentation for new or modified features or behaviors.
- [ ] added Javadocs for most classes and all non-trivial methods. Linked related entities via Javadoc links.
- [ ] added comments explaining the "why" and the intent of the code wherever would not be obvious for an unfamiliar reader.
- [ ] added unit tests or modified existing tests to cover new code paths, ensuring the threshold for [code coverage](https://github.com/apache/druid/blob/master/dev/code-review/code-coverage.md) is met.
- [ ] added integration tests.
- [ ] been tested in a test Druid cluster.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] jihoonson commented on a change in pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
jihoonson commented on a change in pull request #10388:
URL: https://github.com/apache/druid/pull/10388#discussion_r487369538
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] jihoonson commented on a change in pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
jihoonson commented on a change in pull request #10388:
URL: https://github.com/apache/druid/pull/10388#discussion_r487369538
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] jihoonson commented on a change in pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
jihoonson commented on a change in pull request #10388:
URL: https://github.com/apache/druid/pull/10388#discussion_r487369538
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] clintropolis merged pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
clintropolis merged pull request #10388:
URL: https://github.com/apache/druid/pull/10388
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] jihoonson commented on a change in pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
jihoonson commented on a change in pull request #10388:
URL: https://github.com/apache/druid/pull/10388#discussion_r487369538
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoVectorizedVirtualColumn.java
##########
@@ -0,0 +1,326 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.dimension.DimensionSpec;
+import org.apache.druid.query.monomorphicprocessing.RuntimeShapeInspector;
+import org.apache.druid.segment.ColumnInspector;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.ColumnValueSelector;
+import org.apache.druid.segment.DimensionSelector;
+import org.apache.druid.segment.IdLookup;
+import org.apache.druid.segment.VirtualColumn;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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.VectorSizeInspector;
+import org.apache.druid.segment.vector.VectorValueSelector;
+
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
+public class AlwaysTwoVectorizedVirtualColumn implements VirtualColumn
+{
+ private final String outputName;
+ private final ColumnCapabilities capabilities;
+ private final boolean dictionaryEncoded;
+
+ public AlwaysTwoVectorizedVirtualColumn(
+ String name,
+ ColumnCapabilities capabilites
+ )
+ {
+ this.outputName = name;
+ this.capabilities = capabilites;
+ this.dictionaryEncoded = capabilites.isDictionaryEncoded().isTrue() &&
+ capabilites.areDictionaryValuesUnique().isTrue();
+ }
+
+ @Override
+ public boolean canVectorize(ColumnInspector inspector)
+ {
+ return true;
+ }
+
+ @Override
+ public String getOutputName()
+ {
+ return outputName;
+ }
+
+ @Override
+ public DimensionSelector makeDimensionSelector(DimensionSpec dimensionSpec, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public ColumnValueSelector<?> makeColumnValueSelector(String columnName, ColumnSelectorFactory factory)
+ {
+ throw new IllegalStateException("don't call this");
+ }
+
+ @Override
+ public SingleValueDimensionVectorSelector makeSingleValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ return new SingleValueDimensionVectorSelector()
+ {
+ private final VectorSizeInspector inspector = factory.getVectorSizeInspector();
+ private final int[] rowVector = new int[inspector.getMaxVectorSize()];
+
+ @Override
+ public int[] getRowVector()
+ {
+
+ return rowVector;
+ }
+
+ @Override
+ public int getValueCardinality()
+ {
+ return dictionaryEncoded ? 1 : CARDINALITY_UNKNOWN;
+ }
+
+ @Nullable
+ @Override
+ public String lookupName(int id)
+ {
+ return "2";
+ }
+
+ @Override
+ public boolean nameLookupPossibleInAdvance()
+ {
+ return dictionaryEncoded;
+ }
+
+ @Nullable
+ @Override
+ public IdLookup idLookup()
+ {
+ return null;
+ }
+
+ @Override
+ public int getMaxVectorSize()
+ {
+ return inspector.getMaxVectorSize();
+ }
+
+ @Override
+ public int getCurrentVectorSize()
+ {
+ return inspector.getCurrentVectorSize();
+ }
+ };
+ }
+
+ @Override
+ public MultiValueDimensionVectorSelector makeMultiValueVectorDimensionSelector(
+ DimensionSpec dimensionSpec,
+ VectorColumnSelectorFactory factory
+ )
+ {
+ final IndexedInts[] rowVector = new IndexedInts[factory.getVectorSizeInspector().getMaxVectorSize()];
+ Arrays.fill(rowVector, new IndexedInts()
Review comment:
nit: using `RangeIndexedInts` may be simpler when reading code.
##########
File path: processing/src/test/java/org/apache/druid/segment/virtual/AlwaysTwoCounterAggregatorFactory.java
##########
@@ -0,0 +1,251 @@
+/*
+ * 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.segment.virtual;
+
+import com.google.common.collect.ImmutableList;
+import org.apache.druid.query.aggregation.Aggregator;
+import org.apache.druid.query.aggregation.BufferAggregator;
+import org.apache.druid.query.aggregation.CountAggregatorFactory;
+import org.apache.druid.query.aggregation.CountVectorAggregator;
+import org.apache.druid.query.aggregation.VectorAggregator;
+import org.apache.druid.query.dimension.DefaultDimensionSpec;
+import org.apache.druid.segment.ColumnSelectorFactory;
+import org.apache.druid.segment.column.ColumnCapabilities;
+import org.apache.druid.segment.data.IndexedInts;
+import org.apache.druid.segment.vector.MultiValueDimensionVectorSelector;
+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 org.junit.Assert;
+
+import javax.annotation.Nullable;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class AlwaysTwoCounterAggregatorFactory extends CountAggregatorFactory
Review comment:
It might be nice to add some Javaodc saying that the aggregator created by this factory verifies values read from vectorSelector as well as counting.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] suneet-s commented on a change in pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
suneet-s commented on a change in pull request #10388:
URL: https://github.com/apache/druid/pull/10388#discussion_r488348359
##########
File path: processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
##########
@@ -70,24 +73,47 @@ public static boolean canVectorize(
@Nullable final Filter filter
)
{
- // Multi-value dimensions are not yet supported.
- //
- // Two notes here about how we're handling this check:
- // 1) After multi-value dimensions are supported, we could alter "GroupByQueryEngineV2.isAllSingleValueDims"
- // to accept a ColumnSelectorFactory, which makes more sense than using a StorageAdapter (see #8013).
- // 2) Technically using StorageAdapter here is bad since it only looks at real columns, but they might
- // be shadowed by virtual columns (again, see #8013). But it's fine for now since adapter.canVectorize
- // always returns false if there are any virtual columns.
- //
- // This situation should sort itself out pretty well once this engine supports multi-valued columns. Then we
- // won't have to worry about having this all-single-value-dims check here.
-
- return GroupByQueryEngineV2.isAllSingleValueDims(adapter::getColumnCapabilities, query.getDimensions(), true)
+ Function<String, ColumnCapabilities> capabilitiesFunction = name ->
+ query.getVirtualColumns().getColumnCapabilitiesWithFallback(adapter, name);
+
+ return canVectorizeDimensions(capabilitiesFunction, query.getDimensions())
&& query.getDimensions().stream().allMatch(DimensionSpec::canVectorize)
&& query.getAggregatorSpecs().stream().allMatch(aggregatorFactory -> aggregatorFactory.canVectorize(adapter))
&& adapter.canVectorize(filter, query.getVirtualColumns(), false);
}
+ public static boolean canVectorizeDimensions(
+ final Function<String, ColumnCapabilities> capabilitiesFunction,
+ final List<DimensionSpec> dimensions
+ )
+ {
+ return dimensions
+ .stream()
+ .allMatch(
+ dimension -> {
+ if (dimension.mustDecorate()) {
+ // group by on multi value dimensions are not currently supported
+ // DimensionSpecs that decorate may turn singly-valued columns into multi-valued selectors.
+ // To be safe, we must return false here.
+ return false;
+ }
+
+ // Now check column capabilities.
+ final ColumnCapabilities columnCapabilities = capabilitiesFunction.apply(dimension.getDimension());
+ // null here currently means the column does not exist, nil columns can be vectorized
+ if (columnCapabilities == null) {
+ return true;
+ }
+ // strings must be single valued, dictionary encoded, and have unique dictionary entries
+ if (ValueType.STRING.equals(columnCapabilities.getType())) {
+ return columnCapabilities.hasMultipleValues().isFalse() &&
Review comment:
How do you decide between `columnCapabilities.hasMultipleValues().isFalse()` and `!columnCapabilities.hasMultipleValues().isMaybeTrue()` - I'm never sure which one to check
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org
[GitHub] [druid] suneet-s commented on a change in pull request #10388: allow vectorized query engines to utilize vectorized virtual columns
Posted by GitBox <gi...@apache.org>.
suneet-s commented on a change in pull request #10388:
URL: https://github.com/apache/druid/pull/10388#discussion_r488348990
##########
File path: processing/src/main/java/org/apache/druid/query/groupby/epinephelinae/vector/VectorGroupByEngine.java
##########
@@ -70,24 +73,47 @@ public static boolean canVectorize(
@Nullable final Filter filter
)
{
- // Multi-value dimensions are not yet supported.
- //
- // Two notes here about how we're handling this check:
- // 1) After multi-value dimensions are supported, we could alter "GroupByQueryEngineV2.isAllSingleValueDims"
- // to accept a ColumnSelectorFactory, which makes more sense than using a StorageAdapter (see #8013).
- // 2) Technically using StorageAdapter here is bad since it only looks at real columns, but they might
- // be shadowed by virtual columns (again, see #8013). But it's fine for now since adapter.canVectorize
- // always returns false if there are any virtual columns.
- //
- // This situation should sort itself out pretty well once this engine supports multi-valued columns. Then we
- // won't have to worry about having this all-single-value-dims check here.
-
- return GroupByQueryEngineV2.isAllSingleValueDims(adapter::getColumnCapabilities, query.getDimensions(), true)
+ Function<String, ColumnCapabilities> capabilitiesFunction = name ->
+ query.getVirtualColumns().getColumnCapabilitiesWithFallback(adapter, name);
+
+ return canVectorizeDimensions(capabilitiesFunction, query.getDimensions())
&& query.getDimensions().stream().allMatch(DimensionSpec::canVectorize)
&& query.getAggregatorSpecs().stream().allMatch(aggregatorFactory -> aggregatorFactory.canVectorize(adapter))
&& adapter.canVectorize(filter, query.getVirtualColumns(), false);
}
+ public static boolean canVectorizeDimensions(
+ final Function<String, ColumnCapabilities> capabilitiesFunction,
+ final List<DimensionSpec> dimensions
+ )
+ {
+ return dimensions
+ .stream()
+ .allMatch(
+ dimension -> {
+ if (dimension.mustDecorate()) {
+ // group by on multi value dimensions are not currently supported
+ // DimensionSpecs that decorate may turn singly-valued columns into multi-valued selectors.
+ // To be safe, we must return false here.
+ return false;
+ }
+
+ // Now check column capabilities.
+ final ColumnCapabilities columnCapabilities = capabilitiesFunction.apply(dimension.getDimension());
+ // null here currently means the column does not exist, nil columns can be vectorized
+ if (columnCapabilities == null) {
+ return true;
+ }
+ // strings must be single valued, dictionary encoded, and have unique dictionary entries
+ if (ValueType.STRING.equals(columnCapabilities.getType())) {
+ return columnCapabilities.hasMultipleValues().isFalse() &&
Review comment:
Well, I guess the example I gave is equivalent. Maybe a better way to ask that question is should `UNKNOWN` be treated as multi-value or single value?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org