Add local table builder

BodoSQL/bodosql/context.py

@@ -22,11 +22,9 @@
 from bodosql.bodosql_types.database_catalog import DatabaseCatalog
 from bodosql.bodosql_types.table_path import TablePath, TablePathType
 from bodosql.imported_java_classes import (
-    ColumnClass,
     ColumnDataTypeClass,
     JavaEntryPoint,
     LocalSchemaClass,
-    LocalTableClass,
     RelationalAlgebraGeneratorClass,
 )
 from bodosql.py4j_gateway import build_java_array_list, build_java_hash_map
@@ -234,7 +232,7 @@ def construct_json_array_type(arr_type):
 
 def get_sql_column_type(arr_type, col_name):
     data_type = get_sql_data_type(arr_type)
-    return ColumnClass(col_name, data_type)
+    return JavaEntryPoint.buildBodoSQLColumnImpl(col_name, data_type)
 
 
 def get_sql_data_type(arr_type):
@@ -580,7 +578,7 @@ def add_table_type(
     estimated_ndvs = {} if estimated_ndvs is None else estimated_ndvs
     estimated_ndvs_java_map = build_java_hash_map(estimated_ndvs)
 
-    table = LocalTableClass(
+    table = JavaEntryPoint.buildLocalTable(
         table_name,
         schema.getFullPath(),
         col_arr,

BodoSQL/bodosql/imported_java_classes.py

@@ -17,9 +17,7 @@
 gateway = get_gateway()
 if bodo.get_rank() == 0:
     try:
-        ColumnClass = gateway.jvm.com.bodosql.calcite.table.BodoSQLColumnImpl
         ColumnDataTypeClass = gateway.jvm.com.bodosql.calcite.table.ColumnDataTypeInfo
-        LocalTableClass = gateway.jvm.com.bodosql.calcite.table.LocalTable
         LocalSchemaClass = gateway.jvm.com.bodosql.calcite.schema.LocalSchema
         RelationalAlgebraGeneratorClass = (
             gateway.jvm.com.bodosql.calcite.application.RelationalAlgebraGenerator
@@ -37,9 +35,7 @@
         saw_error = True
         msg = str(e)
 else:
-    ColumnClass = None
     ColumnDataTypeClass = None
-    LocalTableClass = None
     LocalSchemaClass = None
     RelationalAlgebraGeneratorClass = None
     SnowflakeDriver = None

BodoSQL/calcite_sql/bodosql-calcite-application/src/main/java/com/bodosql/calcite/application/PythonEntryPoint.kt

@@ -8,7 +8,10 @@ import com.bodosql.calcite.catalog.SnowflakeCatalog
 import com.bodosql.calcite.catalog.TabularCatalog
 import com.bodosql.calcite.ddl.DDLExecutionResult
 import com.bodosql.calcite.table.BodoSQLColumn
+import com.bodosql.calcite.table.BodoSQLColumnImpl
 import com.bodosql.calcite.table.ColumnDataTypeInfo
+import com.bodosql.calcite.table.LocalTable
+import com.google.common.collect.ImmutableList
 import org.apache.commons.lang3.exception.ExceptionUtils
 import java.util.Properties
 
@@ -308,5 +311,57 @@ class PythonEntryPoint {
             icebergVolume: String?,
         ): SnowflakeCatalog =
             SnowflakeCatalog(username, password, accountName, defaultDatabaseName, warehouseName, accountInfo, icebergVolume)
+
+        /**
+         * Build a BodoSQLColumnImpl object.
+         * @param columnName The column name to use.
+         * @param dataTypeInfo The data type info to use.
+         * @return The BodoSQLColumnImpl object.
+         */
+        @JvmStatic
+        fun buildBodoSQLColumnImpl(
+            columnName: String,
+            dataTypeInfo: ColumnDataTypeInfo,
+        ): BodoSQLColumnImpl = BodoSQLColumnImpl(columnName, dataTypeInfo)
+
+        /**
+         * Build a LocalTable object.
+         * @param tableName The table name to use.
+         * @param path The path to use.
+         * @param columns The columns to use.
+         * @param isWriteable Whether the table is writeable.
+         * @param readCode The read code to use.
+         * @param writeCodeFormatString The write code format string to use.
+         * @param useIORead Whether to use IO read.
+         * @param dbType The database type to use.
+         * @param estimatedRowCount The estimated row count to use. If this is not known, this should be null.
+         * @param estimatedNdvs The estimated NDVs to use. If this is not known, this should be null.
+         * @return The LocalTable object.
+         */
+        @JvmStatic
+        fun buildLocalTable(
+            tableName: String,
+            path: ImmutableList<String>,
+            columns: List<BodoSQLColumn>,
+            isWriteable: Boolean,
+            readCode: String,
+            writeCodeFormatString: String,
+            useIORead: Boolean,
+            dbType: String,
+            estimatedRowCount: Long?,
+            estimatedNdvs: Map<String, Int>,
+        ): LocalTable =
+            LocalTable(
+                tableName,
+                path,
+                columns,
+                isWriteable,
+                readCode,
+                writeCodeFormatString,
+                useIORead,
+                dbType,
+                estimatedRowCount,
+                estimatedNdvs,
+            )
     }
 }

BodoSQL/calcite_sql/bodosql-calcite-application/src/main/java/com/bodosql/calcite/table/LocalTable.java

@@ -9,13 +9,13 @@
 import com.bodosql.calcite.ir.Variable;
 import com.google.common.collect.ImmutableList;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.apache.calcite.rel.type.RelDataType;
 import org.apache.calcite.rel.type.RelDataTypeField;
 import org.apache.calcite.schema.Statistic;
 import org.apache.calcite.schema.Table;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 /**
@@ -77,16 +77,16 @@ public class LocalTable extends BodoSqlTable {
    * @param estimatedRowCount Estimated row count passed from Python.
    */
   public LocalTable(
-      String name,
-      ImmutableList<String> schemaPath,
-      List<BodoSQLColumn> columns,
-      boolean isWriteable,
-      String readCode,
-      String writeCodeFormatString,
-      boolean useIORead,
-      String dbType,
+      @NonNull String name,
+      @NonNull ImmutableList<String> schemaPath,
+      @NonNull List<BodoSQLColumn> columns,
+      @NonNull boolean isWriteable,
+      @NonNull String readCode,
+      @NonNull String writeCodeFormatString,
+      @NonNull boolean useIORead,
+      @NonNull String dbType,
       @Nullable Long estimatedRowCount,
-      @Nullable HashMap<String, Integer> estimatedNdvs) {
+      @NonNull Map<String, Integer> estimatedNdvs) {
 
     super(name, schemaPath, columns);
     this.isWriteable = isWriteable;
@@ -214,7 +214,7 @@ public Table extend(List<RelDataTypeField> extensionFields) {
         useIORead,
         dbType,
         null,
-        null);
+        estimatedNdvs);
   }
 
   /**

BodoSQL/calcite_sql/bodosql-calcite-application/src/test/java/com/bodosql/interactive/BodoGenTest.kt

@@ -41,7 +41,7 @@ object BodoGenTest {
                 false,
                 "MEMORY",
                 null,
-                null,
+                mapOf(),
             )
         schema.addTable(table)
         var cols2: ArrayList<BodoSQLColumn> = ArrayList()
@@ -61,7 +61,7 @@ object BodoGenTest {
                 false,
                 "MEMORY",
                 null,
-                null,
+                mapOf(),
             )
         schema.addTable(table2)
         val table3: BodoSqlTable =
@@ -75,7 +75,7 @@ object BodoGenTest {
                 false,
                 "MEMORY",
                 null,
-                null,
+                mapOf(),
             )
         schema.addTable(table3)
         val generator =