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

[Feature] Support multiple fields in sequence-group #3461

Merged
merged 3 commits into from
Jun 12, 2024
Merged

[Feature] Support multiple fields in sequence-group #3461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5fbf7cd
[Feature] Support multiple fields in partial-update sequence-group
xiangyuf Jun 2, 2024
daa1dbd
fix null sequence group
xiangyuf Jun 5, 2024
a1494b1
fix comment
xiangyuf Jun 7, 2024
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 paimon-common/src/main/java/org/apache/paimon/CoreOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ public class CoreOptions implements Serializable {

public static final String FIELDS_PREFIX = "fields";

public static final String FIELDS_SEPARATOR = ",";

public static final String AGG_FUNCTION = "aggregate-function";
public static final String DEFAULT_AGG_FUNCTION = "default-aggregate-function";

Expand Down
406 changes: 168 additions & 238 deletions ...on-core/src/main/java/org/apache/paimon/mergetree/compact/PartialUpdateMergeFunction.java
View file
Open in desktop

Large diffs are not rendered by default.

57 changes: 37 additions & 20 deletions 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 @@ -35,6 +35,7 @@
import org.apache.paimon.types.RowType;
import org.apache.paimon.types.VarCharType;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
Expand All @@ -51,6 +52,7 @@
import static org.apache.paimon.CoreOptions.CHANGELOG_PRODUCER;
import static org.apache.paimon.CoreOptions.DEFAULT_AGG_FUNCTION;
import static org.apache.paimon.CoreOptions.FIELDS_PREFIX;
import static org.apache.paimon.CoreOptions.FIELDS_SEPARATOR;
import static org.apache.paimon.CoreOptions.FULL_COMPACTION_DELTA_COMMITS;
import static org.apache.paimon.CoreOptions.INCREMENTAL_BETWEEN;
import static org.apache.paimon.CoreOptions.INCREMENTAL_BETWEEN_TIMESTAMP;
Expand Down Expand Up @@ -349,13 +351,15 @@ private static void validateFieldsPrefix(TableSchema schema, CoreOptions options
.forEach(
k -> {
if (k.startsWith(FIELDS_PREFIX)) {
String fieldName = k.split("\\.")[1];
checkArgument(
DEFAULT_AGG_FUNCTION.equals(fieldName)
|| fieldNames.contains(fieldName),
String.format(
"Field %s can not be found in table schema.",
fieldName));
String[] fields = k.split("\\.")[1].split(FIELDS_SEPARATOR);
for (String field : fields) {
checkArgument(
DEFAULT_AGG_FUNCTION.equals(field)
|| fieldNames.contains(field),
String.format(
"Field %s can not be found in table schema.",
field));
}
}
});
}
Expand All @@ -367,29 +371,42 @@ private static void validateSequenceGroup(TableSchema schema, CoreOptions option
String v = entry.getValue();
List<String> fieldNames = schema.fieldNames();
if (k.startsWith(FIELDS_PREFIX) && k.endsWith(SEQUENCE_GROUP)) {
String sequenceFieldName =
String[] sequenceFieldNames =
k.substring(
FIELDS_PREFIX.length() + 1,
k.length() - SEQUENCE_GROUP.length() - 1);
if (!fieldNames.contains(sequenceFieldName)) {
throw new IllegalArgumentException(
String.format(
"The sequence field group: %s can not be found in table schema.",
sequenceFieldName));
}
FIELDS_PREFIX.length() + 1,
k.length() - SEQUENCE_GROUP.length() - 1)
.split(FIELDS_SEPARATOR);

for (String field : v.split(",")) {
for (String field : v.split(FIELDS_SEPARATOR)) {
if (!fieldNames.contains(field)) {
throw new IllegalArgumentException(
String.format("Field %s can not be found in table schema.", field));
}
Set<String> group = fields2Group.computeIfAbsent(field, p -> new HashSet<>());
if (group.add(sequenceFieldName) && group.size() > 1) {

List<String> sequenceFieldsList = new ArrayList<>();
for (String sequenceFieldName : sequenceFieldNames) {
if (!fieldNames.contains(sequenceFieldName)) {
throw new IllegalArgumentException(
String.format(
"The sequence field group: %s can not be found in table schema.",
sequenceFieldName));
}
sequenceFieldsList.add(sequenceFieldName);
}

if (fields2Group.containsKey(field)) {
List<List<String>> sequenceGroups = new ArrayList<>();
sequenceGroups.add(new ArrayList<>(fields2Group.get(field)));
sequenceGroups.add(sequenceFieldsList);

throw new IllegalArgumentException(
String.format(
"Field %s is defined repeatedly by multiple groups: %s.",
field, group));
field, sequenceGroups));
}

Set<String> group = fields2Group.computeIfAbsent(field, p -> new HashSet<>());
group.addAll(sequenceFieldsList);
}
}
}
Expand Down
14 changes: 12 additions & 2 deletions paimon-core/src/main/java/org/apache/paimon/utils/UserDefinedSeqComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,18 @@ public static UserDefinedSeqComparator create(RowType rowType, List<String> sequ

List<String> fieldNames = rowType.getFieldNames();
int[] fields = sequenceFields.stream().mapToInt(fieldNames::indexOf).toArray();

return create(rowType, fields);
}

@Nullable
public static UserDefinedSeqComparator create(RowType rowType, int[] sequenceFields) {
if (sequenceFields.length == 0) {
return null;
}

RecordComparator comparator =
CodeGenUtils.newRecordComparator(rowType.getFieldTypes(), fields);
return new UserDefinedSeqComparator(fields, comparator);
CodeGenUtils.newRecordComparator(rowType.getFieldTypes(), sequenceFields);
return new UserDefinedSeqComparator(sequenceFields, comparator);
}
}
2 changes: 1 addition & 1 deletion paimon-core/src/test/java/org/apache/paimon/mergetree/SortBufferWriteBufferTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ protected List<ReusingTestData> getExpected(List<ReusingTestData> input) {
protected MergeFunction<KeyValue> createMergeFunction() {
Options options = new Options();
return PartialUpdateMergeFunction.factory(
options, RowType.of(DataTypes.BIGINT()), ImmutableList.of("key"))
options, RowType.of(DataTypes.BIGINT()), ImmutableList.of("f0"))
.create();
}
}
Expand Down
Loading