Close snapshots from BarrageTableResolver (#2428)

deephaven · May 24, 2022 · a91d482 · a91d482
1 parent 80e3567
commit a91d482
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshot.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshot.java
@@ -68,4 +68,7 @@ BarrageSnapshot snapshot(TableSpec tableSpec, BarrageSnapshotOptions options)
      * @return the {@code BarrageTable}
      */
     BarrageTable partialTable(RowSet viewport, BitSet columns, boolean reverseViewport) throws InterruptedException;
+
+    @Override
+    void close();
 }
diff --git a/server/src/main/java/io/deephaven/server/uri/BarrageTableResolver.java b/server/src/main/java/io/deephaven/server/uri/BarrageTableResolver.java
@@ -221,8 +221,9 @@ public Table snapshot(String targetUri, TableSpec table) throws TableHandleExcep
     public Table snapshot(DeephavenTarget target, TableSpec table, BarrageSnapshotOptions options)
             throws TableHandleException, InterruptedException {
         final BarrageSession session = session(target);
-        final BarrageSnapshot snap = session.snapshot(table, options);
-        return snap.entireTable();
+        try (final BarrageSnapshot snap = session.snapshot(table, options)) {
+            return snap.entireTable();
+        }
     }
 
     /**
@@ -270,8 +271,9 @@ public Table snapshot(DeephavenTarget target, TableSpec table, BarrageSnapshotOp
             BitSet columns, boolean reverseViewport)
             throws TableHandleException, InterruptedException {
         final BarrageSession session = session(target);
-        final BarrageSnapshot snap = session.snapshot(table, options);
-        return snap.partialTable(viewport, columns, reverseViewport);
+        try (final BarrageSnapshot snap = session.snapshot(table, options)) {
+            return snap.partialTable(viewport, columns, reverseViewport);
+        }
     }