Merge OpenSearchSqlToRelConverter in CalciteToolsHelper into the same subclass for validation

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

core/src/main/java/org/opensearch/sql/calcite/utils/CalciteToolsHelper.java

@@ -62,13 +62,11 @@
 import org.apache.calcite.plan.RelOptRule;
 import org.apache.calcite.plan.RelOptSchema;
 import org.apache.calcite.plan.RelOptTable;
-import org.apache.calcite.plan.RelOptTable.ViewExpander;
 import org.apache.calcite.plan.hep.HepPlanner;
 import org.apache.calcite.plan.hep.HepProgram;
 import org.apache.calcite.plan.hep.HepProgramBuilder;
 import org.apache.calcite.prepare.CalciteCatalogReader;
 import org.apache.calcite.prepare.CalcitePrepareImpl;
-import org.apache.calcite.prepare.Prepare.CatalogReader;
 import org.apache.calcite.rel.RelHomogeneousShuttle;
 import org.apache.calcite.rel.RelNode;
 import org.apache.calcite.rel.RelRoot;
@@ -88,7 +86,6 @@
 import org.apache.calcite.sql.SqlKind;
 import org.apache.calcite.sql.parser.SqlParserPos;
 import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql2rel.RelFieldTrimmer;
 import org.apache.calcite.sql2rel.SqlRexConvertletTable;
 import org.apache.calcite.sql2rel.SqlToRelConverter;
 import org.apache.calcite.tools.FrameworkConfig;
@@ -98,11 +95,11 @@
 import org.apache.calcite.tools.RelRunner;
 import org.apache.calcite.util.Holder;
 import org.apache.calcite.util.Util;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.opensearch.sql.calcite.CalcitePlanContext;
 import org.opensearch.sql.calcite.plan.Scannable;
 import org.opensearch.sql.calcite.plan.rule.OpenSearchRules;
 import org.opensearch.sql.calcite.plan.rule.PPLSimplifyDedupRule;
+import org.opensearch.sql.calcite.validate.converters.OpenSearchSqlToRelConverter;
 import org.opensearch.sql.expression.function.PPLBuiltinOperators;
 import org.opensearch.sql.monitor.profile.ProfileMetric;
 import org.opensearch.sql.monitor.profile.QueryProfiling;
@@ -361,34 +358,6 @@ protected SqlToRelConverter getSqlToRelConverter(
     }
   }
 
