refactor: rename SubstraitRelNodeConverter to SubstraitToCalciteVisitor

Author: vbarua

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

@@ -25,7 +25,7 @@
 /**
  * Converts between Substrait {@link Rel}s and Calcite {@link RelNode}s.
  *
- * <p>Can be extended to customize the {@link RelBuilder} and {@link SubstraitRelNodeConverter} used
+ * <p>Can be extended to customize the {@link RelBuilder} and {@link SubstraitToCalciteVisitor} used
  * in the conversion.
  */
 public class SubstraitToCalcite {
@@ -68,28 +68,28 @@ protected RelBuilder createRelBuilder(CalciteSchema schema) {
   }
 
   /**
-   * Creates a {@link SubstraitRelNodeConverter} from the {@link RelBuilder}
+   * Creates a {@link SubstraitToCalciteVisitor} from the {@link RelBuilder}
    *
-   * <p>Override this method to customize the {@link SubstraitRelNodeConverter}.
+   * <p>Override this method to customize the {@link SubstraitToCalciteVisitor}.
    */
-  protected SubstraitRelNodeConverter createSubstraitRelNodeConverter(RelBuilder relBuilder) {
-    return new SubstraitRelNodeConverter(extensions, typeFactory, relBuilder);
+  protected SubstraitToCalciteVisitor createSubstraitRelNodeConverter(RelBuilder relBuilder) {
+    return new SubstraitToCalciteVisitor(extensions, typeFactory, relBuilder);
   }
 
   /**
    * Converts a Substrait {@link Rel} to a Calcite {@link RelNode}
    *
    * <p>Generates a {@link CalciteSchema} based on the contents of the {@link Rel}, which will be
    * used to construct a {@link RelBuilder} with the required schema information to build {@link
-   * RelNode}s, and a then a {@link SubstraitRelNodeConverter} to perform the actual conversion.
+   * RelNode}s, and a then a {@link SubstraitToCalciteVisitor} to perform the actual conversion.
    *
    * @param rel {@link Rel} to convert
    * @return {@link RelNode}
    */
   public RelNode convert(Rel rel) {
     CalciteSchema rootSchema = toSchema(rel);
     RelBuilder relBuilder = createRelBuilder(rootSchema);
-    SubstraitRelNodeConverter converter = createSubstraitRelNodeConverter(relBuilder);
+    SubstraitToCalciteVisitor converter = createSubstraitRelNodeConverter(relBuilder);
     return rel.accept(converter);
   }
 

isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java renamed to isthmus/src/main/java/io/substrait/isthmus/SubstraitToCalciteVisitor.java

@@ -56,7 +56,7 @@
  * RelVisitor to convert Substrait Rel plan to Calcite RelNode plan. Unsupported Rel node will call
  * visitFallback and throw UnsupportedOperationException.
  */
-public class SubstraitRelNodeConverter extends AbstractRelVisitor<RelNode, RuntimeException> {
+public class SubstraitToCalciteVisitor extends AbstractRelVisitor<RelNode, RuntimeException> {
 
   protected final RelDataTypeFactory typeFactory;
 
@@ -68,7 +68,7 @@ public class SubstraitRelNodeConverter extends AbstractRelVisitor<RelNode, Runti
   protected final RexBuilder rexBuilder;
   private final TypeConverter typeConverter;
 
-  public SubstraitRelNodeConverter(
+  public SubstraitToCalciteVisitor(
       SimpleExtension.ExtensionCollection extensions,
       RelDataTypeFactory typeFactory,
       RelBuilder relBuilder) {
@@ -81,7 +81,7 @@ public SubstraitRelNodeConverter(
         TypeConverter.DEFAULT);
   }
 
-  public SubstraitRelNodeConverter(
+  public SubstraitToCalciteVisitor(
       RelDataTypeFactory typeFactory,
       RelBuilder relBuilder,
       ScalarFunctionConverter scalarFunctionConverter,
@@ -99,7 +99,7 @@ public SubstraitRelNodeConverter(
             typeFactory, scalarFunctionConverter, windowFunctionConverter, typeConverter));
   }
 
-  public SubstraitRelNodeConverter(
+  public SubstraitToCalciteVisitor(
       RelDataTypeFactory typeFactory,
       RelBuilder relBuilder,
       ScalarFunctionConverter scalarFunctionConverter,
@@ -132,7 +132,7 @@ public static RelNode convert(
                 .build());
 
     return relRoot.accept(
-        new SubstraitRelNodeConverter(
+        new SubstraitToCalciteVisitor(
             EXTENSION_COLLECTION, relOptCluster.getTypeFactory(), relBuilder));
   }
 

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

@@ -16,10 +16,10 @@ public SubstraitToSql() {
   public RelNode substraitRelToCalciteRel(Rel relRoot, List<String> tables)
       throws SqlParseException {
     CalciteCatalogReader catalogReader = registerCreateTables(tables);
-    return SubstraitRelNodeConverter.convert(relRoot, relOptCluster, catalogReader, parserConfig);
+    return SubstraitToCalciteVisitor.convert(relRoot, relOptCluster, catalogReader, parserConfig);
   }
 
   public RelNode substraitRelToCalciteRel(Rel relRoot, Prepare.CatalogReader catalog) {
-    return SubstraitRelNodeConverter.convert(relRoot, relOptCluster, catalog, parserConfig);
+    return SubstraitToCalciteVisitor.convert(relRoot, relOptCluster, catalog, parserConfig);
   }
 }

isthmus/src/main/java/io/substrait/isthmus/expression/ExpressionRexConverter.java

@@ -16,7 +16,7 @@
 import io.substrait.expression.FunctionArg;
 import io.substrait.expression.WindowBound;
 import io.substrait.extension.SimpleExtension;
-import io.substrait.isthmus.SubstraitRelNodeConverter;
+import io.substrait.isthmus.SubstraitToCalciteVisitor;
 import io.substrait.isthmus.TypeConverter;
 import io.substrait.type.StringTypeVisitor;
 import io.substrait.type.Type;
@@ -60,7 +60,7 @@ public class ExpressionRexConverter extends AbstractExpressionVisitor<RexNode, R
   protected final RexBuilder rexBuilder;
   protected final ScalarFunctionConverter scalarFunctionConverter;
   protected final WindowFunctionConverter windowFunctionConverter;
-  protected SubstraitRelNodeConverter relNodeConverter;
+  protected SubstraitToCalciteVisitor relNodeConverter;
 
   private static final SqlIntervalQualifier YEAR_MONTH_INTERVAL =
       new SqlIntervalQualifier(
@@ -90,8 +90,8 @@ public ExpressionRexConverter(
     this.windowFunctionConverter = windowFunctionConverter;
   }
 
-  public void setRelNodeConverter(final SubstraitRelNodeConverter substraitRelNodeConverter) {
-    this.relNodeConverter = substraitRelNodeConverter;
+  public void setRelNodeConverter(final SubstraitToCalciteVisitor substraitToCalciteVisitor) {
+    this.relNodeConverter = substraitToCalciteVisitor;
   }
 
   @Override

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

@@ -260,8 +260,8 @@ public CustomSubstraitToCalcite(
     }
 
     @Override
-    protected SubstraitRelNodeConverter createSubstraitRelNodeConverter(RelBuilder relBuilder) {
-      return new SubstraitRelNodeConverter(
+    protected SubstraitToCalciteVisitor createSubstraitRelNodeConverter(RelBuilder relBuilder) {
+      return new SubstraitToCalciteVisitor(
           typeFactory,
           relBuilder,
           scalarFunctionConverter,

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

@@ -68,7 +68,7 @@ void roundtrip(Rel pojo1) {
 
     // Substrait POJO 2 -> Calcite
     var calcite =
-        pojo2.accept(new CustomSubstraitRelNodeConverter(extensions, typeFactory, builder));
+        pojo2.accept(new CustomSubstraitToCalciteVisitor(extensions, typeFactory, builder));
 
     // Calcite -> Substrait POJO 3
     var pojo3 = (new CustomCalciteToSubstraitVisitor(typeFactory, extensions)).apply(calcite);
@@ -180,12 +180,12 @@ protected Extension.MultiRelDetail detailFromExtensionMultiRel(Any any) {
   }
 
   /**
-   * Extends the standard {@link SubstraitRelNodeConverter} to handle Extension relations containing
+   * Extends the standard {@link SubstraitToCalciteVisitor} to handle Extension relations containing
    * {@link ColumnAppendDetail}
    */
-  static class CustomSubstraitRelNodeConverter extends SubstraitRelNodeConverter {
+  static class CustomSubstraitToCalciteVisitor extends SubstraitToCalciteVisitor {
 
-    public CustomSubstraitRelNodeConverter(
+    public CustomSubstraitToCalciteVisitor(
         SimpleExtension.ExtensionCollection extensions,
         RelDataTypeFactory typeFactory,
         RelBuilder relBuilder) {

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

@@ -37,8 +37,8 @@ public class SubstraitExpressionConverterTest extends PlanTestBase {
   final Rel commonTable =
       b.namedScan(List.of("example"), List.of("a", "b", "c", "d"), commonTableType);
 
-  final SubstraitRelNodeConverter relNodeConverter =
-      new SubstraitRelNodeConverter(extensions, typeFactory, builder);
+  final SubstraitToCalciteVisitor relNodeConverter =
+      new SubstraitToCalciteVisitor(extensions, typeFactory, builder);
 
   public SubstraitExpressionConverterTest() {
     converter = relNodeConverter.expressionRexConverter;

isthmus/src/test/java/io/substrait/isthmus/SubstraitRelNodeConverterTest.java renamed to isthmus/src/test/java/io/substrait/isthmus/SubstraitToCalciteVisitorTest.java

@@ -15,7 +15,7 @@
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-public class SubstraitRelNodeConverterTest extends PlanTestBase {
+public class SubstraitToCalciteVisitorTest extends PlanTestBase {
 
   static final TypeCreator R = TypeCreator.of(false);
   static final TypeCreator N = TypeCreator.of(true);