feat: Support type checking when retrieving an objectColumnIterator (#…

…6127)
deephaven · Sep 25, 2024 · 77caf0d · 77caf0d
1 parent 004765a
commit 77caf0d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/engine/api/src/main/java/io/deephaven/engine/table/Table.java b/engine/api/src/main/java/io/deephaven/engine/table/Table.java
@@ -301,6 +301,9 @@ public interface Table extends
 
     <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName);
 
+    <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz);
+
     // -----------------------------------------------------------------------------------------------------------------
     // Filter Operations
     // -----------------------------------------------------------------------------------------------------------------

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -438,6 +438,12 @@ public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull fi
         return new ChunkedObjectColumnIterator<>(getColumnSource(columnName, Object.class), getRowSet());
     }
 
+    @Override
+    public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull final String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz) {
+        return new ChunkedObjectColumnIterator<>(getColumnSource(columnName, clazz), getRowSet());
+    }
+
     // endregion Column Iterators
 
     /**

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableAdapter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableAdapter.java
@@ -206,6 +206,12 @@ default <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull S
         return throwUnsupported();
     }
 
+    @Override
+    default <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz) {
+        return throwUnsupported();
+    }
+
     @Override
     default Table wouldMatch(WouldMatchPair... matchers) {
         return throwUnsupported();

diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/UncoalescedTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/UncoalescedTable.java
@@ -203,6 +203,12 @@ public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull St
         return coalesce().objectColumnIterator(columnName);
     }
 
+    @Override
+    public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz) {
+        return coalesce().objectColumnIterator(columnName, clazz);
+    }
+
     @Override
     @ConcurrentMethod
     public Table where(Filter filter) {

diff --git a/...t/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java b/...t/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
@@ -227,7 +227,7 @@ public void setUp() throws Exception {
         final PartitionedTable partitionedInputData = inputData.partitionBy("PC");
         final String[] partitionedInputDestinations;
         try (final Stream<String> partitionNames = partitionedInputData.table()
-                .<String>objectColumnIterator("PC").stream()) {
+                .objectColumnIterator("PC", String.class).stream()) {
             partitionedInputDestinations = partitionNames.map(pcv -> new File(dataDirectory,
                     "IP" + File.separator + "P" + pcv + File.separator + tableName + File.separator
                             + PARQUET_FILE_NAME)
@@ -242,7 +242,7 @@ public void setUp() throws Exception {
         final PartitionedTable partitionedInputMissingData = inputMissingData.view("PC", "II").partitionBy("PC");
         final String[] partitionedInputMissingDestinations;
         try (final Stream<String> partitionNames = partitionedInputMissingData.table()
-                .<String>objectColumnIterator("PC").stream()) {
+                .objectColumnIterator("PC", String.class).stream()) {
             partitionedInputMissingDestinations = partitionNames.map(pcv -> new File(dataDirectory,
                     "IP" + File.separator + "P" + pcv + File.separator + tableName + File.separator
                             + PARQUET_FILE_NAME)