add exception handler

Author: igorvoltaic

pyiceberg/catalog/hive.py

@@ -414,9 +414,13 @@ def _create_hive_table(self, open_client: Client, hive_table: HiveTable) -> None
             raise TableAlreadyExistsError(f"Table {hive_table.dbName}.{hive_table.tableName} already exists") from e
 
     def _get_hive_table(self, open_client: Client, *, dbname: str, tbl_name: str) -> HiveTable:
-        if all((self._client._hive_version.major >= 4, self._client._hive_version.minor > 0)):
-            return open_client.get_table_req(GetTableRequest(dbName=dbname, tblName=tbl_name)).table
-        return open_client.get_table(dbname=dbname, tbl_name=tbl_name)
+        try:
+            if all((self._client._hive_version.major >= 4, self._client._hive_version.minor > 0)):
+                return open_client.get_table_req(GetTableRequest(dbName=dbname, tblName=tbl_name)).table
+            return open_client.get_table(dbname=dbname, tbl_name=tbl_name)
+        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)):
@@ -465,7 +469,7 @@ def create_table(
 
         with self._client as open_client:
             self._create_hive_table(open_client, tbl)
-            hive_table: HiveTable = self._get_hive_table(open_client, dbname=database_name, tbl_name=table_name)
+            hive_table = self._get_hive_table(open_client, dbname=database_name, tbl_name=table_name)
 
         return self._convert_hive_into_iceberg(hive_table)
 
@@ -495,7 +499,7 @@ def register_table(self, identifier: Union[str, Identifier], metadata_location:
         tbl = self._convert_iceberg_into_hive(staged_table)
         with self._client as open_client:
             self._create_hive_table(open_client, tbl)
-            hive_table: HiveTable = self._get_hive_table(open_client, dbname=database_name, tbl_name=table_name)
+            hive_table = self._get_hive_table(open_client, dbname=database_name, tbl_name=table_name)
 
         return self._convert_hive_into_iceberg(hive_table)
 
@@ -681,12 +685,17 @@ def rename_table(self, from_identifier: Union[str, Identifier], to_identifier: U
             ValueError: When from table identifier is invalid.
             NoSuchTableError: When a table with the name does not exist.
             NoSuchNamespaceError: When the destination namespace doesn't exist.
+            TableAlreadyExistsError: When the destination table already exists.
         """
         from_database_name, from_table_name = self.identifier_to_database_and_table(from_identifier, NoSuchTableError)
         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}")
+
         try:
             with self._client as open_client:
-                tbl: HiveTable = self._get_hive_table(open_client, dbname=from_database_name, tbl_name=from_table_name)
+                tbl = self._get_hive_table(open_client, dbname=from_database_name, tbl_name=from_table_name)
                 tbl.dbName = to_database_name
                 tbl.tableName = to_table_name
                 open_client.alter_table_with_environment_context(
@@ -830,7 +839,7 @@ def update_namespace_properties(
             if removals:
                 for key in removals:
                     if key in parameters:
-                        parameters[key] = None
+                        parameters.pop(key)
                         removed.add(key)
             if updates:
                 for key, value in updates.items():