Skip to content

refactor(isthmus): simplify OuterReferenceResolver #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nielspardon wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −15
Open

refactor(isthmus): simplify OuterReferenceResolver #665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions isthmus/src/main/java/io/substrait/isthmus/OuterReferenceResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,8 @@ public OuterReferenceResolver() {
fieldAccessDepthMap = new IdentityHashMap<>();
}

public int getStepsOut(RexFieldAccess fieldAccess) {
return fieldAccessDepthMap.get(fieldAccess);
}

public RelNode apply(RelNode r) {
return reverseAccept(r);
}

public Map<RexFieldAccess, Integer> getFieldAccessDepthMap() {
public Map<RexFieldAccess, Integer> apply(RelNode r) {
reverseAccept(r);
return fieldAccessDepthMap;
}

Expand Down
3 changes: 1 addition & 2 deletions isthmus/src/main/java/io/substrait/isthmus/SubstraitRelVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,8 +609,7 @@ public Rel visitOther(RelNode other) {

protected void popFieldAccessDepthMap(RelNode root) {
final OuterReferenceResolver resolver = new OuterReferenceResolver();
resolver.apply(root);
fieldAccessDepthMap = resolver.getFieldAccessDepthMap();
fieldAccessDepthMap = resolver.apply(root);
}

public Integer getFieldAccessDepth(RexFieldAccess fieldAccess) {
Expand Down
5 changes: 1 addition & 4 deletions isthmus/src/test/java/io/substrait/isthmus/OuterReferenceResolverTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ private static void validateOuterRef(

private static Map<RexFieldAccess, Integer> buildOuterFieldRefMap(final RelNode root) {
final OuterReferenceResolver resolver = new OuterReferenceResolver();
final Map<RexFieldAccess, Integer> fieldAccessDepthMap = resolver.getFieldAccessDepthMap();
Assertions.assertEquals(0, fieldAccessDepthMap.size());
resolver.apply(root);
return fieldAccessDepthMap;
return resolver.apply(root);
}

@Test
Expand Down