Merge branch 'main' into rearrange-bsgi

deephaven · Jun 6, 2024 · 1a958ef · 1a958ef
2 parents 3e85d30 + a8f121c
commit 1a958ef
Show file tree

Hide file tree

Showing 189 changed files with 6,920 additions and 4,247 deletions.
diff --git a/BenchmarkSupport/src/main/java/io/deephaven/benchmarking/runner/TableBenchmarkState.java b/BenchmarkSupport/src/main/java/io/deephaven/benchmarking/runner/TableBenchmarkState.java
@@ -6,6 +6,7 @@
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.parquet.table.ParquetInstructions;
 import io.deephaven.parquet.table.ParquetTools;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.engine.table.impl.util.TableBuilder;
@@ -48,7 +49,8 @@ public void logOutput() throws IOException {
                 .resolve(BenchmarkTools.getDetailOutputPath(benchmarkName) + PARQUET_FILE_EXTENSION);
 
         final Table output = outputBuilder.build();
-        ParquetTools.writeTable(output, outputPath.toFile(), RESULT_DEF);
+        ParquetTools.writeTable(output, outputPath.toString(),
+                ParquetInstructions.EMPTY.withTableDefinition(RESULT_DEF));
     }
 
     public void reset() {
@@ -76,7 +78,7 @@ public long resultSize() {
     }
 
     public static Table readBin(File location) {
-        return ParquetTools.readTable(location);
+        return ParquetTools.readTable(location.getPath());
     }
 
     public String getResultHash() {

diff --git a/Plot/src/main/java/io/deephaven/plot/util/PlotUtils.java b/Plot/src/main/java/io/deephaven/plot/util/PlotUtils.java
@@ -7,16 +7,15 @@
 import io.deephaven.api.agg.Aggregation;
 import io.deephaven.base.verify.Require;
 import io.deephaven.datastructures.util.CollectionUtil;
-import io.deephaven.engine.table.impl.DataAccessHelpers;
 import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.vectors.ColumnVectors;
 import io.deephaven.plot.ChartImpl;
 import io.deephaven.plot.datasets.category.CategoryDataSeries;
 import io.deephaven.plot.datasets.data.*;
 import io.deephaven.plot.datasets.interval.IntervalXYDataSeriesArray;
 import io.deephaven.plot.errors.PlotInfo;
 import io.deephaven.plot.util.tables.TableBackedPartitionedTableHandle;
 import io.deephaven.plot.util.tables.TableHandle;
-import io.deephaven.engine.table.DataColumn;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.context.QueryScope;
@@ -30,6 +29,7 @@
 import io.deephaven.gui.color.ColorPalette;
 import io.deephaven.gui.color.Paint;
 import io.deephaven.gui.table.filters.Condition;
+import io.deephaven.vector.Vector;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
@@ -805,8 +805,8 @@ public HashMapWithDefault<K, V> copy() {
     }
 
     public static <T> IndexableData createIndexableData(final Table t, final String column, final PlotInfo plotInfo) {
-        final DataColumn<T> dataColumn = DataAccessHelpers.getColumn(t, column);
-        final Object o = dataColumn.getDirect();
+        final Vector<?> vector = ColumnVectors.of(t, column);
+        final Object o = vector.copyToArray();
 
         return new IndexableDataArray((T[]) o, plotInfo);
     }