Change how to get the TableDefinition

deephaven · Dec 15, 2023 · b934b43 · b934b43
1 parent 92c1183
commit b934b43
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 20 deletions.
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
@@ -423,6 +423,10 @@ private static void setConversionFactor(final ConvertedArrowSchema result, final
  result.conversionFactors[i] = factor;
  }
 
+ public static TableDefinition convertTableDefinition(final ExportedTableCreationResponse response) {
+ return convertArrowSchema(SchemaHelper.flatbufSchema(response)).tableDef;
+ }
+
  public static ConvertedArrowSchema convertArrowSchema(final ExportedTableCreationResponse response) {
  return convertArrowSchema(SchemaHelper.flatbufSchema(response));
  }

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
@@ -56,11 +56,6 @@ BarrageSnapshot snapshot(TableSpec tableSpec, BarrageSnapshotOptions options)
  BarrageSnapshot snapshot(TableHandle tableHandle, BarrageSnapshotOptions options);
  }
 
- /**
- * @return the {@link TableDefinition} of the subscribed table
- */
- TableDefinition getTableDefinition();
-
  /**
  * Request a full snapshot of the data and populate a {@link Table} with the data that is received. The returned
  * future will block until all rows for the snapshot table are available.

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
@@ -176,11 +176,6 @@ public void onCompleted() {
  }
  }
 
- @Override
- public TableDefinition getTableDefinition() {
- return resultTable.getDefinition();
- }
-
  @Override
  public Future<Table> entireTable() {
  return partialTable(null, null, false);

diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscription.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscription.java
@@ -61,11 +61,6 @@ BarrageSubscription subscribe(TableSpec tableSpec, BarrageSubscriptionOptions op
  BarrageSubscription subscribe(TableHandle tableHandle, BarrageSubscriptionOptions options);
  }
 
- /**
- * @return the {@link TableDefinition} of the subscribed table
- */
- TableDefinition getTableDefinition();
-
  /**
  * Request a full subscription of the data and populate a {@link Table} with the incrementally updating data that is
  * received. The returned future will block until all rows for the subscribed table are available.

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
@@ -170,11 +170,6 @@ public void onCompleted() {
  }
  }
 
- @Override
- public TableDefinition getTableDefinition() {
- return resultTable.getDefinition();
- }
-
  @Override
  public Future<Table> entireTable() {
  return partialTable(null, null, false);