Remove unused BitSet param

niloc132 · Jun 25, 2024 · 709d966 · 709d966
1 parent d327ca2
commit 709d966
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 11 deletions.
diff --git a/...sions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageStreamReader.java b/...sions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageStreamReader.java
@@ -59,7 +59,6 @@ public BarrageStreamReader(final LongConsumer deserializeTmConsumer) {
 
     @Override
     public BarrageMessage safelyParseFrom(final StreamReaderOptions options,
-            final BitSet expectedColumns,
             final ChunkType[] columnChunkTypes,
             final Class<?>[] columnTypes,
             final Class<?>[] componentTypes,

diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReader.java
@@ -18,15 +18,13 @@ public interface StreamReader {
      * Converts an InputStream to a BarrageMessage in the context of the provided parameters.
      *
      * @param options the options related to parsing this message
-     * @param expectedColumns the columns expected to appear in the stream, null implies all columns
      * @param columnChunkTypes the types to use for each column chunk
      * @param columnTypes the actual type for the column
      * @param componentTypes the actual component type for the column
      * @param stream the input stream that holds the message to be parsed
      * @return a BarrageMessage filled out by the stream's payload
      */
     BarrageMessage safelyParseFrom(final StreamReaderOptions options,
-            BitSet expectedColumns,
             ChunkType[] columnChunkTypes,
             Class<?>[] columnTypes,
             Class<?>[] componentTypes,

diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshotImpl.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshotImpl.java
@@ -63,8 +63,6 @@ public class BarrageSnapshotImpl extends ReferenceCountedLivenessNode implements
     private final BarrageTable resultTable;
     private final CompletableFuture<Table> future;
 
-    private volatile BitSet expectedColumns;
-
     private volatile int connected = 1;
     private static final AtomicIntegerFieldUpdater<BarrageSnapshotImpl> CONNECTED_UPDATER =
             AtomicIntegerFieldUpdater.newUpdater(BarrageSnapshotImpl.class, "connected");
@@ -209,9 +207,6 @@ public Future<Table> partialTable(
             alreadyUsed = true;
         }
 
-        // store this for streamreader parser
-        expectedColumns = columns;
-
         // Send the snapshot request:
         observer.onNext(FlightData.newBuilder()
                 .setAppMetadata(ByteStringAccess.wrap(makeRequestInternal(viewport, columns, reverseViewport, options)))
@@ -355,8 +350,7 @@ public InputStream stream(final BarrageMessage value) {
 
         @Override
         public BarrageMessage parse(final InputStream stream) {
-            return streamReader.safelyParseFrom(options, expectedColumns, columnChunkTypes, columnTypes, componentTypes,
-                    stream);
+            return streamReader.safelyParseFrom(options, columnChunkTypes, columnTypes, componentTypes, stream);
         }
     }
 

diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscriptionImpl.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscriptionImpl.java
@@ -429,7 +429,7 @@ public InputStream stream(final BarrageMessage value) {
 
         @Override
         public BarrageMessage parse(final InputStream stream) {
-            return streamReader.safelyParseFrom(options, null, columnChunkTypes, columnTypes, componentTypes, stream);
+            return streamReader.safelyParseFrom(options, columnChunkTypes, columnTypes, componentTypes, stream);
         }
     }