merge some upstream, add exception handler

Author: igorvoltaic

pyiceberg/catalog/hive.py

@@ -421,7 +421,6 @@ def _get_hive_table(self, open_client: Client, *, dbname: str, tbl_name: str) ->
         except NoSuchObjectException as e:
             raise NoSuchTableError(f"Table does not exists: {tbl_name}") from e
 
-
     def _get_table_objects_by_name(self, open_client: Client, *, dbname: str, tbl_names: list[str]) -> list[HiveTable]:
         if all((self._client._hive_version.major >= 4, self._client._hive_version.minor > 0)):
             return open_client.get_table_objects_by_name_req(GetTablesRequest(dbName=dbname, tblNames=tbl_names)).tables
@@ -691,7 +690,7 @@ def rename_table(self, from_identifier: Union[str, Identifier], to_identifier: U
         to_database_name, to_table_name = self.identifier_to_database_and_table(to_identifier)
 
         if self.table_exists(to_identifier):
-             raise TableAlreadyExistsError(f"Table already exists: {to_table_name}")
+            raise TableAlreadyExistsError(f"Table already exists: {to_table_name}")
 
         try:
             with self._client as open_client:

tests/catalog/test_hive.py

@@ -66,6 +66,7 @@
     NamespaceNotEmptyError,
     NoSuchNamespaceError,
     NoSuchTableError,
+    TableAlreadyExistsError,
     WaitingForLockException,
 )
 from pyiceberg.partitioning import PartitionField, PartitionSpec
@@ -890,6 +891,7 @@ def test_load_table_from_self_identifier(hive_table: HiveTable) -> None:
 
 def test_rename_table(hive_table: HiveTable) -> None:
     catalog = HiveCatalog(HIVE_CATALOG_NAME, uri=HIVE_METASTORE_FAKE_URL)
+    catalog.table_exists = MagicMock(return_value=False)  # type: ignore[method-assign]
 
     renamed_table = copy.deepcopy(hive_table)
     renamed_table.dbName = "default"
@@ -920,6 +922,7 @@ def test_rename_table(hive_table: HiveTable) -> None:
 
 def test_rename_table_from_self_identifier(hive_table: HiveTable) -> None:
     catalog = HiveCatalog(HIVE_CATALOG_NAME, uri=HIVE_METASTORE_FAKE_URL)
+    catalog.table_exists = MagicMock(return_value=False)  # type: ignore[method-assign]
 
     catalog._client = MagicMock()
     catalog._get_hive_table = MagicMock(return_value=hive_table)  # type: ignore
@@ -954,6 +957,7 @@ def test_rename_table_from_self_identifier(hive_table: HiveTable) -> None:
 
 def test_rename_table_from_does_not_exists() -> None:
     catalog = HiveCatalog(HIVE_CATALOG_NAME, uri=HIVE_METASTORE_FAKE_URL)
+    catalog.table_exists = MagicMock(return_value=False)  # type: ignore[method-assign]
 
     catalog._client = MagicMock()
     catalog._client._hive_version = HiveVersion(4, 0, 0)
@@ -967,8 +971,19 @@ def test_rename_table_from_does_not_exists() -> None:
     assert "Table does not exist: does_not_exists" in str(exc_info.value)
 
 
+def test_rename_table_to_table_already_exists(hive_table: HiveTable) -> None:
+    catalog = HiveCatalog(HIVE_CATALOG_NAME, uri=HIVE_METASTORE_FAKE_URL)
+    catalog.load_table = MagicMock(return_value=hive_table)  # type: ignore[method-assign]
+
+    with pytest.raises(TableAlreadyExistsError) as exc_info:
+        catalog.rename_table(("default", "some_table"), ("default", "new_tabl2e"))
+
+    assert "Table already exists: new_tabl2e" in str(exc_info.value)
+
+
 def test_rename_table_to_namespace_does_not_exists() -> None:
     catalog = HiveCatalog(HIVE_CATALOG_NAME, uri=HIVE_METASTORE_FAKE_URL)
+    catalog.table_exists = MagicMock(return_value=False)  # type: ignore[method-assign]
 
     catalog._client = MagicMock()
     catalog._client._hive_version = HiveVersion(4, 0, 0)
@@ -1172,7 +1187,7 @@ def test_update_namespace_properties(hive_database: HiveDatabase) -> None:
             name="default",
             description=None,
             locationUri=hive_database.locationUri,
-            parameters={"test": None, "label": "core"},
+            parameters={"label": "core"},
             privileges=None,
             ownerName=None,
             ownerType=1,