xanderbailey commented on code in PR #4148:
URL: https://github.com/apache/iceberg-python/pull/4148#discussion_r4367410750
##########
pyiceberg/table/update/__init__.py:
##########
@@ -222,6 +228,16 @@ class RemovePartitionStatisticsUpdate(IcebergBaseModel):
snapshot_id: int = Field(alias="snapshot-id")
+class AddEncryptionKeyUpdate(IcebergBaseModel):
Review Comment:
Matches Rust's
[`TableUpdate::AddEncryptionKey`](https://github.com/apache/iceberg-rust/blob/217e66dbdf2e206b843e6e68acd85fb4feeeea7b/crates/iceberg/src/catalog/mod.rs#L636-L639).
##########
pyiceberg/table/update/__init__.py:
##########
@@ -222,6 +228,16 @@ class RemovePartitionStatisticsUpdate(IcebergBaseModel):
snapshot_id: int = Field(alias="snapshot-id")
+class AddEncryptionKeyUpdate(IcebergBaseModel):
+ action: Literal["add-encryption-key"] = Field(default="add-encryption-key")
+ encryption_key: EncryptedKey = Field(alias="encryption-key")
+
+
+class RemoveEncryptionKeyUpdate(IcebergBaseModel):
Review Comment:
Matches Rust's
[`TableUpdate::RemoveEncryptionKey`](https://github.com/apache/iceberg-rust/blob/217e66dbdf2e206b843e6e68acd85fb4feeeea7b/crates/iceberg/src/catalog/mod.rs#L642-L645).
##########
pyiceberg/table/update/__init__.py:
##########
@@ -680,6 +698,31 @@ def _(
return base_metadata.model_copy(update={"partition_statistics":
statistics})
+@_apply_table_update.register(AddEncryptionKeyUpdate)
+def _(update: AddEncryptionKeyUpdate, base_metadata: TableMetadata, context:
_TableMetadataUpdateContext) -> TableMetadata:
+ if not isinstance(base_metadata, TableMetadataV3):
+ raise ValueError(f"Encryption keys are not supported in format version
{base_metadata.format_version}")
+
+ if any(key.key_id == update.encryption_key.key_id for key in
base_metadata.encryption_keys):
+ return base_metadata
+
+ context.add_update(update)
+ return base_metadata.model_copy(update={"encryption_keys":
base_metadata.encryption_keys + [update.encryption_key]})
+
+
+@_apply_table_update.register(RemoveEncryptionKeyUpdate)
+def _(update: RemoveEncryptionKeyUpdate, base_metadata: TableMetadata,
context: _TableMetadataUpdateContext) -> TableMetadata:
+ if not isinstance(base_metadata, TableMetadataV3):
+ raise ValueError(f"Encryption keys are not supported in format version
{base_metadata.format_version}")
+
+ encryption_keys = [key for key in base_metadata.encryption_keys if
key.key_id != update.key_id]
+ if len(encryption_keys) == len(base_metadata.encryption_keys):
Review Comment:
Removing a missing key is a no-op, as in Rust's
[`remove_encryption_key`](https://github.com/apache/iceberg-rust/blob/217e66dbdf2e206b843e6e68acd85fb4feeeea7b/crates/iceberg/src/spec/table_metadata_builder.rs#L1079-L1086).
##########
pyiceberg/table/update/__init__.py:
##########
@@ -680,6 +698,31 @@ def _(
return base_metadata.model_copy(update={"partition_statistics":
statistics})
+@_apply_table_update.register(AddEncryptionKeyUpdate)
+def _(update: AddEncryptionKeyUpdate, base_metadata: TableMetadata, context:
_TableMetadataUpdateContext) -> TableMetadata:
+ if not isinstance(base_metadata, TableMetadataV3):
+ raise ValueError(f"Encryption keys are not supported in format version
{base_metadata.format_version}")
+
+ if any(key.key_id == update.encryption_key.key_id for key in
base_metadata.encryption_keys):
Review Comment:
Existing key id is a no-op, as in Rust's
[`add_encryption_key`](https://github.com/apache/iceberg-rust/blob/217e66dbdf2e206b843e6e68acd85fb4feeeea7b/crates/iceberg/src/spec/table_metadata_builder.rs#L1064-L1076).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
