Skip to content

fix(core): preserve extended aggregate sorts and options #1264

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

Draft
bvolpato wants to merge 1 commit into
base: main
Choose a base branch
from
+68 −0
Draft

fix(core): preserve extended aggregate sorts and options #1264

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
14 changes: 14 additions & 0 deletions core/src/main/java/io/substrait/relation/AggregateFunctionProtoConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import io.substrait.extension.SimpleExtension;
import io.substrait.proto.AggregateFunction;
import io.substrait.proto.FunctionArgument;
import io.substrait.proto.SortField;
import io.substrait.type.proto.TypeProtoConverter;
import io.substrait.util.EmptyVisitationContext;
import java.util.List;
Expand Down Expand Up @@ -56,8 +57,21 @@ public AggregateFunction toProto(Aggregate.Measure measure) {
args.get(i)
.accept(aggFuncDef, i, argVisitor, EmptyVisitationContext.INSTANCE))
.collect(Collectors.toList()))
.addAllSorts(
measure.getFunction().sort().stream()
.map(
sort ->
SortField.newBuilder()
.setExpr(exprProtoConverter.toProto(sort.expr()))
.setDirection(sort.direction().toProto())
.build())
.collect(Collectors.toList()))
.setFunctionReference(
functionCollector.getFunctionReference(measure.getFunction().declaration()))
.addAllOptions(
measure.getFunction().options().stream()
.map(ExpressionProtoConverter::from)
.collect(Collectors.toList()))
.build();
}
}
54 changes: 54 additions & 0 deletions core/src/test/java/io/substrait/extendedexpression/ExtendedExpressionRoundTripTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
import io.substrait.expression.Expression;
import io.substrait.expression.ExpressionCreator;
import io.substrait.expression.FieldReference;
import io.substrait.expression.FunctionOption;
import io.substrait.expression.ImmutableFieldReference;
import io.substrait.extension.DefaultExtensionCatalog;
import io.substrait.extension.SimpleExtension;
import io.substrait.relation.Aggregate;
import io.substrait.type.NamedStruct;
import io.substrait.type.Type;
Expand Down Expand Up @@ -41,6 +43,58 @@ void testRoundTrip(ExtendedExpression.ExpressionReferenceBase expressionReferenc
assertExtendedExpressionOperation(expressionReferences, namedStruct);
}

@Test
void preservesAggregateOrderingAndFunctionsUsedOnlyInSorts() {
FieldReference value = FieldReference.newRootStructReference(0, R.STRING);
FieldReference sortKey = FieldReference.newRootStructReference(1, R.I64);
AggregateFunctionInvocation function =
AggregateFunctionInvocation.builder()
.declaration(
extensions.getAggregateFunction(
SimpleExtension.FunctionAnchor.of(
DefaultExtensionCatalog.FUNCTIONS_STRING, "string_agg:str_str")))
.addArguments(value, ExpressionCreator.string(false, ","))
.outputType(R.STRING)
.aggregationPhase(Expression.AggregationPhase.INITIAL_TO_RESULT)
.invocation(Expression.AggregationInvocation.ALL)
.addSort(
Expression.SortField.builder()
.expr(sb.add(sortKey, sb.i64(1)))
.direction(Expression.SortDirection.DESC_NULLS_LAST)
.build(),
Expression.SortField.builder()
.expr(value)
.direction(Expression.SortDirection.ASC_NULLS_FIRST)
.build())
.build();

assertExtendedExpressionOperation(
List.of(
ImmutableAggregateFunctionReference.builder()
.measure(Aggregate.Measure.builder().function(function).build())
.addOutputNames("concatenated")
.build()),
NamedStruct.of(List.of("value", "sort_key"), R.struct(R.STRING, R.I64)));
}

@Test
void preservesAggregateOptionPreferences() {
AggregateFunctionInvocation function =
AggregateFunctionInvocation.builder()
.from(sb.sum(FieldReference.newRootStructReference(0, R.I64)).getFunction())
.addOptions(
FunctionOption.builder().name("overflow").addValues("ERROR", "SATURATE").build())
.build();

assertExtendedExpressionOperation(
List.of(
ImmutableAggregateFunctionReference.builder()
.measure(Aggregate.Measure.builder().function(function).build())
.addOutputNames("total")
.build()),
NamedStruct.of(List.of("value"), R.struct(R.I64)));
}

@Test
void getNoExpressionDefined() {
IllegalStateException illegalStateException =
Expand Down
Loading