fix nightly err; fixup snapshot partial table end-result

nbauernfeind · Oct 16, 2023 · 78acfbd · 78acfbd
1 parent 02d8c36
commit 78acfbd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
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
@@ -14,6 +14,7 @@
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.ReferenceCountedLivenessNode;
 import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.engine.updategraph.UpdateGraph;
@@ -476,6 +477,15 @@ public boolean viewportChanged(
             // @formatter:on
 
             if (isComplete) {
+                // remove all unpopulated rows from viewport snapshots
+                if (isSnapshot && serverViewport != null) {
+                    // noinspection resource
+                    WritableRowSet currentRowSet = resultTable.getRowSet().writableCast();
+                    try (final RowSet populated = currentRowSet.subSetForPositions(serverViewport, serverReverseViewport)) {
+                        currentRowSet.retain(populated);
+                    }
+                }
+
                 signalCompletion();
             }
 

diff --git a/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java b/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java
@@ -185,6 +185,7 @@ private class RemoteClient {
             final BarrageUtil.ConvertedArrowSchema schema = BarrageUtil.convertArrowSchema(flatbufSchema);
             this.barrageTable = BarrageTable.make(updateSourceCombiner, ExecutionContext.getContext().getUpdateGraph(),
                     null, schema.tableDef, schema.attributes, null);
+            this.barrageTable.addSourceToRegistrar();
 
             final BarrageSubscriptionOptions options = BarrageSubscriptionOptions.builder()
                     .useDeephavenNulls(useDeephavenNulls)