From a7c648e0a92316bf5a86b0325f2dfdce05dea6a7 Mon Sep 17 00:00:00 2001 From: stanbrub Date: Thu, 19 Oct 2023 16:31:04 -0600 Subject: [PATCH 1/2] Upgraded barrage java client to 0.29.0. Fixed DHC breaking change --- pom.xml | 24 +++++++++---------- .../benchmark/connect/BarrageConnector.java | 15 ++++++------ 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index b7f91b44..11f20ced 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.3.0 + 3.4.0 add-test-source @@ -27,7 +27,7 @@ maven-compiler-plugin - 3.10.1 + 3.11.0 17 17 @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.1 package @@ -81,7 +81,7 @@ com.diffplug.spotless spotless-maven-plugin - 2.33.0 + 2.40.0 @@ -107,7 +107,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0 + 3.1.2 /io/deephaven/benchmark/tests/**/*Test @@ -124,7 +124,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 3.0.0 + 3.1.2 0 @@ -163,32 +163,32 @@ netty-all 4.1.79.Final - + io.grpc grpc-all - 1.50.1 + 1.50.0 com.google.protobuf protobuf-java - 3.21.7 + 3.21.7 io.confluent kafka-avro-serializer - 7.3.1 + 7.5.1 io.deephaven deephaven-java-client-barrage-dagger - 0.28.0 + 0.29.0 io.deephaven deephaven-log-to-slf4j - 0.28.0 + 0.29.0 org.junit.platform diff --git a/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java b/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java index 605f4b72..f551719d 100644 --- a/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java +++ b/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java @@ -28,7 +28,6 @@ import io.deephaven.engine.table.TableUpdate; import io.deephaven.engine.table.impl.InstrumentedTableUpdateListener; import io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph; -import io.deephaven.extensions.barrage.BarrageSnapshotOptions; import io.deephaven.extensions.barrage.BarrageSubscriptionOptions; import io.deephaven.extensions.barrage.table.BarrageTable; import io.deephaven.qst.TableCreationLogic; @@ -53,7 +52,7 @@ public class BarrageConnector implements AutoCloseable { final private ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(4); final private BufferAllocator bufferAllocator = new RootAllocator(); final private Map subscriptions = new LinkedHashMap<>(); - final private Map snapshots = new LinkedHashMap<>(); + final private Map snapshots = new LinkedHashMap<>(); final private Set variableNames = new HashSet<>(); final private AtomicBoolean isClosed = new AtomicBoolean(false); private Changes changes = null; @@ -114,14 +113,16 @@ public Future fetchSnapshotData(String table, Consumer tab MetricsFuture future = new MetricsFuture(metrics); snapshots.computeIfAbsent(table, s -> { try { - BarrageSnapshotOptions options = BarrageSnapshotOptions.builder().build(); + BarrageSubscriptionOptions options = BarrageSubscriptionOptions.builder().build(); TableHandleManager snapshotManager = session.session().batch(); + TableCreationLogic logic = findTable(table).ticket().ticketId().table().logic(); TableHandle handle = snapshotManager.executeLogic(logic); - BarrageSnapshot snapshot = session.snapshot(handle, options); - BarrageTable snapshotTable = snapshot.entireTable(); - tableHandler.accept(CachedResultTable.create(snapshotTable)); - return new Snapshot(handle, snapshot); + BarrageSubscription subscription = session.subscribe(handle, options); + + BarrageTable snapTable = subscription.snapshotEntireTable(); + tableHandler.accept(CachedResultTable.create(snapTable)); + return new Subscription(handle, subscription); } catch (Exception ex) { throw new RuntimeException("Failed to fetch snapshot table data: " + table, ex); } finally { From c7b6c5274bdb882033fd0b2ebcb538626be76458 Mon Sep 17 00:00:00 2001 From: stanbrub Date: Thu, 19 Oct 2023 17:00:01 -0600 Subject: [PATCH 2/2] The all-important spotless whitespace changes --- .../java/io/deephaven/benchmark/connect/BarrageConnector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java b/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java index f551719d..763c9727 100644 --- a/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java +++ b/src/main/java/io/deephaven/benchmark/connect/BarrageConnector.java @@ -115,11 +115,11 @@ public Future fetchSnapshotData(String table, Consumer tab try { BarrageSubscriptionOptions options = BarrageSubscriptionOptions.builder().build(); TableHandleManager snapshotManager = session.session().batch(); - + TableCreationLogic logic = findTable(table).ticket().ticketId().table().logic(); TableHandle handle = snapshotManager.executeLogic(logic); BarrageSubscription subscription = session.subscribe(handle, options); - + BarrageTable snapTable = subscription.snapshotEntireTable(); tableHandler.accept(CachedResultTable.create(snapTable)); return new Subscription(handle, subscription);