S3 context should not call close on reset (#5390)

deephaven · Apr 20, 2024 · 1604287 · 1604287
1 parent 279755e
commit 1604287
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java b/Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java
@@ -30,6 +30,7 @@ public final SafeCloseable apply(@NotNull final Supplier<SafeCloseable> resource
     public void close() {
         if (resource != null) {
             resource.close();
+            resource = null;
         }
     }
 }
diff --git a/...s/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java b/...s/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java
@@ -53,6 +53,8 @@ Decompressor getDecompressor() {
     public void close() {
         if (decompressor != null) {
             CodecPool.returnDecompressor(decompressor);
+            codecName = null;
+            decompressor = null;
         }
     }
 }
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ChannelContext.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ChannelContext.java
@@ -138,7 +138,7 @@ int fill(final long position, ByteBuffer dest) throws IOException {
 
     private void reset() {
         // Cancel all outstanding requests
-        close();
+        cancelOutstanding();
         // Reset the internal state
         uri = null;
         size = UNINITIALIZED_SIZE;
@@ -154,6 +154,10 @@ public void close() {
         if (log.isDebugEnabled()) {
             log.debug().append("Closing context: ").append(ctxStr()).endl();
         }
+        cancelOutstanding();
+    }
+
+    private void cancelOutstanding() {
         for (int i = 0; i < requests.length; i++) {
             if (requests[i] != null) {
                 requests[i].release();