-  public static class OpenSearchSqlToRelConverter extends SqlToRelConverter {
-    protected final RelBuilder relBuilder;
-
-    public OpenSearchSqlToRelConverter(
-        ViewExpander viewExpander,
-        @Nullable SqlValidator validator,
-        CatalogReader catalogReader,
-        RelOptCluster cluster,
-        SqlRexConvertletTable convertletTable,
-        Config config) {
-      super(viewExpander, validator, catalogReader, cluster, convertletTable, config);
-      this.relBuilder =
-          config
-              .getRelBuilderFactory()
-              .create(
-                  cluster,
-                  validator != null
-                      ? validator.getCatalogReader().unwrap(RelOptSchema.class)
-                      : null)
-              .transform(config.getRelBuilderConfigTransform());
-    }
-
-    @Override
-    protected RelFieldTrimmer newFieldTrimmer() {
-      return new OpenSearchRelFieldTrimmer(validator, this.relBuilder);
-    }
-  }
-
   public static class OpenSearchRelRunners {
     /**
      * Runs a relational expression by existing connection. This class copied from {@link

…converters/PplRelToSqlNodeConverter.java …verters/OpenSearchRelToSqlConverter.javacore/src/main/java/org/opensearch/sql/calcite/validate/converters/PplRelToSqlNodeConverter.java renamed to core/src/main/java/org/opensearch/sql/calcite/validate/converters/OpenSearchRelToSqlConverter.java core/src/main/java/org/opensearch/sql/calcite/validate/converters/PplRelToSqlNodeConverter.java renamed to core/src/main/java/org/opensearch/sql/calcite/validate/converters/OpenSearchRelToSqlConverter.java

@@ -33,13 +33,13 @@
  * <p>This converter is used during the validation phase to convert RelNode back to SqlNode for
  * validation and type checking using Calcite's SqlValidator.
  */
-public class PplRelToSqlNodeConverter extends RelToSqlConverter {
+public class OpenSearchRelToSqlConverter extends RelToSqlConverter {
   /**
    * Creates a RelToSqlConverter for PPL.
    *
    * @param dialect the SQL dialect to use for conversion
    */
-  public PplRelToSqlNodeConverter(SqlDialect dialect) {
+  public OpenSearchRelToSqlConverter(SqlDialect dialect) {
     super(dialect);
   }
 

…ate/converters/PplSqlToRelConverter.java …verters/OpenSearchSqlToRelConverter.javacore/src/main/java/org/opensearch/sql/calcite/validate/converters/PplSqlToRelConverter.java renamed to core/src/main/java/org/opensearch/sql/calcite/validate/converters/OpenSearchSqlToRelConverter.java core/src/main/java/org/opensearch/sql/calcite/validate/converters/PplSqlToRelConverter.java renamed to core/src/main/java/org/opensearch/sql/calcite/validate/converters/OpenSearchSqlToRelConverter.java

@@ -7,6 +7,7 @@
 
 import java.util.List;
 import org.apache.calcite.plan.RelOptCluster;
+import org.apache.calcite.plan.RelOptSchema;
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.prepare.Prepare;
 import org.apache.calcite.rel.RelNode;
@@ -17,19 +18,36 @@
 import org.apache.calcite.sql.SqlJoin;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidator;
+import org.apache.calcite.sql2rel.RelFieldTrimmer;
 import org.apache.calcite.sql2rel.SqlRexConvertletTable;
 import org.apache.calcite.sql2rel.SqlToRelConverter;
+import org.apache.calcite.tools.RelBuilder;
 import org.checkerframework.checker.nullness.qual.Nullable;
+import org.opensearch.sql.calcite.utils.OpenSearchRelFieldTrimmer;
 
-public class PplSqlToRelConverter extends SqlToRelConverter {
-  public PplSqlToRelConverter(
+public class OpenSearchSqlToRelConverter extends SqlToRelConverter {
+  protected final RelBuilder relBuilder;
+
+  public OpenSearchSqlToRelConverter(
       RelOptTable.ViewExpander viewExpander,
       @Nullable SqlValidator validator,
       Prepare.CatalogReader catalogReader,
       RelOptCluster cluster,
       SqlRexConvertletTable convertletTable,
       Config config) {
     super(viewExpander, validator, catalogReader, cluster, convertletTable, config);
+    this.relBuilder =
+        config
+            .getRelBuilderFactory()
+            .create(
+                cluster,
+                validator != null ? validator.getCatalogReader().unwrap(RelOptSchema.class) : null)
+            .transform(config.getRelBuilderConfigTransform());
+  }
+
+  @Override
+  protected RelFieldTrimmer newFieldTrimmer() {
+    return new OpenSearchRelFieldTrimmer(validator, this.relBuilder);
   }
 
   /**

core/src/main/java/org/opensearch/sql/executor/QueryService.java

@@ -45,8 +45,8 @@
 import org.opensearch.sql.calcite.validate.OpenSearchSparkSqlDialect;
 import org.opensearch.sql.calcite.validate.PplConvertletTable;
 import org.opensearch.sql.calcite.validate.ValidationUtils;
-import org.opensearch.sql.calcite.validate.converters.PplRelToSqlNodeConverter;
-import org.opensearch.sql.calcite.validate.converters.PplSqlToRelConverter;
+import org.opensearch.sql.calcite.validate.converters.OpenSearchRelToSqlConverter;
+import org.opensearch.sql.calcite.validate.converters.OpenSearchSqlToRelConverter;
 import org.opensearch.sql.calcite.validate.shuttles.PplRelToSqlRelShuttle;
 import org.opensearch.sql.calcite.validate.shuttles.SkipRelValidationShuttle;
 import org.opensearch.sql.calcite.validate.shuttles.SqlRewriteShuttle;
@@ -300,7 +300,7 @@ private RelNode validate(RelNode relNode, CalcitePlanContext context) {
     RelNode sqlRelNode = relNode.accept(new PplRelToSqlRelShuttle(context.rexBuilder, true));
 
     // Convert RelNode to SqlNode for validation
-    RelToSqlConverter rel2sql = new PplRelToSqlNodeConverter(OpenSearchSparkSqlDialect.DEFAULT);
+    RelToSqlConverter rel2sql = new OpenSearchRelToSqlConverter(OpenSearchSparkSqlDialect.DEFAULT);
     SqlImplementor.Result result = rel2sql.visitRoot(sqlRelNode);
     SqlNode root = result.asStatement();
 
@@ -328,7 +328,7 @@ private RelNode validate(RelNode relNode, CalcitePlanContext context) {
             // See SqlToRelConverter.java#convertSelectImpl
             .withHintStrategyTable(context.relBuilder.getCluster().getHintStrategies());
     SqlToRelConverter sql2rel =
-        new PplSqlToRelConverter(
+        new OpenSearchSqlToRelConverter(
             context.config.getViewExpander(),
             validator,
             validator.getCatalogReader().unwrap(CalciteCatalogReader.class),

ppl/src/test/java/org/opensearch/sql/ppl/calcite/CalcitePPLAbstractTest.java

@@ -46,7 +46,7 @@
 import org.opensearch.sql.calcite.CalciteRelNodeVisitor;
 import org.opensearch.sql.calcite.SysLimit;
 import org.opensearch.sql.calcite.validate.OpenSearchSparkSqlDialect;
-import org.opensearch.sql.calcite.validate.converters.PplRelToSqlNodeConverter;
+import org.opensearch.sql.calcite.validate.converters.OpenSearchRelToSqlConverter;
 import org.opensearch.sql.common.setting.Settings;
 import org.opensearch.sql.datasource.DataSourceService;
 import org.opensearch.sql.exception.ExpressionEvaluationException;
@@ -66,7 +66,7 @@ public CalcitePPLAbstractTest(CalciteAssert.SchemaSpec... schemaSpecs) {
     this.config = config(schemaSpecs);
     this.dataSourceService = mock(DataSourceService.class);
     this.planTransformer = new CalciteRelNodeVisitor(dataSourceService);
-    this.converter = new PplRelToSqlNodeConverter(OpenSearchSparkSqlDialect.DEFAULT);
+    this.converter = new OpenSearchRelToSqlConverter(OpenSearchSparkSqlDialect.DEFAULT);
     this.settings = mock(Settings.class);
   }