Factory for Vectors over entire columns from a Table (#5506)

* Move vector column wrappers to engine-api * User-facing factory for vector column wrappers
deephaven · May 17, 2024 · a550c4f · a550c4f
1 parent 58c8337
commit a550c4f
Show file tree

Hide file tree

Showing 52 changed files with 601 additions and 73 deletions.
diff --git a/engine/api/build.gradle b/engine/api/build.gradle
@@ -25,6 +25,8 @@ dependencies {
     compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 
     testImplementation project(':engine-test-utils')
+    testImplementation TestTools.projectDependency(project, 'engine-table')
+    testImplementation TestTools.projectDependency(project, 'engine-vector')
     testImplementation depCommonsLang3
 
     Classpaths.inheritJUnitClassic(project, 'testImplementation')

diff --git a/.../impl/vector/ByteVectorColumnWrapper.java → ...able/vectors/ByteVectorColumnWrapper.java b/.../impl/vector/ByteVectorColumnWrapper.java → ...able/vectors/ByteVectorColumnWrapper.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapper and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -28,7 +28,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfByte.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfByte.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_BYTE;
 

diff --git a/.../impl/vector/CharVectorColumnWrapper.java → ...able/vectors/CharVectorColumnWrapper.java b/.../impl/vector/CharVectorColumnWrapper.java → ...able/vectors/CharVectorColumnWrapper.java
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -24,7 +24,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfChar.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfChar.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_CHAR;
 

diff --git a/engine/api/src/main/java/io/deephaven/engine/table/vectors/ColumnVectors.java b/engine/api/src/main/java/io/deephaven/engine/table/vectors/ColumnVectors.java
diff --git a/...mpl/vector/DoubleVectorColumnWrapper.java → ...le/vectors/DoubleVectorColumnWrapper.java b/...mpl/vector/DoubleVectorColumnWrapper.java → ...le/vectors/DoubleVectorColumnWrapper.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapper and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -28,7 +28,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfDouble.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfDouble.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_DOUBLE;
 

diff --git a/...impl/vector/FloatVectorColumnWrapper.java → ...ble/vectors/FloatVectorColumnWrapper.java b/...impl/vector/FloatVectorColumnWrapper.java → ...ble/vectors/FloatVectorColumnWrapper.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapper and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -28,7 +28,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfFloat.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfFloat.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_FLOAT;
 

diff --git a/...e/impl/vector/IntVectorColumnWrapper.java → ...table/vectors/IntVectorColumnWrapper.java b/...e/impl/vector/IntVectorColumnWrapper.java → ...table/vectors/IntVectorColumnWrapper.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapper and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -28,7 +28,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfInt.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfInt.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_INT;
 

diff --git a/.../impl/vector/LongVectorColumnWrapper.java → ...able/vectors/LongVectorColumnWrapper.java b/.../impl/vector/LongVectorColumnWrapper.java → ...able/vectors/LongVectorColumnWrapper.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapper and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -28,7 +28,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfLong.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfLong.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_LONG;
 

diff --git a/...mpl/vector/ObjectVectorColumnWrapper.java → ...le/vectors/ObjectVectorColumnWrapper.java b/...mpl/vector/ObjectVectorColumnWrapper.java → ...le/vectors/ObjectVectorColumnWrapper.java
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -26,7 +26,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseableIterator.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseableIterator.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 
 public class ObjectVectorColumnWrapper<T> extends ObjectVector.Indirect<T> {

diff --git a/...impl/vector/ShortVectorColumnWrapper.java → ...ble/vectors/ShortVectorColumnWrapper.java b/...impl/vector/ShortVectorColumnWrapper.java → ...ble/vectors/ShortVectorColumnWrapper.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapper and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.base.ClampUtil;
 import io.deephaven.base.verify.Assert;
@@ -28,7 +28,7 @@
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfShort.maybeConcat;
 import static io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfShort.repeat;
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
-import static io.deephaven.engine.table.impl.vector.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
+import static io.deephaven.engine.table.vectors.VectorColumnWrapperConstants.CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD;
 import static io.deephaven.engine.table.iterators.ChunkedColumnIterator.DEFAULT_CHUNK_SIZE;
 import static io.deephaven.util.QueryConstants.NULL_SHORT;
 

diff --git a/.../vector/VectorColumnWrapperConstants.java → ...vectors/VectorColumnWrapperConstants.java b/.../vector/VectorColumnWrapperConstants.java → ...vectors/VectorColumnWrapperConstants.java
@@ -1,9 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.engine.table.impl.vector;
-
-import io.deephaven.configuration.Configuration;
+package io.deephaven.engine.table.vectors;
 
 /**
  * Repository for constants used by the column-wrapper vector implementations.
@@ -15,6 +13,5 @@ public class VectorColumnWrapperConstants {
      * {@link io.deephaven.engine.table.iterators.ChunkedColumnIterator ChunkedColumnIterator} instead of a
      * {@link io.deephaven.engine.table.iterators.SerialColumnIterator SerialColumnIterator}.
      */
-    static final int CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD = Configuration.getInstance().getIntegerWithDefault(
-            "VectorColumnWrapper.chunkedColumnIteratorSizeThreshold", 1 << 7);
+    static final int CHUNKED_COLUMN_ITERATOR_SIZE_THRESHOLD = 1 << 7;
 }
diff --git a/...l/vector/ByteVectorColumnWrapperTest.java → .../vectors/ByteVectorColumnWrapperTest.java b/...l/vector/ByteVectorColumnWrapperTest.java → .../vectors/ByteVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link ByteVectorTest} implementation for {@link ByteVectorColumnWrapper}.
+ * {@link ByteVectorTest} implementation for {@link io.deephaven.engine.table.vectors.ByteVectorColumnWrapper}.
  */
 public class ByteVectorColumnWrapperTest extends ByteVectorTest {
 

diff --git a/...l/vector/CharVectorColumnWrapperTest.java → .../vectors/CharVectorColumnWrapperTest.java b/...l/vector/CharVectorColumnWrapperTest.java → .../vectors/CharVectorColumnWrapperTest.java
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -10,7 +10,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link CharVectorTest} implementation for {@link CharVectorColumnWrapper}.
+ * {@link CharVectorTest} implementation for {@link io.deephaven.engine.table.vectors.CharVectorColumnWrapper}.
  */
 public class CharVectorColumnWrapperTest extends CharVectorTest {
 

diff --git a/...vector/DoubleVectorColumnWrapperTest.java → ...ectors/DoubleVectorColumnWrapperTest.java b/...vector/DoubleVectorColumnWrapperTest.java → ...ectors/DoubleVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link DoubleVectorTest} implementation for {@link DoubleVectorColumnWrapper}.
+ * {@link DoubleVectorTest} implementation for {@link io.deephaven.engine.table.vectors.DoubleVectorColumnWrapper}.
  */
 public class DoubleVectorColumnWrapperTest extends DoubleVectorTest {
 

diff --git a/.../vector/FloatVectorColumnWrapperTest.java → ...vectors/FloatVectorColumnWrapperTest.java b/.../vector/FloatVectorColumnWrapperTest.java → ...vectors/FloatVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link FloatVectorTest} implementation for {@link FloatVectorColumnWrapper}.
+ * {@link FloatVectorTest} implementation for {@link io.deephaven.engine.table.vectors.FloatVectorColumnWrapper}.
  */
 public class FloatVectorColumnWrapperTest extends FloatVectorTest {
 

diff --git a/...pl/vector/IntVectorColumnWrapperTest.java → ...e/vectors/IntVectorColumnWrapperTest.java b/...pl/vector/IntVectorColumnWrapperTest.java → ...e/vectors/IntVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link IntVectorTest} implementation for {@link IntVectorColumnWrapper}.
+ * {@link IntVectorTest} implementation for {@link io.deephaven.engine.table.vectors.IntVectorColumnWrapper}.
  */
 public class IntVectorColumnWrapperTest extends IntVectorTest {
 

diff --git a/...l/vector/LongVectorColumnWrapperTest.java → .../vectors/LongVectorColumnWrapperTest.java b/...l/vector/LongVectorColumnWrapperTest.java → .../vectors/LongVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link LongVectorTest} implementation for {@link LongVectorColumnWrapper}.
+ * {@link LongVectorTest} implementation for {@link io.deephaven.engine.table.vectors.LongVectorColumnWrapper}.
  */
 public class LongVectorColumnWrapperTest extends LongVectorTest {
 

diff --git a/...vector/ObjectVectorColumnWrapperTest.java → ...ectors/ObjectVectorColumnWrapperTest.java b/...vector/ObjectVectorColumnWrapperTest.java → ...ectors/ObjectVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link ObjectVectorTest} implementation for {@link ObjectVectorColumnWrapper}.
+ * {@link ObjectVectorTest} implementation for {@link io.deephaven.engine.table.vectors.ObjectVectorColumnWrapper}.
  */
 public class ObjectVectorColumnWrapperTest extends ObjectVectorTest {
 

diff --git a/.../vector/ShortVectorColumnWrapperTest.java → ...vectors/ShortVectorColumnWrapperTest.java b/.../vector/ShortVectorColumnWrapperTest.java → ...vectors/ShortVectorColumnWrapperTest.java
@@ -5,7 +5,7 @@
 // ****** Edit CharVectorColumnWrapperTest and run "./gradlew replicateVectorColumnWrappers" to regenerate
 //
 // @formatter:off
-package io.deephaven.engine.table.impl.vector;
+package io.deephaven.engine.table.vectors;
 
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * {@link ShortVectorTest} implementation for {@link ShortVectorColumnWrapper}.
+ * {@link ShortVectorTest} implementation for {@link io.deephaven.engine.table.vectors.ShortVectorColumnWrapper}.
  */
 public class ShortVectorColumnWrapperTest extends ShortVectorTest {