Skip to content

[core] Clean up field-level options when dropping columns #7659

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

[core] Clean up field-level options when dropping columns #7659

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
5 changes: 5 additions & 0 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 @@ -447,6 +447,11 @@ protected void updateLastColumn(
}
}
}.updateIntermediateColumn(newFields, 0);
if (drop.fieldNames().length == 1) {
String droppedField = drop.fieldNames()[0];
String prefix = FIELDS_PREFIX + "." + droppedField + ".";
newOptions.keySet().removeIf(k -> k.startsWith(prefix));
}
} else if (change instanceof UpdateColumnType) {
UpdateColumnType update = (UpdateColumnType) change;
assertNotUpdatingPartitionKeys(oldTableSchema, update.fieldNames(), "update");
Expand Down
37 changes: 37 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 @@ -939,4 +939,41 @@ public void testRollbackSchemaNotExist() throws Exception {
new ChangelogManager(LocalFileIO.create(), path, null)))
.hasMessageContaining("Schema 999 does not exist");
}

@Test
public void testDropColumnCleansUpFieldOptions() throws Exception {
Map<String, String> tableOptions = new HashMap<>();
tableOptions.put("fields.extra_col.default-value", "1970-01-01 00:00:00");
tableOptions.put("key", "value");

List<DataField> fields =
Arrays.asList(
new DataField(0, "f0", new IntType()),
new DataField(1, "f1", new BigIntType()),
new DataField(2, "f2", new VarCharType()),
new DataField(3, "extra_col", DataTypes.TIMESTAMP(0)));
Schema schemaWithFieldOptions =
new Schema(
fields,
Collections.singletonList("f0"),
Arrays.asList("f0", "f1"),
tableOptions,
"");

SchemaManager mgr = new SchemaManager(LocalFileIO.create(), new Path(tempDir.toString()));
TableSchema created = mgr.createTable(schemaWithFieldOptions);

assertThat(created.options()).containsKey("fields.extra_col.default-value");

List<SchemaChange> changes =
Collections.singletonList(SchemaChange.dropColumn(new String[] {"extra_col"}));
assertThatCode(() -> mgr.commitChanges(changes)).doesNotThrowAnyException();

// Verify the column is removed and field-level options are cleaned up
TableSchema updated = mgr.latest().get();
assertThat(updated.fieldNames()).doesNotContain("extra_col");
assertThat(updated.options()).doesNotContainKey("fields.extra_col.default-value");
// Other options should remain
assertThat(updated.options()).containsKey("key");
}
}
Loading