feat: introduce SubstraitSqlValidator

Author: vbarua

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

@@ -1,8 +1,8 @@
 package io.substrait.isthmus;
 
 import io.substrait.extension.SimpleExtension;
-import io.substrait.isthmus.calcite.SubstraitOperatorTable;
 import io.substrait.isthmus.calcite.SubstraitTable;
+import io.substrait.isthmus.sql.SubstraitSqlValidator;
 import java.util.ArrayList;
 import java.util.List;
 import org.apache.calcite.config.CalciteConnectionConfig;
@@ -23,7 +23,6 @@
 import org.apache.calcite.schema.Schema;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNodeList;
-import org.apache.calcite.sql.SqlOperatorTable;
 import org.apache.calcite.sql.ddl.SqlColumnDeclaration;
 import org.apache.calcite.sql.ddl.SqlCreateTable;
 import org.apache.calcite.sql.ddl.SqlKeyConstraint;
@@ -33,8 +32,6 @@
 import org.apache.calcite.sql.parser.ddl.SqlDdlParserImpl;
 import org.apache.calcite.sql.validate.SqlConformanceEnum;
 import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorCatalogReader;
-import org.apache.calcite.sql.validate.SqlValidatorImpl;
 import org.apache.calcite.sql2rel.SqlToRelConverter;
 
 class SqlConverterBase {
@@ -76,7 +73,7 @@ CalciteCatalogReader registerCreateTables(List<String> tables) throws SqlParseEx
     CalciteSchema rootSchema = CalciteSchema.createRootSchema(false);
     CalciteCatalogReader catalogReader =
         new CalciteCatalogReader(rootSchema, List.of(), factory, config);
-    SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
+    SqlValidator validator = new SubstraitSqlValidator(catalogReader);
     if (tables != null) {
       for (String tableDef : tables) {
         List<SubstraitTable> tList = parseCreateTable(factory, validator, tableDef);
@@ -155,22 +152,4 @@ protected static SqlParseException fail(String text, SqlParserPos pos) {
   protected static SqlParseException fail(String text) {
     return fail(text, SqlParserPos.ZERO);
   }
-
-  protected static final class Validator extends SqlValidatorImpl {
-
-    private Validator(
-        SqlOperatorTable opTab,
-        SqlValidatorCatalogReader catalogReader,
-        RelDataTypeFactory typeFactory,
-        Config config) {
-      super(opTab, catalogReader, typeFactory, config);
-    }
-
-    public static Validator create(
-        RelDataTypeFactory factory,
-        SqlValidatorCatalogReader validatorCatalog,
-        SqlValidator.Config config) {
-      return new Validator(SubstraitOperatorTable.INSTANCE, validatorCatalog, factory, config);
-    }
-  }
 }

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

@@ -8,6 +8,7 @@
 import io.substrait.isthmus.calcite.SubstraitTable;
 import io.substrait.isthmus.expression.RexExpressionConverter;
 import io.substrait.isthmus.expression.ScalarFunctionConverter;
+import io.substrait.isthmus.sql.SubstraitSqlValidator;
 import io.substrait.proto.ExtendedExpression;
 import io.substrait.type.NamedStruct;
 import io.substrait.type.Type;
@@ -143,7 +144,7 @@ private Result registerCreateTablesForExtendedExpression(List<String> tables)
     CalciteSchema rootSchema = CalciteSchema.createRootSchema(false);
     CalciteCatalogReader catalogReader =
         new CalciteCatalogReader(rootSchema, List.of(), factory, config);
-    SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
+    SqlValidator validator = new SubstraitSqlValidator(catalogReader);
     if (tables != null) {
       for (String tableDef : tables) {
         List<SubstraitTable> tList = parseCreateTable(factory, validator, tableDef);

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

@@ -2,6 +2,7 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import io.substrait.extension.ExtensionCollector;
+import io.substrait.isthmus.sql.SubstraitSqlValidator;
 import io.substrait.proto.Plan;
 import io.substrait.proto.PlanRel;
 import io.substrait.relation.RelProtoConverter;
@@ -32,25 +33,25 @@ public SqlToSubstrait(FeatureBoard features) {
 
   public Plan execute(String sql, List<String> tables) throws SqlParseException {
     CalciteCatalogReader catalogReader = registerCreateTables(tables);
-    SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
+    SqlValidator validator = new SubstraitSqlValidator(catalogReader);
     return executeInner(sql, validator, catalogReader);
   }
 
   public Plan execute(String sql, String name, Schema schema) throws SqlParseException {
     CalciteCatalogReader catalogReader = registerSchema(name, schema);
-    SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
+    SqlValidator validator = new SubstraitSqlValidator(catalogReader);
     return executeInner(sql, validator, catalogReader);
   }
 
   public Plan execute(String sql, Prepare.CatalogReader catalogReader) throws SqlParseException {
-    SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
+    SqlValidator validator = new SubstraitSqlValidator(catalogReader);
     return executeInner(sql, validator, catalogReader);
   }
 
   // Package protected for testing
   List<RelRoot> sqlToRelNode(String sql, List<String> tables) throws SqlParseException {
     Prepare.CatalogReader catalogReader = registerCreateTables(tables);
-    SqlValidator validator = Validator.create(factory, catalogReader, SqlValidator.Config.DEFAULT);
+    SqlValidator validator = new SubstraitSqlValidator(catalogReader);
     return sqlToRelNode(sql, validator, catalogReader);
   }
 

isthmus/src/main/java/io/substrait/isthmus/sql/SubstraitSqlValidator.java

@@ -0,0 +1,15 @@
+package io.substrait.isthmus.sql;
+
+import io.substrait.isthmus.calcite.SubstraitOperatorTable;
+import org.apache.calcite.prepare.Prepare;
+import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql.validate.SqlValidatorImpl;
+
+public class SubstraitSqlValidator extends SqlValidatorImpl {
+
+  static SqlValidator.Config CONFIG = Config.DEFAULT;
+
+  public SubstraitSqlValidator(Prepare.CatalogReader catalogReader) {
+    super(SubstraitOperatorTable.INSTANCE, catalogReader, catalogReader.getTypeFactory(), CONFIG);
+  }
+}

isthmus/src/test/java/io/substrait/isthmus/ApplyJoinPlanTest.java

@@ -1,13 +1,13 @@
 package io.substrait.isthmus;
 
+import io.substrait.isthmus.sql.SubstraitSqlValidator;
 import java.util.Map;
 import org.apache.calcite.adapter.tpcds.TpcdsSchema;
 import org.apache.calcite.prepare.CalciteCatalogReader;
 import org.apache.calcite.rel.RelRoot;
 import org.apache.calcite.rex.RexFieldAccess;
 import org.apache.calcite.sql.parser.SqlParseException;
 import org.apache.calcite.sql.parser.SqlParser;
-import org.apache.calcite.sql.validate.SqlValidator;
 import org.apache.calcite.sql2rel.SqlToRelConverter;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
@@ -17,9 +17,7 @@ public class ApplyJoinPlanTest {
   private static RelRoot getCalcitePlan(SqlToSubstrait s, TpcdsSchema schema, String sql)
       throws SqlParseException {
     CalciteCatalogReader catalogReader = s.registerSchema("tpcds", schema);
-    SqlConverterBase.Validator validator =
-        SqlConverterBase.Validator.create(
-            catalogReader.getTypeFactory(), catalogReader, SqlValidator.Config.DEFAULT);
+    SubstraitSqlValidator validator = new SubstraitSqlValidator(catalogReader);
     SqlToRelConverter converter = s.createSqlToRelConverter(validator, catalogReader);
     SqlParser parser = SqlParser.create(sql, s.parserConfig);
     return s.getBestExpRelRoot(converter, parser.parseQuery());