One more fix

deephaven · Nov 14, 2023 · c12705f · c12705f
1 parent 43c199c
commit c12705f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/DynamicWhereFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/DynamicWhereFilter.java
@@ -71,9 +71,11 @@ public DynamicWhereFilter(final QueryTable setTable, final boolean inclusion, fi
         if (setRefreshing) {
             this.setTable = setTable;
             setTupleSource = TupleSourceFactory.makeTupleSource(setColumns);
-            try (final CloseableIterator<?> initialKeysIterator = ChunkedColumnIterator.make(
-                    setTupleSource, setTable.getRowSet(), getChunkSize(setTable.getRowSet()))) {
-                initialKeysIterator.forEachRemaining(this::addKey);
+            if (setTable.getRowSet().isNonempty()) {
+                try (final CloseableIterator<?> initialKeysIterator = ChunkedColumnIterator.make(
+                        setTupleSource, setTable.getRowSet(), getChunkSize(setTable.getRowSet()))) {
+                    initialKeysIterator.forEachRemaining(this::addKey);
+                }
             }
 
             final String[] setColumnNames =
@@ -168,10 +170,12 @@ public void onFailureInternal(Throwable originalException, Entry sourceEntry) {
         } else {
             this.setTable = null;
             setTupleSource = null;
-            final TupleSource<?> temporaryTupleSource = TupleSourceFactory.makeTupleSource(setColumns);
-            try (final CloseableIterator<?> initialKeysIterator = ChunkedColumnIterator.make(
-                    temporaryTupleSource, setTable.getRowSet(), getChunkSize(setTable.getRowSet()))) {
-                initialKeysIterator.forEachRemaining(this::addKeyUnchecked);
+            if (setTable.getRowSet().isNonempty()) {
+                final TupleSource<?> temporaryTupleSource = TupleSourceFactory.makeTupleSource(setColumns);
+                try (final CloseableIterator<?> initialKeysIterator = ChunkedColumnIterator.make(
+                        temporaryTupleSource, setTable.getRowSet(), getChunkSize(setTable.getRowSet()))) {
+                    initialKeysIterator.forEachRemaining(this::addKeyUnchecked);
+                }
             }
             kernelValid = liveValuesArrayValid = false;
             setInclusionKernel = null;