Skip to content

[core] Fix the issue where aggregate function columns without defining sequenceGroup cause the table to be unavailable #7046

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
zhangdove wants to merge 1 commit into
base: master
Choose a base branch
from
+53 −1
Open

[core] Fix the issue where aggregate function columns without defining sequenceGroup cause the table to be unavailable #7046

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
41 changes: 40 additions & 1 deletion paimon-core/src/main/java/org/apache/paimon/schema/SchemaValidation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.paimon.format.FileFormat;
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.options.ConfigOption;
import org.apache.paimon.options.Options;
import org.apache.paimon.table.BucketMode;
Expand Down Expand Up @@ -450,11 +451,15 @@ private static void validateFieldsPrefix(TableSchema schema, CoreOptions options

private static void validateSequenceGroup(TableSchema schema, CoreOptions options) {
Map<String, Set<String>> fields2Group = new HashMap<>();
Set<Integer> sequenceGroupFieldIndexs = new HashSet<>();
List<String> fieldNames = schema.fieldNames();
for (Map.Entry<String, String> entry : options.toMap().entrySet()) {
String k = entry.getKey();
String v = entry.getValue();
List<String> fieldNames = schema.fieldNames();
if (k.startsWith(FIELDS_PREFIX) && k.endsWith(SEQUENCE_GROUP)) {
Arrays.stream(v.split(FIELDS_SEPARATOR))
.map(fieldName -> requireField(fieldName, fieldNames))
.forEach(sequenceGroupFieldIndexs::add);
String[] sequenceFieldNames =
k.substring(
FIELDS_PREFIX.length() + 1,
Expand Down Expand Up @@ -492,8 +497,33 @@ private static void validateSequenceGroup(TableSchema schema, CoreOptions option
Set<String> group = fields2Group.computeIfAbsent(field, p -> new HashSet<>());
group.addAll(sequenceFieldsList);
}

// add self
Arrays.stream(sequenceFieldNames)
.mapToInt(fieldName -> requireField(fieldName, fieldNames))
.forEach(sequenceGroupFieldIndexs::add);
}
}

if (options.mergeEngine() == MergeEngine.PARTIAL_UPDATE) {
for (String fieldName : fieldNames) {
String aggFunc = options.fieldAggFunc(fieldName);
String aggFuncName = aggFunc == null ? options.fieldsDefaultFunc() : aggFunc;
if (schema.primaryKeys().contains(fieldName)) {
continue;
}
if (aggFuncName != null) {
// last_non_null_value doesn't require sequence group
checkArgument(
aggFuncName.equals(FieldLastNonNullValueAggFactory.NAME)
|| sequenceGroupFieldIndexs.contains(
fieldNames.indexOf(fieldName)),
"Must use sequence group for aggregation functions but not found for field %s.",
fieldName);
}
}
}

Set<String> illegalGroup =
fields2Group.values().stream()
.flatMap(Collection::stream)
Expand Down Expand Up @@ -689,6 +719,15 @@ private static void validateIncrementalClustering(TableSchema schema, CoreOption
}
}

private static int requireField(String fieldName, List<String> fieldNames) {
int field = fieldNames.indexOf(fieldName);
if (field == -1) {
throw new IllegalArgumentException(
String.format("Field %s can not be found in table schema.", fieldName));
}
return field;
}

public static void validateChainTable(TableSchema schema, CoreOptions options) {
if (options.isChainTable()) {
boolean isPrimaryTbl = schema.primaryKeys() != null && !schema.primaryKeys().isEmpty();
Expand Down
13 changes: 13 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/schema/SchemaValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,17 @@ public void testBlobTableSchema() {
assertThatThrownBy(() -> validateBlobSchema(options, Collections.singletonList("f2")))
.hasMessage("The BLOB type column can not be part of partition keys.");
}

@Test
public void testPartialUpdateTableAggregateFunctionWithoutSequenceGroup() {
Map<String, String> options = new HashMap<>(2);
options.put("merge-engine", "partial-update");
options.put("fields.f3.aggregate-function", "max");
assertThatThrownBy(() -> validateTableSchemaExec(options))
.hasMessageContaining(
"Must use sequence group for aggregation functions but not found for field");

options.put("fields.f2.sequence-group", "f3");
assertThatCode(() -> validateTableSchemaExec(options)).doesNotThrowAnyException();
}
}