Skip to content

feat(isthmus)!: remove invalid SetOp to Calcite relation mappings #998

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
Open

feat(isthmus)!: remove invalid SetOp to Calcite relation mappings #998

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
6 changes: 0 additions & 6 deletions isthmus/src/main/java/io/substrait/isthmus/SubstraitRelNodeConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,10 +285,6 @@ public RelNode visit(Set set, Context context) throws RuntimeException {
input -> {
relBuilder.push(input.accept(this, context));
});
// TODO: MINUS_MULTISET and INTERSECTION_PRIMARY mappings are set to be removed as they do not
// correspond to the Calcite relations they are associated with. They are retained for now
// to enable users to migrate off of them.
// See: https://github.com/substrait-io/substrait-java/issues/303
RelBuilder builder = getRelBuilder(set);
RelNode node = builder.build();
return applyRemap(node, set.getRemap());
Expand All @@ -301,9 +297,7 @@ private RelBuilder getRelBuilder(Set set) {
case MINUS_PRIMARY:
return relBuilder.minus(false, numInputs);
case MINUS_PRIMARY_ALL:
case MINUS_MULTISET:
return relBuilder.minus(true, numInputs);
case INTERSECTION_PRIMARY:
case INTERSECTION_MULTISET:
return relBuilder.intersect(false, numInputs);
case INTERSECTION_MULTISET_ALL:
Expand Down
20 changes: 20 additions & 0 deletions isthmus/src/test/java/io/substrait/isthmus/SubstraitRelNodeConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package io.substrait.isthmus;

import static org.junit.jupiter.api.Assertions.assertThrows;

import io.substrait.plan.Plan;
import io.substrait.relation.Join.JoinType;
import io.substrait.relation.Rel;
Expand Down Expand Up @@ -242,6 +244,24 @@ void emit() {
RelNode relNode = substraitToCalcite.convert(root.getInput());
assertRowMatch(relNode.getRowType(), R.I32, N.STRING);
}

// MINUS_MULTISET and INTERSECTION_PRIMARY have no equivalent Calcite relation, so converting
// them to Calcite is unsupported.
@Test
void minusMultisetUnsupported() {
Plan.Root root = sb.root(sb.set(SetOp.MINUS_MULTISET, commonTable, commonTable));

assertThrows(
UnsupportedOperationException.class, () -> substraitToCalcite.convert(root.getInput()));
}

@Test
void intersectionPrimaryUnsupported() {
Plan.Root root = sb.root(sb.set(SetOp.INTERSECTION_PRIMARY, commonTable, commonTable));

assertThrows(
UnsupportedOperationException.class, () -> substraitToCalcite.convert(root.getInput()));
}
}

@Nested
Expand Down
3 changes: 2 additions & 1 deletion isthmus/src/test/java/io/substrait/isthmus/utils/SetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ private static String asString(Set.SetOp op) {
}

// Generate all SetOp types excluding:
// * MINUS_MULTISET, INTERSECTION_PRIMARY: do not map to Calcite relations
// * MINUS_MULTISET, INTERSECTION_PRIMARY: no equivalent Calcite relation, so they are
// unsupported in Substrait -> Calcite conversion
// * UNKNOWN: invalid
public static Stream<Arguments> setTestConfig() {
return Arrays.stream(Set.SetOp.values())
Expand Down
Loading