Skip to content
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

feat(pojo): support best_effort_filter on ReadRel messages #337

Merged
merged 1 commit into from
Mar 5, 2025
Merged

feat(pojo): support best_effort_filter on ReadRel messages #337

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
2 changes: 2 additions & 0 deletions core/src/main/java/io/substrait/relation/AbstractReadRel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public abstract class AbstractReadRel extends ZeroInputRel implements HasExtensi

public abstract Optional<Expression> getFilter();

public abstract Optional<Expression> getBestEffortFilter();

// TODO:
// public abstract Optional<MaskExpression>

Expand Down
24 changes: 24 additions & 0 deletions core/src/main/java/io/substrait/relation/ProtoRelConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,13 @@ protected EmptyScan newEmptyScan(ReadRel rel) {
var builder =
EmptyScan.builder()
.initialSchema(namedStruct)
.bestEffortFilter(
Optional.ofNullable(
rel.hasBestEffortFilter()
? new ProtoExpressionConverter(
lookup, extensions, namedStruct.struct(), this)
.from(rel.getBestEffortFilter())
: null))
.filter(
Optional.ofNullable(
rel.hasFilter()
Expand Down Expand Up @@ -238,6 +245,13 @@ protected NamedScan newNamedScan(ReadRel rel) {
NamedScan.builder()
.initialSchema(namedStruct)
.names(rel.getNamedTable().getNamesList())
.bestEffortFilter(
Optional.ofNullable(
rel.hasBestEffortFilter()
? new ProtoExpressionConverter(
lookup, extensions, namedStruct.struct(), this)
.from(rel.getBestEffortFilter())
: null))
.filter(
Optional.ofNullable(
rel.hasFilter()
Expand Down Expand Up @@ -279,6 +293,13 @@ protected LocalFiles newLocalFiles(ReadRel rel) {
rel.getLocalFiles().getItemsList().stream()
.map(this::newFileOrFiles)
.collect(java.util.stream.Collectors.toList()))
.bestEffortFilter(
Optional.ofNullable(
rel.hasBestEffortFilter()
? new ProtoExpressionConverter(
lookup, extensions, namedStruct.struct(), this)
.from(rel.getBestEffortFilter())
: null))
.filter(
Optional.ofNullable(
rel.hasFilter()
Expand Down Expand Up @@ -356,6 +377,9 @@ protected VirtualTableScan newVirtualTable(ReadRel rel) {

var builder =
VirtualTableScan.builder()
.bestEffortFilter(
Optional.ofNullable(
rel.hasBestEffortFilter() ? converter.from(rel.getBestEffortFilter()) : null))
.filter(Optional.ofNullable(rel.hasFilter() ? converter.from(rel.getFilter()) : null))
.initialSchema(NamedStruct.fromProto(rel.getBaseSchema(), protoTypeConverter))
.rows(structLiterals);
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/java/io/substrait/relation/RelProtoConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ public Rel visit(NamedScan namedScan) throws RuntimeException {
.setBaseSchema(namedScan.getInitialSchema().toProto(typeProtoConverter));

namedScan.getFilter().ifPresent(f -> builder.setFilter(toProto(f)));
namedScan.getBestEffortFilter().ifPresent(f -> builder.setBestEffortFilter(toProto(f)));

namedScan.getExtension().ifPresent(ae -> builder.setAdvancedExtension(ae.toProto()));
return Rel.newBuilder().setRead(builder).build();
Expand All @@ -227,6 +228,7 @@ public Rel visit(LocalFiles localFiles) throws RuntimeException {
.build())
.setBaseSchema(localFiles.getInitialSchema().toProto(typeProtoConverter));
localFiles.getFilter().ifPresent(t -> builder.setFilter(toProto(t)));
localFiles.getBestEffortFilter().ifPresent(t -> builder.setBestEffortFilter(toProto(t)));

localFiles.getExtension().ifPresent(ae -> builder.setAdvancedExtension(ae.toProto()));
return Rel.newBuilder().setRead(builder.build()).build();
Expand Down Expand Up @@ -450,6 +452,7 @@ public Rel visit(VirtualTableScan virtualTableScan) throws RuntimeException {
.setBaseSchema(virtualTableScan.getInitialSchema().toProto(typeProtoConverter));

virtualTableScan.getFilter().ifPresent(f -> builder.setFilter(toProto(f)));
virtualTableScan.getBestEffortFilter().ifPresent(f -> builder.setBestEffortFilter(toProto(f)));

virtualTableScan.getExtension().ifPresent(ae -> builder.setAdvancedExtension(ae.toProto()));
return Rel.newBuilder().setRead(builder).build();
Expand Down
4 changes: 4 additions & 0 deletions core/src/test/java/io/substrait/type/proto/ReadRelRoundtripTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ void namedScan() {
namedScan =
NamedScan.builder()
.from(namedScan)
.bestEffortFilter(
b.equal(b.fieldReference(namedScan, 0), b.fieldReference(namedScan, 1)))
.filter(b.equal(b.fieldReference(namedScan, 0), b.fieldReference(namedScan, 1)))
.build();

Expand Down Expand Up @@ -55,6 +57,8 @@ void virtualTable() {
virtTable =
VirtualTableScan.builder()
.from(virtTable)
.bestEffortFilter(
b.equal(b.fieldReference(virtTable, 0), b.fieldReference(virtTable, 1)))
.filter(b.equal(b.fieldReference(virtTable, 0), b.fieldReference(virtTable, 1)))
.build();
verifyRoundTrip(virtTable);
Expand Down
Loading