Skip to content

Commit a2e2d2a

Browse files
vbaruavbarua
committed
refactor: rename SubstraitRelVisitor to CalciteToSubstraitVisitor
1 parent c9195ef commit a2e2d2a

File tree

8 files changed

+36
-27
lines changed

8 files changed

+36
-27
lines changed

‎isthmus/src/main/java/io/substrait/isthmus/SubstraitRelVisitor.java‎ renamed to ‎isthmus/src/main/java/io/substrait/isthmus/CalciteToSubstraitVisitor.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@
4343

4444
@SuppressWarnings("UnstableApiUsage")
4545
@Value.Enclosing
46-
public class SubstraitRelVisitor extends RelNodeVisitor<Rel, RuntimeException> {
46+
public class CalciteToSubstraitVisitor extends RelNodeVisitor<Rel, RuntimeException> {
4747

4848
static final org.slf4j.Logger logger =
49-
org.slf4j.LoggerFactory.getLogger(SubstraitRelVisitor.class);
49+
org.slf4j.LoggerFactory.getLogger(CalciteToSubstraitVisitor.class);
5050
private static final FeatureBoard FEATURES_DEFAULT = ImmutableFeatureBoard.builder().build();
5151
private static final Expression.BoolLiteral TRUE = ExpressionCreator.bool(false, true);
5252

@@ -56,12 +56,12 @@ public class SubstraitRelVisitor extends RelNodeVisitor<Rel, RuntimeException> {
5656
protected final FeatureBoard featureBoard;
5757
private Map<RexFieldAccess, Integer> fieldAccessDepthMap;
5858

59-
public SubstraitRelVisitor(
59+
public CalciteToSubstraitVisitor(
6060
RelDataTypeFactory typeFactory, SimpleExtension.ExtensionCollection extensions) {
6161
this(typeFactory, extensions, FEATURES_DEFAULT);
6262
}
6363

64-
public SubstraitRelVisitor(
64+
public CalciteToSubstraitVisitor(
6565
RelDataTypeFactory typeFactory,
6666
SimpleExtension.ExtensionCollection extensions,
6767
FeatureBoard features) {
@@ -79,7 +79,7 @@ public SubstraitRelVisitor(
7979
this.featureBoard = features;
8080
}
8181

82-
public SubstraitRelVisitor(
82+
public CalciteToSubstraitVisitor(
8383
RelDataTypeFactory typeFactory,
8484
ScalarFunctionConverter scalarFunctionConverter,
8585
AggregateFunctionConverter aggregateFunctionConverter,
@@ -390,8 +390,8 @@ public static Rel convert(
390390

391391
private static Rel convert(
392392
RelNode rel, SimpleExtension.ExtensionCollection extensions, FeatureBoard features) {
393-
SubstraitRelVisitor visitor =
394-
new SubstraitRelVisitor(rel.getCluster().getTypeFactory(), extensions, features);
393+
CalciteToSubstraitVisitor visitor =
394+
new CalciteToSubstraitVisitor(rel.getCluster().getTypeFactory(), extensions, features);
395395
visitor.popFieldAccessDepthMap(rel);
396396
return visitor.apply(rel);
397397
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ private Plan executeInner(String sql, Prepare.CatalogReader catalogReader)
5353
.setRoot(
5454
io.substrait.proto.RelRoot.newBuilder()
5555
.setInput(
56-
SubstraitRelVisitor.convert(root, EXTENSION_COLLECTION, featureBoard)
56+
CalciteToSubstraitVisitor.convert(
57+
root, EXTENSION_COLLECTION, featureBoard)
5758
.accept(relProtoConverter))
5859
.addAllNames(
5960
TypeConverter.DEFAULT.toNamedStruct(root.validatedRowType).names())));

‎isthmus/src/main/java/io/substrait/isthmus/expression/AggregateFunctionConverter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import io.substrait.expression.FunctionArg;
88
import io.substrait.extension.SimpleExtension;
99
import io.substrait.isthmus.AggregateFunctions;
10-
import io.substrait.isthmus.SubstraitRelVisitor;
10+
import io.substrait.isthmus.CalciteToSubstraitVisitor;
1111
import io.substrait.isthmus.TypeConverter;
1212
import io.substrait.type.Type;
1313
import java.util.Collections;
@@ -59,7 +59,7 @@ protected AggregateFunctionInvocation generateBinding(
5959
List<Expression.SortField> sorts =
6060
agg.getCollation() != null
6161
? agg.getCollation().getFieldCollations().stream()
62-
.map(r -> SubstraitRelVisitor.toSortField(r, call.inputType))
62+
.map(r -> CalciteToSubstraitVisitor.toSortField(r, call.inputType))
6363
.collect(java.util.stream.Collectors.toList())
6464
: Collections.emptyList();
6565
Expression.AggregationInvocation invocation =

‎isthmus/src/main/java/io/substrait/isthmus/expression/RexExpressionConverter.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import io.substrait.expression.Expression;
44
import io.substrait.expression.FieldReference;
5+
import io.substrait.isthmus.CalciteToSubstraitVisitor;
56
import io.substrait.isthmus.CallConverter;
6-
import io.substrait.isthmus.SubstraitRelVisitor;
77
import io.substrait.isthmus.TypeConverter;
88
import io.substrait.relation.Rel;
99
import io.substrait.type.StringTypeVisitor;
@@ -36,11 +36,12 @@ public class RexExpressionConverter implements RexVisitor<Expression> {
3636
org.slf4j.LoggerFactory.getLogger(RexExpressionConverter.class);
3737

3838
private final List<CallConverter> callConverters;
39-
private final SubstraitRelVisitor relVisitor;
39+
private final CalciteToSubstraitVisitor relVisitor;
4040
private final TypeConverter typeConverter;
4141
private WindowFunctionConverter windowFunctionConverter;
4242

43-
public RexExpressionConverter(SubstraitRelVisitor relVisitor, CallConverter... callConverters) {
43+
public RexExpressionConverter(
44+
CalciteToSubstraitVisitor relVisitor, CallConverter... callConverters) {
4445
this(relVisitor, Arrays.asList(callConverters), null, TypeConverter.DEFAULT);
4546
}
4647

@@ -49,7 +50,7 @@ public RexExpressionConverter(CallConverter... callConverters) {
4950
}
5051

5152
public RexExpressionConverter(
52-
SubstraitRelVisitor relVisitor,
53+
CalciteToSubstraitVisitor relVisitor,
5354
List<CallConverter> callConverters,
5455
WindowFunctionConverter windowFunctionConverter,
5556
TypeConverter typeConverter) {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ protected SubstraitRelNodeConverter createSubstraitRelNodeConverter(RelBuilder r
275275
new CustomSubstraitToCalcite(extensionCollection, typeFactory, typeConverter);
276276

277277
// Create a SubstraitRelVisitor that uses the custom Function Converters
278-
final SubstraitRelVisitor calciteToSubstrait =
279-
new SubstraitRelVisitor(
278+
final CalciteToSubstraitVisitor calciteToSubstrait =
279+
new CalciteToSubstraitVisitor(
280280
typeFactory,
281281
scalarFunctionConverter,
282282
aggregateFunctionConverter,

‎isthmus/src/test/java/io/substrait/isthmus/OptimizerIntegrationTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ void conversionHandlesBuiltInSum0CallAddedByRule() throws SqlParseException, IOE
4242
assertDoesNotThrow(
4343
() ->
4444
// Conversion of the new plan should succeed
45-
SubstraitRelVisitor.convert(RelRoot.of(newPlan, relRoot.kind), EXTENSION_COLLECTION));
45+
CalciteToSubstraitVisitor.convert(
46+
RelRoot.of(newPlan, relRoot.kind), EXTENSION_COLLECTION));
4647
}
4748
}

‎isthmus/src/test/java/io/substrait/isthmus/PlanTestBase.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected Plan assertProtoPlanRoundrip(
8181
var rootRels = SubstraitSqlToCalcite.convertSelects(query, catalogReader);
8282
assertEquals(rootRels.size(), plan.getRoots().size());
8383
for (int i = 0; i < rootRels.size(); i++) {
84-
var rootRel = SubstraitRelVisitor.convert(rootRels.get(i), EXTENSION_COLLECTION);
84+
var rootRel = CalciteToSubstraitVisitor.convert(rootRels.get(i), EXTENSION_COLLECTION);
8585
assertEquals(rootRel.getRecordType(), plan.getRoots().get(i).getInput().getRecordType());
8686
}
8787
return plan;
@@ -119,14 +119,15 @@ protected RelNode assertSqlSubstraitRelRoundTrip(
119119
RelRoot relRoot = SubstraitSqlToCalcite.convertSelect(query, catalogReader);
120120

121121
// 2. Calcite RelRoot -> Substrait Rel
122-
Rel pojo1 = SubstraitRelVisitor.convert(relRoot, EXTENSION_COLLECTION);
122+
Rel pojo1 = CalciteToSubstraitVisitor.convert(relRoot, EXTENSION_COLLECTION);
123123

124124
// 3. Substrait Rel -> Calcite RelNode
125125
RelNode relNode = substraitToCalcite.convert(pojo1);
126126

127127
// 4. Calcite RelNode -> Substrait Rel
128128
Rel pojo2 =
129-
SubstraitRelVisitor.convert(RelRoot.of(relNode, SqlKind.SELECT), EXTENSION_COLLECTION);
129+
CalciteToSubstraitVisitor.convert(
130+
RelRoot.of(relNode, SqlKind.SELECT), EXTENSION_COLLECTION);
130131

131132
Assertions.assertEquals(pojo1, pojo2);
132133
return relNode;
@@ -165,7 +166,8 @@ protected void assertFullRoundTrip(String sqlQuery, Prepare.CatalogReader catalo
165166
var extensionCollector = new ExtensionCollector();
166167

167168
// Calcite 1 -> Substrait POJO 1
168-
io.substrait.relation.Rel pojo1 = SubstraitRelVisitor.convert(calcite1, EXTENSION_COLLECTION);
169+
io.substrait.relation.Rel pojo1 =
170+
CalciteToSubstraitVisitor.convert(calcite1, EXTENSION_COLLECTION);
169171

170172
// Substrait POJO 1 -> Substrait Proto
171173
io.substrait.proto.Rel proto = new RelProtoConverter(extensionCollector).toProto(pojo1);
@@ -185,7 +187,8 @@ protected void assertFullRoundTrip(String sqlQuery, Prepare.CatalogReader catalo
185187

186188
// Calcite 2 -> Substrait POJO 3
187189
io.substrait.relation.Rel pojo3 =
188-
SubstraitRelVisitor.convert(RelRoot.of(calcite2, calcite1.kind), EXTENSION_COLLECTION);
190+
CalciteToSubstraitVisitor.convert(
191+
RelRoot.of(calcite2, calcite1.kind), EXTENSION_COLLECTION);
189192

190193
// Verify that POJOs are the same
191194
assertEquals(pojo1, pojo3);
@@ -218,7 +221,8 @@ protected void assertFullRoundTrip(Rel pojo1) {
218221
// Calcite -> Substrait POJO 3
219222
io.substrait.relation.Rel pojo3 =
220223
// SqlKind.SELECT is used because the majority of our tests are SELECT queries
221-
SubstraitRelVisitor.convert(RelRoot.of(calcite, SqlKind.SELECT), EXTENSION_COLLECTION);
224+
CalciteToSubstraitVisitor.convert(
225+
RelRoot.of(calcite, SqlKind.SELECT), EXTENSION_COLLECTION);
222226

223227
// Verify that POJOs are the same
224228
assertEquals(pojo1, pojo3);

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void roundtrip(Rel pojo1) {
7171
pojo2.accept(new CustomSubstraitRelNodeConverter(extensions, typeFactory, builder));
7272

7373
// Calcite -> Substrait POJO 3
74-
var pojo3 = (new CustomSubstraitRelVisitor(typeFactory, extensions)).apply(calcite);
74+
var pojo3 = (new CustomCalciteToSubstraitVisitor(typeFactory, extensions)).apply(calcite);
7575
assertEquals(pojo1, pojo3);
7676
}
7777

@@ -232,10 +232,12 @@ public RelNode visit(ExtensionMulti extensionMulti) throws RuntimeException {
232232
}
233233
}
234234

235-
/** Extends the standard {@link SubstraitRelVisitor} to handle the {@link ColumnAppenderRel} */
236-
static class CustomSubstraitRelVisitor extends SubstraitRelVisitor {
235+
/**
236+
* Extends the standard {@link CalciteToSubstraitVisitor} to handle the {@link ColumnAppenderRel}
237+
*/
238+
static class CustomCalciteToSubstraitVisitor extends CalciteToSubstraitVisitor {
237239

238-
public CustomSubstraitRelVisitor(
240+
public CustomCalciteToSubstraitVisitor(
239241
RelDataTypeFactory typeFactory, SimpleExtension.ExtensionCollection extensions) {
240242
super(typeFactory, extensions);
241243
}

0 commit comments

Comments
 (0)