-
Notifications
You must be signed in to change notification settings - Fork 302
fix: add metadata_properties to _construct_parameters when update hive table #2013
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.
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
base: main
Are you sure you want to change the base?
Changes from all commits
ff149e8
230d088
7e754d5
d5a26e0
985d77d
16f562e
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -211,11 +211,18 @@ def _construct_hive_storage_descriptor( | |
DEFAULT_PROPERTIES = {TableProperties.PARQUET_COMPRESSION: TableProperties.PARQUET_COMPRESSION_DEFAULT} | ||
|
||
|
||
def _construct_parameters(metadata_location: str, previous_metadata_location: Optional[str] = None) -> Dict[str, Any]: | ||
def _construct_parameters( | ||
metadata_location: str, previous_metadata_location: Optional[str] = None, metadata_properties: Optional[Properties] = None | ||
) -> Dict[str, Any]: | ||
properties = {PROP_EXTERNAL: "TRUE", PROP_TABLE_TYPE: "ICEBERG", PROP_METADATA_LOCATION: metadata_location} | ||
if previous_metadata_location: | ||
properties[PROP_PREVIOUS_METADATA_LOCATION] = previous_metadata_location | ||
|
||
if metadata_properties: | ||
for key, value in metadata_properties.items(): | ||
if key not in properties: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 this is fine, it helps with not re-setting |
||
properties[key] = str(value) | ||
|
||
return properties | ||
|
||
|
||
|
@@ -360,7 +367,7 @@ def _convert_iceberg_into_hive(self, table: Table) -> HiveTable: | |
property_as_bool(self.properties, HIVE2_COMPATIBLE, HIVE2_COMPATIBLE_DEFAULT), | ||
), | ||
tableType=EXTERNAL_TABLE, | ||
parameters=_construct_parameters(table.metadata_location), | ||
parameters=_construct_parameters(metadata_location=table.metadata_location, metadata_properties=table.properties), | ||
) | ||
|
||
def _create_hive_table(self, open_client: Client, hive_table: HiveTable) -> None: | ||
|
@@ -541,6 +548,7 @@ def commit_table( | |
hive_table.parameters = _construct_parameters( | ||
metadata_location=updated_staged_table.metadata_location, | ||
previous_metadata_location=current_table.metadata_location, | ||
metadata_properties=updated_staged_table.properties, | ||
kevinjqliu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
) | ||
open_client.alter_table_with_environment_context( | ||
dbname=database_name, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,6 +112,27 @@ def test_table_properties(catalog: Catalog) -> None: | |
assert "None type is not a supported value in properties: property_name" in str(exc_info.value) | ||
|
||
|
||
@pytest.mark.integration | ||
@pytest.mark.parametrize("catalog", [pytest.lazy_fixture("session_catalog_hive")]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: we don't need to use parameterize with a single argument |
||
def test_hive_properties(catalog: Catalog) -> None: | ||
table = create_table(catalog) | ||
table.transaction().set_properties({"abc": "def", "p1": "123"}).commit_transaction() | ||
|
||
hive_client: _HiveClient = _HiveClient(catalog.properties["uri"]) | ||
|
||
with hive_client as open_client: | ||
hive_table = open_client.get_table(*TABLE_NAME) | ||
assert hive_table.parameters.get("abc") == "def" | ||
assert hive_table.parameters.get("p1") == "123" | ||
assert hive_table.parameters.get("not_exist_parameter") is None | ||
|
||
table.transaction().remove_properties("abc").commit_transaction() | ||
|
||
with hive_client as open_client: | ||
hive_table = open_client.get_table(*TABLE_NAME) | ||
assert hive_table.parameters.get("abc") is None | ||
|
||
|
||
@pytest.mark.integration | ||
@pytest.mark.parametrize("catalog", [pytest.lazy_fixture("session_catalog_hive"), pytest.lazy_fixture("session_catalog")]) | ||
def test_table_properties_dict(catalog: Catalog) -> None: | ||
|
Uh oh!
There was an error while loading. Please reload this page.