Fix getNextRowSequenceWithLength callsites that close (deephaven#5653)

stanbrub · Jun 22, 2024 · 5d1c519 · 5d1c519
1 parent ffec8b7
commit 5d1c519
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 33 deletions.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ChunkUtils.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ChunkUtils.java
@@ -471,7 +471,7 @@ public static void copyData(ChunkSource.WithPrev<? extends Values>[] sources, Ro
     }
 
     public static <T extends Values> void fillWithNullValue(ChunkSink<T> dest, RowSequence allKeys) {
-        final int minSize = Math.min(allKeys.intSize(), COPY_DATA_CHUNK_SIZE);
+        final int minSize = (int) Math.min(allKeys.size(), COPY_DATA_CHUNK_SIZE);
         if (minSize == 0) {
             return;
         }
@@ -480,9 +480,8 @@ public static <T extends Values> void fillWithNullValue(ChunkSink<T> dest, RowSe
                 final RowSequence.Iterator iter = allKeys.getRowSequenceIterator()) {
             chunk.fillWithNullValue(0, minSize);
             while (iter.hasMore()) {
-                try (final RowSequence nextKeys = iter.getNextRowSequenceWithLength(COPY_DATA_CHUNK_SIZE)) {
-                    dest.fillFromChunk(destContext, chunk, nextKeys);
-                }
+                final RowSequence nextKeys = iter.getNextRowSequenceWithLength(COPY_DATA_CHUNK_SIZE);
+                dest.fillFromChunk(destContext, chunk, nextKeys);
             }
         }
     }

diff --git a/engine/table/src/main/java/io/deephaven/engine/util/TickSuppressor.java b/engine/table/src/main/java/io/deephaven/engine/util/TickSuppressor.java
@@ -172,38 +172,36 @@ public void onUpdate(TableUpdate upstream) {
                             }
 
                             while (postRsIt.hasMore()) {
-                                try (final RowSequence postChunkOk = postRsIt.getNextRowSequenceWithLength(chunkSize);
-                                        final RowSequence preChunkOk =
-                                                preRsIt.getNextRowSequenceWithLength(chunkSize)) {
-                                    currentSharedContext.reset();
-                                    prevSharedContext.reset();
+                                final RowSequence postChunkOk = postRsIt.getNextRowSequenceWithLength(chunkSize);
+                                final RowSequence preChunkOk = preRsIt.getNextRowSequenceWithLength(chunkSize);
+                                currentSharedContext.reset();
+                                prevSharedContext.reset();
+
+                                for (final int cc : changedColumnIndices) {
+                                    // noinspection unchecked
+                                    final Chunk<Values> currentValues =
+                                            inputSources[cc].getChunk(getContextArray[cc], postChunkOk);
+                                    // noinspection unchecked
+                                    final Chunk<Values> prevValues =
+                                            inputSources[cc].getPrevChunk(prevContextArray[cc], preChunkOk);
+
+                                    // now we need to compare them
+                                    equalityKernel[cc].notEqual(currentValues, prevValues, changedCellsArray[cc]);
+                                }
 
+                                final MutableInt pos = new MutableInt(0);
+                                postChunkOk.forAllRowKeys((idx) -> {
+                                    boolean idxChanged = false;
                                     for (final int cc : changedColumnIndices) {
-                                        // noinspection unchecked
-                                        final Chunk<Values> currentValues =
-                                                inputSources[cc].getChunk(getContextArray[cc], postChunkOk);
-                                        // noinspection unchecked
-                                        final Chunk<Values> prevValues =
-                                                inputSources[cc].getPrevChunk(prevContextArray[cc], preChunkOk);
-
-                                        // now we need to compare them
-                                        equalityKernel[cc].notEqual(currentValues, prevValues, changedCellsArray[cc]);
-                                    }
-
-                                    final MutableInt pos = new MutableInt(0);
-                                    postChunkOk.forAllRowKeys((idx) -> {
-                                        boolean idxChanged = false;
-                                        for (final int cc : changedColumnIndices) {
-                                            if (changedCellsArray[cc].get(pos.get())) {
-                                                idxChanged = changedColumns[cc] = true;
-                                            }
-                                        }
-                                        if (idxChanged) {
-                                            builder.appendKey(idx);
+                                        if (changedCellsArray[cc].get(pos.get())) {
+                                            idxChanged = changedColumns[cc] = true;
                                         }
-                                        pos.increment();
-                                    });
-                                }
+                                    }
+                                    if (idxChanged) {
+                                        builder.appendKey(idx);
+                                    }
+                                    pos.increment();
+                                });
                             }
                         }