Skip to content

[core] Migrate shredding map on rename and drop commands #8780

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

Merged
JingsongLi merged 1 commit into from
Jul 23, 2026
+74 −1
Merged

[core] Migrate shredding map on rename and drop commands #8780

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: 19 additions & 0 deletions paimon-core/src/main/java/org/apache/paimon/schema/ColumnDirectiveUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,25 @@ public static void removeDroppedDirectiveOptions(
}
}
options.remove(String.format("field.%s.vector-dim", fieldName));
} else if (type.getTypeRoot() == DataTypeRoot.MAP) {
options.remove(
CoreOptions.FIELDS_PREFIX
+ "."
+ fieldName
+ "."
+ CoreOptions.MAP_STORAGE_LAYOUT);
options.remove(
CoreOptions.FIELDS_PREFIX
+ "."
+ fieldName
+ "."
+ CoreOptions.MAP_SHARED_SHREDDING_MAX_COLUMNS);
options.remove(
CoreOptions.FIELDS_PREFIX
+ "."
+ fieldName
+ "."
+ CoreOptions.MAP_SHARED_SHREDDING_COLUMN_PLACEMENT_POLICY);
}
}

Expand Down
18 changes: 17 additions & 1 deletion 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 @@ -94,6 +94,9 @@
import static org.apache.paimon.CoreOptions.IGNORE_RETRACT;
import static org.apache.paimon.CoreOptions.IGNORE_UPDATE_BEFORE;
import static org.apache.paimon.CoreOptions.LIST_AGG_DELIMITER;
import static org.apache.paimon.CoreOptions.MAP_SHARED_SHREDDING_COLUMN_PLACEMENT_POLICY;
import static org.apache.paimon.CoreOptions.MAP_SHARED_SHREDDING_MAX_COLUMNS;
import static org.apache.paimon.CoreOptions.MAP_STORAGE_LAYOUT;
import static org.apache.paimon.CoreOptions.NESTED_KEY;
import static org.apache.paimon.CoreOptions.PK_CLUSTERING_OVERRIDE;
import static org.apache.paimon.CoreOptions.SEQUENCE_FIELD;
Expand Down Expand Up @@ -854,7 +857,20 @@ private static Map<String, String> applyRenameColumnsToOptions(
fieldName -> FIELDS_PREFIX + "." + fieldName + "." + AGG_FUNCTION,
fieldName -> FIELDS_PREFIX + "." + fieldName + "." + IGNORE_RETRACT,
fieldName -> FIELDS_PREFIX + "." + fieldName + "." + DISTINCT,
fieldName -> FIELDS_PREFIX + "." + fieldName + "." + LIST_AGG_DELIMITER);
fieldName -> FIELDS_PREFIX + "." + fieldName + "." + LIST_AGG_DELIMITER,
fieldName -> FIELDS_PREFIX + "." + fieldName + "." + MAP_STORAGE_LAYOUT,
fieldName ->
FIELDS_PREFIX
+ "."
+ fieldName
+ "."
+ MAP_SHARED_SHREDDING_MAX_COLUMNS,
fieldName ->
FIELDS_PREFIX
+ "."
+ fieldName
+ "."
+ MAP_SHARED_SHREDDING_COLUMN_PLACEMENT_POLICY);

for (RenameColumn rename : renameColumns) {
String fieldName = rename.fieldNames()[0];
Expand Down
38 changes: 38 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/table/MapSharedShreddingTableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -947,6 +947,44 @@ public void testSharedShreddingWithBlobAndVector(String format) throws Exception
}
}

@ParameterizedTest
@ValueSource(strings = {"orc", "parquet"})
public void testRenameSharedShreddingMapColumn(String format) throws Exception {
createTable(format, 2, "metrics");

catalog.alterTable(
identifier(format),
Collections.singletonList(SchemaChange.renameColumn("metrics", "renamed_metrics")),
false);

Table table = catalog.getTable(identifier(format));
assertThat(table.rowType().getFieldNames()).containsExactly("id", "renamed_metrics");

Map<String, String> options = table.options();
assertThat(options).doesNotContainKey("fields.metrics.map.storage-layout");
assertThat(options)
.containsEntry("fields.renamed_metrics.map.storage-layout", "shared-shredding")
.containsEntry("fields.renamed_metrics.map.shared-shredding.max-columns", "2");
}

@ParameterizedTest
@ValueSource(strings = {"orc", "parquet"})
public void testDropSharedShreddingMapColumn(String format) throws Exception {
createTable(format, 2, "metrics", "labels");

catalog.alterTable(
identifier(format),
Collections.singletonList(SchemaChange.dropColumn("metrics")),
false);

Table table = catalog.getTable(identifier(format));
assertThat(table.rowType().getFieldNames()).containsExactly("id", "labels");

Map<String, String> options = table.options();
assertThat(options).doesNotContainKey("fields.metrics.map.storage-layout");
assertThat(options).doesNotContainKey("fields.metrics.map.shared-shredding.max-columns");
}

private Table createTable(String format, String... sharedShreddingFields) throws Exception {
return createTable(format, 2, sharedShreddingFields);
}
Expand Down
Loading