Skip to content

[core] Validate schema after applying schema changes #8063

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

[core] Validate schema after applying schema changes #8063

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
19 changes: 11 additions & 8 deletions paimon-core/src/main/java/org/apache/paimon/schema/SchemaManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,14 +609,17 @@ protected void updateLastColumn(
applyRenameColumnsToOptions(newOptions, changes),
newComment);

return new TableSchema(
oldTableSchema.id() + 1,
newSchema.fields(),
highestFieldId.get(),
newSchema.partitionKeys(),
newSchema.primaryKeys(),
newSchema.options(),
newSchema.comment());
TableSchema newTableSchema =
new TableSchema(
oldTableSchema.id() + 1,
newSchema.fields(),
highestFieldId.get(),
newSchema.partitionKeys(),
newSchema.primaryKeys(),
newSchema.options(),
newSchema.comment());
SchemaValidation.validateTableSchema(newTableSchema);
return newTableSchema;
}

// gets the rootType at the defined depth
Expand Down
41 changes: 41 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/schema/SchemaManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,47 @@ public void testUpdateOptions() throws Exception {
assertThat(latest.get().options()).containsEntry("new_k", "new_v");
}

@Test
public void testResetSequenceGroupForAggregateFunction() throws Exception {
Map<String, String> options = new HashMap<>();
options.put(CoreOptions.MERGE_ENGINE.key(), "partial-update");
options.put(CoreOptions.BUCKET.key(), "1");
options.put("fields.f2.aggregate-function", "sum");
options.put("fields.f1.sequence-group", "f2");
Schema schema = new Schema(rowType.getFields(), partitionKeys, primaryKeys, options, "");

retryArtificialException(() -> manager.createTable(schema));

assertThatThrownBy(
() ->
retryArtificialException(
() ->
manager.commitChanges(
SchemaChange.removeOption(
"fields.f1.sequence-group"))))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining(
"Must use sequence group for aggregation functions but not found for field f2.");
}

@Test
public void testResetSequenceGroupForLastNonNullAggregateFunction() throws Exception {
Map<String, String> options = new HashMap<>();
options.put(CoreOptions.MERGE_ENGINE.key(), "partial-update");
options.put(CoreOptions.BUCKET.key(), "1");
options.put("fields.f2.aggregate-function", "last_non_null_value");
options.put("fields.f1.sequence-group", "f2");
Schema schema = new Schema(rowType.getFields(), partitionKeys, primaryKeys, options, "");

retryArtificialException(() -> manager.createTable(schema));
retryArtificialException(
() -> manager.commitChanges(SchemaChange.removeOption("fields.f1.sequence-group")));

Optional<TableSchema> latest = retryArtificialException(() -> manager.latest());
assertThat(latest.isPresent()).isTrue();
assertThat(latest.get().options()).doesNotContainKey("fields.f1.sequence-group");
}

@Test
public void testConcurrentCommit() throws Exception {
retryArtificialException(
Expand Down
Loading