bugfix + minor format from sync review

nbauernfeind · Aug 15, 2024 · 2bfd26f · 2bfd26f
1 parent 900d34a
commit 2bfd26f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -1601,8 +1601,8 @@ this, mode, getModifiedColumnSetForUpdates(), publishTheseSources, true,
                         if (liveResultCapture != null) {
                             analyzer.startTrackingPrev();
                             final Map<String, String[]> effects = analyzerContext.calcEffects();
-                            final SelectOrUpdateListener soul = new SelectOrUpdateListener(updateDescription, this,
-                                    resultTable, effects, analyzer);
+                            final SelectOrUpdateListener soul = new SelectOrUpdateListener(
+                                    updateDescription, this, resultTable, effects, analyzer);
                             liveResultCapture.transferTo(soul);
                             addUpdateListener(soul);
                             ConstituentDependency.install(resultTable, soul);

diff --git a/...src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkInputStreamGenerator.java b/...src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkInputStreamGenerator.java
@@ -47,11 +47,17 @@ private synchronized void computePayload() {
 
         final Class<?> myType = type.getComponentType();
         final Class<?> myComponentType = myType != null ? myType.getComponentType() : null;
-        ChunkType chunkType = ChunkType.fromElementType(myType);
-        if (chunkType == ChunkType.Boolean) {
-            // the internal payload is in bytes (to handle nulls), but the wire format is packed bits
+
+        final ChunkType chunkType;
+        if (myType == boolean.class || myType == Boolean.class) {
+            // Note: Internally booleans are passed around as bytes, but the wire format is packed bits.
             chunkType = ChunkType.Byte;
+        } else if (myType != null && !myType.isPrimitive()) {
+            chunkType = ChunkType.Object;
+        } else {
+            chunkType = ChunkType.fromElementType(myType);
         }
+
         final ArrayExpansionKernel kernel = ArrayExpansionKernel.makeExpansionKernel(chunkType, myType);
         offsets = WritableIntChunk.makeWritableChunk(chunk.size() + 1);
 

diff --git a/...sions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkReader.java b/...sions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkReader.java
@@ -36,6 +36,8 @@ public VarListChunkReader(final StreamReaderOptions options, final TypeInfo type
         if (componentType == boolean.class || componentType == Boolean.class) {
             // Note: Internally booleans are passed around as bytes, but the wire format is packed bits.
             chunkType = ChunkType.Byte;
+        } else if (componentType != null && !componentType.isPrimitive()) {
+            chunkType = ChunkType.Object;
         } else {
             chunkType = ChunkType.fromElementType(componentType);
         }