remove some outdated classes. simplify package structure.

deephaven · Jan 5, 2023 · 34b1b0b · 34b1b0b
1 parent 5d89c72
commit 34b1b0b
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 167 deletions.
diff --git a/...ractGeneratedTableDataArrayRetriever.java → ...ractGeneratedTableDataArrayRetriever.java b/...ractGeneratedTableDataArrayRetriever.java → ...ractGeneratedTableDataArrayRetriever.java
@@ -1,10 +1,8 @@
-package io.deephaven.queryutil.dataadapter.datafetch.bulk.gen;
+package io.deephaven.queryutil.dataadapter.datafetch.bulk;
 
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.queryutil.dataadapter.ContextHolder;
-import io.deephaven.queryutil.dataadapter.datafetch.bulk.AbstractTableDataArrayRetriever;
-import io.deephaven.queryutil.dataadapter.datafetch.bulk.TableDataArrayRetriever;
 
 /**
  * Superclass of generated {@link TableDataArrayRetriever TableDataRetrievers}.

diff --git a/...ain/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/BaseMultiRowRecordAdapter.java b/...ain/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/BaseMultiRowRecordAdapter.java
@@ -3,7 +3,6 @@
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.Table;
-import io.deephaven.queryutil.dataadapter.datafetch.bulk.gen.ExampleGeneratedMultiRowDataArrayRetriever;
 import io.deephaven.queryutil.dataadapter.rec.MultiRowRecordAdapter;
 import io.deephaven.queryutil.dataadapter.rec.desc.RecordAdapterDescriptor;
 import io.deephaven.queryutil.dataadapter.rec.json.JsonRecordAdapterGenerator;

diff --git a/...eGeneratedMultiRowDataArrayRetriever.java → ...eGeneratedMultiRowDataArrayRetriever.java b/...eGeneratedMultiRowDataArrayRetriever.java → ...eGeneratedMultiRowDataArrayRetriever.java
@@ -1,4 +1,4 @@
-package io.deephaven.queryutil.dataadapter.datafetch.bulk.gen;
+package io.deephaven.queryutil.dataadapter.datafetch.bulk;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.rowset.RowSequence;
@@ -13,7 +13,7 @@
  * <p>
  * Created by rbasralian on 3/7/22
  */
-public class ExampleGeneratedMultiRowDataArrayRetriever extends AbstractGeneratedTableDataArrayRetriever {
+class ExampleGeneratedMultiRowDataArrayRetriever extends AbstractGeneratedTableDataArrayRetriever {
 
     public ExampleGeneratedMultiRowDataArrayRetriever(ColumnSource<?>[] colSources) {
         super(colSources);

diff --git a/.../main/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/TableDataArrayRetriever.java b/.../main/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/TableDataArrayRetriever.java
@@ -2,10 +2,6 @@
 
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.queryutil.dataadapter.datafetch.bulk.gen.AbstractGeneratedTableDataArrayRetriever;
-import io.deephaven.queryutil.dataadapter.datafetch.bulk.gen.TableDataRetrieverGenerator;
-import io.deephaven.queryutil.dataadapter.datafetch.bulk.simple.SimpleTableDataArrayRetriever;
-import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Constructor;
 import java.util.List;
@@ -61,25 +57,6 @@ default void fillDataArrays(boolean usePrev, Object[] recordDataArrs, RowSet tab
     void fillDataArrays(boolean usePrev, RowSet tableIndex, Object[] dataArrs, LongConsumer keyConsumer);
 
     static TableDataArrayRetriever makeDefault(final ColumnSource<?>... columnSources) {
-        final boolean useGeneratedTDAR = true;
-        if (useGeneratedTDAR) {
-            return makeGenerated(columnSources);
-        } else {
-            return makeSimple(columnSources);
-        }
-    }
-
-    @NotNull
-    static SimpleTableDataArrayRetriever makeSimple(ColumnSource<?>[] columnSources) {
-        try {
-            return new SimpleTableDataArrayRetriever(columnSources);
-        } catch (Exception ex) {
-            throw new RuntimeException("Could not create table data retriever", ex);
-        }
-    }
-
-    @NotNull
-    static AbstractGeneratedTableDataArrayRetriever makeGenerated(ColumnSource<?>[] columnSources) {
         try {
             final TableDataRetrieverGenerator tableDataRetrieverGenerator =
                     new TableDataRetrieverGenerator(columnSources);

diff --git a/...bulk/gen/TableDataRetrieverGenerator.java → ...tch/bulk/TableDataRetrieverGenerator.java b/...bulk/gen/TableDataRetrieverGenerator.java → ...tch/bulk/TableDataRetrieverGenerator.java
@@ -1,4 +1,4 @@
-package io.deephaven.queryutil.dataadapter.datafetch.bulk.gen;
+package io.deephaven.queryutil.dataadapter.datafetch.bulk;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.base.verify.AssertionFailure;
@@ -14,7 +14,7 @@
  * <p>
  * Created by rbasralian on 3/7/22
  */
-public class TableDataRetrieverGenerator {
+class TableDataRetrieverGenerator {
 
     private static final String COMPILED_CLASS_NAME = "TableDataArrayRetriever";
     private final String[] colTypeNames;

diff --git a/...in/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/simple/ChunkedArrPopulator.java b/...in/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/simple/ChunkedArrPopulator.java
diff --git a/...n/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/simple/ChunkedArrPopulators.java b/...n/java/io/deephaven/queryutil/dataadapter/datafetch/bulk/simple/ChunkedArrPopulators.java
diff --git a/.../deephaven/queryutil/dataadapter/datafetch/bulk/simple/SimpleTableDataArrayRetriever.java b/.../deephaven/queryutil/dataadapter/datafetch/bulk/simple/SimpleTableDataArrayRetriever.java