feat: introduce SubstraitTable

Author: vbarua

isthmus/src/main/java/io/substrait/isthmus/SqlConverterBase.java

@@ -2,6 +2,7 @@
 
 import io.substrait.extension.SimpleExtension;
 import io.substrait.isthmus.calcite.SubstraitOperatorTable;
+import io.substrait.isthmus.calcite.SubstraitTable;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.calcite.config.CalciteConnectionConfig;
@@ -20,7 +21,6 @@
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.rex.RexBuilder;
 import org.apache.calcite.schema.Schema;
-import org.apache.calcite.schema.impl.AbstractTable;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNodeList;
 import org.apache.calcite.sql.SqlOperatorTable;
@@ -79,8 +79,8 @@ CalciteCatalogReader registerCreateTables(List<String> tables) throws SqlParseEx
     SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
     if (tables != null) {
       for (String tableDef : tables) {
-        List<DefinedTable> tList = parseCreateTable(factory, validator, tableDef);
-        for (DefinedTable t : tList) {
+        List<SubstraitTable> tList = parseCreateTable(factory, validator, tableDef);
+        for (SubstraitTable t : tList) {
           rootSchema.add(t.getName(), t);
         }
       }
@@ -97,10 +97,10 @@ CalciteCatalogReader registerSchema(String name, Schema schema) {
     return new CalciteCatalogReader(rootSchema, List.of(), factory, config);
   }
 
-  protected List<DefinedTable> parseCreateTable(
+  protected List<SubstraitTable> parseCreateTable(
       RelDataTypeFactory factory, SqlValidator validator, String sql) throws SqlParseException {
     SqlParser parser = SqlParser.create(sql, parserConfig);
-    List<DefinedTable> definedTableList = new ArrayList<>();
+    List<SubstraitTable> tableList = new ArrayList<>();
 
     SqlNodeList nodeList = parser.parseStmtList();
     for (SqlNode parsed : nodeList) {
@@ -140,12 +140,12 @@ protected List<DefinedTable> parseCreateTable(
         columnTypes.add(col.dataType.deriveType(validator));
       }
 
-      definedTableList.add(
-          new DefinedTable(
-              create.name.names.get(0), factory, factory.createStructType(columnTypes, names)));
+      tableList.add(
+          new SubstraitTable(
+              create.name.names.get(0), factory.createStructType(columnTypes, names)));
     }
 
-    return definedTableList;
+    return tableList;
   }
 
   protected static SqlParseException fail(String text, SqlParserPos pos) {
@@ -173,30 +173,4 @@ public static Validator create(
       return new Validator(SubstraitOperatorTable.INSTANCE, validatorCatalog, factory, config);
     }
   }
-
-  /** A fully defined pre-specified table. */
-  protected static final class DefinedTable extends AbstractTable {
-
-    private final String name;
-    private final RelDataTypeFactory factory;
-    private final RelDataType type;
-
-    public DefinedTable(String name, RelDataTypeFactory factory, RelDataType type) {
-      this.name = name;
-      this.factory = factory;
-      this.type = type;
-    }
-
-    @Override
-    public RelDataType getRowType(RelDataTypeFactory typeFactory) {
-      //      if (factory != typeFactory) {
-      //        throw new IllegalStateException("Different type factory than previously used.");
-      //      }
-      return type;
-    }
-
-    public String getName() {
-      return name;
-    }
-  }
 }

isthmus/src/main/java/io/substrait/isthmus/SqlExpressionToSubstrait.java

@@ -5,6 +5,7 @@
 import io.substrait.extendedexpression.ImmutableExpressionReference;
 import io.substrait.extendedexpression.ImmutableExtendedExpression;
 import io.substrait.extension.SimpleExtension;
+import io.substrait.isthmus.calcite.SubstraitTable;
 import io.substrait.isthmus.expression.RexExpressionConverter;
 import io.substrait.isthmus.expression.ScalarFunctionConverter;
 import io.substrait.proto.ExtendedExpression;
@@ -145,8 +146,8 @@ private Result registerCreateTablesForExtendedExpression(List<String> tables)
     SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
     if (tables != null) {
       for (String tableDef : tables) {
-        List<DefinedTable> tList = parseCreateTable(factory, validator, tableDef);
-        for (DefinedTable t : tList) {
+        List<SubstraitTable> tList = parseCreateTable(factory, validator, tableDef);
+        for (SubstraitTable t : tList) {
           rootSchema.add(t.getName(), t);
           for (RelDataTypeField field : t.getRowType(factory).getFieldList()) {
             nameToTypeMap.merge( // to validate the sql expression tree

isthmus/src/main/java/io/substrait/isthmus/SubstraitToCalcite.java

@@ -1,6 +1,7 @@
 package io.substrait.isthmus;
 
 import io.substrait.extension.SimpleExtension;
+import io.substrait.isthmus.calcite.SubstraitTable;
 import io.substrait.plan.Plan;
 import io.substrait.relation.NamedScan;
 import io.substrait.relation.Rel;
@@ -64,9 +65,8 @@ protected CalciteSchema toSchema(Rel rel) {
           if (table == null) {
             return null;
           }
-          return new SqlConverterBase.DefinedTable(
+          return new SubstraitTable(
               id.get(id.size() - 1),
-              typeFactory,
               typeConverter.toCalcite(typeFactory, table.struct(), table.names()));
         };
     return LookupCalciteSchema.createRootSchema(lookup);

isthmus/src/main/java/io/substrait/isthmus/calcite/SubstraitTable.java

@@ -0,0 +1,26 @@
+package io.substrait.isthmus.calcite;
+
+import org.apache.calcite.rel.type.RelDataType;
+import org.apache.calcite.rel.type.RelDataTypeFactory;
+import org.apache.calcite.schema.impl.AbstractTable;
+
+/** Basic {@link AbstractTable} implementation */
+public class SubstraitTable extends AbstractTable {
+
+  private final RelDataType rowType;
+  private final String tableName;
+
+  public SubstraitTable(String tableName, RelDataType rowType) {
+    this.tableName = tableName;
+    this.rowType = rowType;
+  }
+
+  public String getName() {
+    return tableName;
+  }
+
+  @Override
+  public RelDataType getRowType(RelDataTypeFactory typeFactory) {
+    return rowType;
+  }
+}