Skip to content

Commit 83829c3

Browse files
vbaruavbarua
committed
refactor: rename SubstraitRelVisitor to CalciteToSubstraitVisitor
1 parent 65aefbe commit 83829c3

9 files changed

+39
-31
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444

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

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

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

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

65-
public SubstraitRelVisitor(
65+
public CalciteToSubstraitVisitor(
6666
RelDataTypeFactory typeFactory,
6767
SimpleExtension.ExtensionCollection extensions,
6868
FeatureBoard features) {
@@ -80,7 +80,7 @@ public SubstraitRelVisitor(
8080
this.featureBoard = features;
8181
}
8282

83-
public SubstraitRelVisitor(
83+
public CalciteToSubstraitVisitor(
8484
RelDataTypeFactory typeFactory,
8585
ScalarFunctionConverter scalarFunctionConverter,
8686
AggregateFunctionConverter aggregateFunctionConverter,
@@ -386,8 +386,9 @@ public static Plan.Root convert(RelRoot relRoot, SimpleExtension.ExtensionCollec
386386

387387
public static Plan.Root convert(
388388
RelRoot relRoot, SimpleExtension.ExtensionCollection extensions, FeatureBoard features) {
389-
SubstraitRelVisitor visitor =
390-
new SubstraitRelVisitor(relRoot.rel.getCluster().getTypeFactory(), extensions, features);
389+
CalciteToSubstraitVisitor visitor =
390+
new CalciteToSubstraitVisitor(
391+
relRoot.rel.getCluster().getTypeFactory(), extensions, features);
391392
visitor.popFieldAccessDepthMap(relRoot.rel);
392393
Rel rel = visitor.apply(relRoot.project());
393394

@@ -403,8 +404,8 @@ public static Rel convert(RelNode relNode, SimpleExtension.ExtensionCollection e
403404

404405
public static Rel convert(
405406
RelNode relNode, SimpleExtension.ExtensionCollection extensions, FeatureBoard features) {
406-
SubstraitRelVisitor visitor =
407-
new SubstraitRelVisitor(relNode.getCluster().getTypeFactory(), extensions, features);
407+
CalciteToSubstraitVisitor visitor =
408+
new CalciteToSubstraitVisitor(relNode.getCluster().getTypeFactory(), extensions, features);
408409
visitor.popFieldAccessDepthMap(relNode);
409410
return visitor.apply(relNode);
410411
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ private Plan executeInner(String sql, Prepare.CatalogReader catalogReader)
5252
PlanRel.newBuilder()
5353
.setRoot(
5454
relProtoConverter.toProto(
55-
SubstraitRelVisitor.convert(root, EXTENSION_COLLECTION, featureBoard))));
55+
CalciteToSubstraitVisitor.convert(
56+
root, EXTENSION_COLLECTION, featureBoard))));
5657
});
5758
functionCollector.addExtensionsToPlan(plan);
5859
return plan.build();

‎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/NameRoundtripTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void preserveNamesFromSql() throws Exception {
3232
assertEquals(expectedNames, calciteRelRoot1.validatedRowType.getFieldNames());
3333

3434
io.substrait.plan.Plan.Root substraitRelRoot =
35-
SubstraitRelVisitor.convert(calciteRelRoot1, EXTENSION_COLLECTION);
35+
CalciteToSubstraitVisitor.convert(calciteRelRoot1, EXTENSION_COLLECTION);
3636
assertEquals(expectedNames, substraitRelRoot.getNames());
3737

3838
org.apache.calcite.rel.RelRoot calciteRelRoot2 = substraitToCalcite.convert(substraitRelRoot);

‎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: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected Plan assertProtoPlanRoundrip(
8080
var rootRels = SubstraitSqlToCalcite.convertSelects(query, catalogReader);
8181
assertEquals(rootRels.size(), plan.getRoots().size());
8282
for (int i = 0; i < rootRels.size(); i++) {
83-
Plan.Root rootRel = SubstraitRelVisitor.convert(rootRels.get(i), EXTENSION_COLLECTION);
83+
Plan.Root rootRel = CalciteToSubstraitVisitor.convert(rootRels.get(i), EXTENSION_COLLECTION);
8484
assertEquals(
8585
rootRel.getInput().getRecordType(), plan.getRoots().get(i).getInput().getRecordType());
8686
}
@@ -120,13 +120,13 @@ protected RelRoot assertSqlSubstraitRelRoundTrip(
120120
RelRoot relRoot1 = SubstraitSqlToCalcite.convertSelect(query, catalogReader);
121121

122122
// 2. Calcite RelRoot -> Substrait Rel
123-
Plan.Root pojo1 = SubstraitRelVisitor.convert(relRoot1, EXTENSION_COLLECTION);
123+
Plan.Root pojo1 = CalciteToSubstraitVisitor.convert(relRoot1, EXTENSION_COLLECTION);
124124

125125
// 3. Substrait Rel -> Calcite RelNode
126126
RelRoot relRoot2 = substraitToCalcite.convert(pojo1);
127127

128128
// 4. Calcite RelNode -> Substrait Rel
129-
Plan.Root pojo2 = SubstraitRelVisitor.convert(relRoot2, EXTENSION_COLLECTION);
129+
Plan.Root pojo2 = CalciteToSubstraitVisitor.convert(relRoot2, EXTENSION_COLLECTION);
130130

131131
Assertions.assertEquals(pojo1, pojo2);
132132
return relRoot2;
@@ -166,7 +166,7 @@ protected void assertFullRoundTrip(String sqlQuery, Prepare.CatalogReader catalo
166166
RelRoot calcite1 = SubstraitSqlToCalcite.convertSelect(sqlQuery, catalogReader);
167167

168168
// Calcite 1 -> Substrait POJO 1
169-
Plan.Root pojo1 = SubstraitRelVisitor.convert(calcite1, EXTENSION_COLLECTION);
169+
Plan.Root pojo1 = CalciteToSubstraitVisitor.convert(calcite1, EXTENSION_COLLECTION);
170170

171171
// Substrait POJO 1 -> Substrait Proto
172172
io.substrait.proto.RelRoot proto = new RelProtoConverter(extensionCollector).toProto(pojo1);
@@ -184,7 +184,7 @@ protected void assertFullRoundTrip(String sqlQuery, Prepare.CatalogReader catalo
184184
assertNotNull(calcite2);
185185

186186
// Calcite 2 -> Substrait POJO 3
187-
Plan.Root pojo3 = SubstraitRelVisitor.convert(calcite2, EXTENSION_COLLECTION);
187+
Plan.Root pojo3 = CalciteToSubstraitVisitor.convert(calcite2, EXTENSION_COLLECTION);
188188

189189
// Verify that POJOs are the same
190190
assertEquals(pojo1, pojo3);
@@ -216,7 +216,8 @@ protected void assertFullRoundTrip(Rel pojo1) {
216216
RelNode calcite = new SubstraitToCalcite(EXTENSION_COLLECTION, typeFactory).convert(pojo2);
217217

218218
// Calcite -> Substrait POJO 3
219-
io.substrait.relation.Rel pojo3 = SubstraitRelVisitor.convert(calcite, EXTENSION_COLLECTION);
219+
io.substrait.relation.Rel pojo3 =
220+
CalciteToSubstraitVisitor.convert(calcite, EXTENSION_COLLECTION);
220221

221222
// Verify that POJOs are the same
222223
assertEquals(pojo1, pojo3);
@@ -247,7 +248,8 @@ protected void assertFullRoundTrip(Plan.Root pojo1) {
247248
RelRoot calcite = new SubstraitToCalcite(EXTENSION_COLLECTION, typeFactory).convert(pojo2);
248249

249250
// Calcite -> Substrait POJO 3
250-
io.substrait.plan.Plan.Root pojo3 = SubstraitRelVisitor.convert(calcite, EXTENSION_COLLECTION);
251+
io.substrait.plan.Plan.Root pojo3 =
252+
CalciteToSubstraitVisitor.convert(calcite, EXTENSION_COLLECTION);
251253

252254
// Verify that POJOs are the same
253255
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)