Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Factory for Vectors over entire columns from a Table #5506

Merged
merged 6 commits into from
May 17, 2024
Merged

Factory for Vectors over entire columns from a Table #5506

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5d18b40
Move vector column wrappers to engine-api
rcaudy Apr 3, 2024
3ad9a20
User-facing factory for vector column wrappers
rcaudy Apr 3, 2024
79aed14
Address access specifier issue
rcaudy May 8, 2024
6dc566d
Basic unit tests for ColumnVectors
rcaudy May 17, 2024
435bf3b
Correct unit test build and some improperly refactored code
rcaudy May 17, 2024
6db6c0a
Update ColumnVectors JavaDoc per feedback
rcaudy May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions engine/api/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
4 changes: 2 additions & 2 deletions .../impl/vector/ByteVectorColumnWrapper.java → ...able/vectors/ByteVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .../impl/vector/CharVectorColumnWrapper.java → ...able/vectors/CharVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down
489 changes: 489 additions & 0 deletions engine/api/src/main/java/io/deephaven/engine/table/vectors/ColumnVectors.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions ...mpl/vector/DoubleVectorColumnWrapper.java → ...le/vectors/DoubleVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...impl/vector/FloatVectorColumnWrapper.java → ...ble/vectors/FloatVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...e/impl/vector/IntVectorColumnWrapper.java → ...table/vectors/IntVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions .../impl/vector/LongVectorColumnWrapper.java → ...able/vectors/LongVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...mpl/vector/ObjectVectorColumnWrapper.java → ...le/vectors/ObjectVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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> {
Expand Down
4 changes: 2 additions & 2 deletions ...impl/vector/ShortVectorColumnWrapper.java → ...ble/vectors/ShortVectorColumnWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
7 changes: 2 additions & 5 deletions .../vector/VectorColumnWrapperConstants.java → ...vectors/VectorColumnWrapperConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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;
}
4 changes: 2 additions & 2 deletions ...l/vector/ByteVectorColumnWrapperTest.java → .../vectors/ByteVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...l/vector/CharVectorColumnWrapperTest.java → .../vectors/CharVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...vector/DoubleVectorColumnWrapperTest.java → ...ectors/DoubleVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions .../vector/FloatVectorColumnWrapperTest.java → ...vectors/FloatVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...pl/vector/IntVectorColumnWrapperTest.java → ...e/vectors/IntVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...l/vector/LongVectorColumnWrapperTest.java → .../vectors/LongVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions ...vector/ObjectVectorColumnWrapperTest.java → ...ectors/ObjectVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
4 changes: 2 additions & 2 deletions .../vector/ShortVectorColumnWrapperTest.java → ...vectors/ShortVectorColumnWrapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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 {

Expand Down
Loading
Loading