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

[core] Check that all fields with aggregate functions in partial-update should be protected by sequence-group #5034

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+39 −7
Open

[core] Check that all fields with aggregate functions in partial-update should be protected by sequence-group #5034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a4cdc5
[core] Check that all fields with aggregate functions in partial-upda…
Feb 7, 2025
308231d
fix
Feb 7, 2025
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
9 changes: 7 additions & 2 deletions ...on-core/src/main/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.mergetree.compact.aggregate.FieldAggregator;
import org.apache.paimon.mergetree.compact.aggregate.factory.FieldAggregatorFactory;
import org.apache.paimon.mergetree.compact.aggregate.factory.FieldLastNonNullValueAggFactory;
import org.apache.paimon.mergetree.compact.aggregate.factory.FieldPrimaryKeyAggFactory;
import org.apache.paimon.options.Options;
import org.apache.paimon.types.DataField;
Expand Down Expand Up @@ -548,9 +549,13 @@ private Map<Integer, Supplier<FieldAggregator>> createFieldAggregators(

String aggFuncName = getAggFuncName(options, fieldName);
if (aggFuncName != null) {
// last_non_null_value doesn't require sequence group
checkArgument(
!fieldSeqComparators.isEmpty(),
"Must use sequence group for aggregation functions.");
aggFuncName.equals(FieldLastNonNullValueAggFactory.NAME)
|| fieldSeqComparators.containsKey(
fieldNames.indexOf(fieldName)),
"Must use sequence group for aggregation functions but not found for field %s.",
fieldName);
fieldAggregators.put(
i,
() ->
Expand Down
37 changes: 32 additions & 5 deletions ...ore/src/test/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.apache.paimon.KeyValue;
import org.apache.paimon.data.GenericRow;
import org.apache.paimon.options.Options;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypes;
import org.apache.paimon.types.RowKind;
import org.apache.paimon.types.RowType;
Expand All @@ -31,6 +32,7 @@
import org.junit.jupiter.api.Test;

import static org.apache.paimon.CoreOptions.FIELDS_DEFAULT_AGG_FUNC;
import static org.apache.paimon.testutils.assertj.PaimonAssertions.anyCauseMatches;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

Expand Down Expand Up @@ -820,14 +822,39 @@ public void testMultiSequenceFieldsPartialUpdateWithAggregationProjectPushDown()

@Test
public void testAggregationWithoutSequenceGroup() {
Options options = new Options();
options.set("fields.f1.aggregate-function", "listagg");
RowType rowType = RowType.of(DataTypes.INT(), DataTypes.INT());
RowType rowType =
RowType.of(
new DataType[] {
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT(),
DataTypes.INT()
},
new String[] {"pk", "f0", "g0", "f1", "g1"});

Options options1 = new Options();
options1.set("fields.f0.aggregate-function", "listagg");
options1.set("fields.f1.aggregate-function", "listagg");
assertThatThrownBy(
() ->
PartialUpdateMergeFunction.factory(
options, rowType, ImmutableList.of("f0")))
.hasMessageContaining("Must use sequence group for aggregation functions");
options1, rowType, ImmutableList.of("pk")))
.satisfies(
anyCauseMatches(
IllegalArgumentException.class,
"Must use sequence group for aggregation functions but not found for field f0."));

Options options2 = new Options(options1.toMap());
options2.set("fields.g0.sequence-group", "f0");
assertThatThrownBy(
() ->
PartialUpdateMergeFunction.factory(
options2, rowType, ImmutableList.of("pk")))
.satisfies(
anyCauseMatches(
IllegalArgumentException.class,
"Must use sequence group for aggregation functions but not found for field f1."));
}

private void add(MergeFunction<KeyValue> function, Integer... f) {
Expand Down