Skip to content

Exception on encryption key altering #14723

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
huaxingao merged 2 commits into from
Dec 5, 2025
Merged

Exception on encryption key altering #14723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1767d05
initial commit
ggershinsky Dec 1, 2025
d0f7cb4
illegal args exception
ggershinsky Dec 2, 2025
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
9 changes: 8 additions & 1 deletion hive-metastore/src/main/java/org/apache/iceberg/hive/HiveTableOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,14 @@ protected void doCommit(TableMetadata base, TableMetadata metadata) {
}

if (removedProps.contains(TableProperties.ENCRYPTION_TABLE_KEY)) {
throw new RuntimeException("Cannot remove key in encrypted table");
throw new IllegalArgumentException("Cannot remove key in encrypted table");
}

if (base != null
&& !Objects.equals(
base.properties().get(TableProperties.ENCRYPTION_TABLE_KEY),
metadata.properties().get(TableProperties.ENCRYPTION_TABLE_KEY))) {
Comment on lines +329 to +330
Copy link
Contributor

@smaheshwar-pltr smaheshwar-pltr Dec 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IIUC, this now means table REPLACEs must have the same key property as before (+ you can't add a key when you replace).

Makes sense to me. WDYT about adding a test case to document that?

Copy link
Contributor Author

@ggershinsky ggershinsky Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, will appreciated if you'd add it in 14659 or 13225.

Copy link
Contributor

@smaheshwar-pltr smaheshwar-pltr Dec 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/apache/iceberg/pull/14659/files#r2591078764

throw new IllegalArgumentException("Cannot modify key in encrypted table");
}

HMSTablePropertyHelper.updateHmsTableForIcebergTable(
Expand Down
7 changes: 7 additions & 0 deletions spark/v4.0/spark/src/test/java/org/apache/iceberg/spark/sql/TestTableEncryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,13 @@ public void testKeyDelete() {
.hasMessageContaining("Cannot remove key in encrypted table");
}

@TestTemplate
public void testKeyAlter() {
assertThatThrownBy(
() -> sql("ALTER TABLE %s SET TBLPROPERTIES ('encryption.key-id'='abcd')", tableName))
.hasMessageContaining("Cannot modify key in encrypted table");
}

@TestTemplate
public void testDirectDataFileRead() {
List<Object[]> dataFileTable =
Expand Down