Skip to content

Glue: Prune removed table properties from Glue Parameters #4133

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
Ankitraj-builds wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −1
Open

Glue: Prune removed table properties from Glue Parameters #4133

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
11 changes: 10 additions & 1 deletion pyiceberg/catalog/glue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,13 @@ def _construct_parameters(
glue_table: Optional["TableTypeDef"] = None,
prev_metadata_location: str | None = None,
metadata_properties: Properties | None = None,
prev_metadata_properties: Properties | None = None,
) -> Properties:
new_parameters = glue_table.get("Parameters", {}) if glue_table else {}
if prev_metadata_properties:
for key in prev_metadata_properties:
if not metadata_properties or key not in metadata_properties:
new_parameters.pop(key, None)
new_parameters.update({TABLE_TYPE: ICEBERG.upper(), METADATA_LOCATION: metadata_location})
if prev_metadata_location:
new_parameters[PREVIOUS_METADATA_LOCATION] = prev_metadata_location
Expand Down Expand Up @@ -243,11 +248,14 @@ def _construct_table_input(
metadata: TableMetadata,
glue_table: Optional["TableTypeDef"] = None,
prev_metadata_location: str | None = None,
prev_metadata_properties: Properties | None = None,
) -> "TableInputTypeDef":
table_input: TableInputTypeDef = {
"Name": table_name,
"TableType": EXTERNAL_TABLE,
"Parameters": _construct_parameters(metadata_location, glue_table, prev_metadata_location, properties),
"Parameters": _construct_parameters(
metadata_location, glue_table, prev_metadata_location, properties, prev_metadata_properties
),
"StorageDescriptor": {
"Columns": _to_columns(metadata),
"Location": metadata.location,
Expand Down Expand Up @@ -693,6 +701,7 @@ def commit_table(
metadata=updated_staged_table.metadata,
glue_table=current_glue_table,
prev_metadata_location=current_table.metadata_location,
prev_metadata_properties=current_table.properties,
)
self._update_glue_table(
database_name=database_name,
Expand Down
30 changes: 30 additions & 0 deletions tests/catalog/test_glue.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,36 @@ def test_commit_table_properties(
assert table_info["Table"]["Parameters"]["test_c"] == "test_c"


@mock_aws
def test_commit_table_prunes_removed_properties(
_glue: boto3.client,
_bucket_initialize: None,
moto_endpoint_url: str,
table_schema_nested: Schema,
database_name: str,
table_name: str,
) -> None:
catalog_name = "glue"
identifier = (database_name, table_name)
test_catalog = GlueCatalog(
catalog_name, client=None, **{"s3.endpoint": moto_endpoint_url, "warehouse": f"s3://{BUCKET_NAME}"}
)
test_catalog.create_namespace(namespace=database_name)
table = test_catalog.create_table(
identifier=identifier, schema=table_schema_nested, properties={"test_a": "test_a", "test_b": "test_b"}
)

transaction = table.transaction()
transaction.remove_properties("test_b")
transaction.commit_transaction()

assert table.metadata.properties == {"test_a": "test_a"}

table_info = _glue.get_table(DatabaseName=database_name, Name=table_name)
assert table_info["Table"]["Parameters"]["test_a"] == "test_a"
assert "test_b" not in table_info["Table"]["Parameters"]


@mock_aws
def test_commit_append_table_snapshot_properties(
_bucket_initialize: None, moto_endpoint_url: str, table_schema_simple: Schema, database_name: str, table_name: str
Expand Down
Loading