dry

Author: kevinjqliu

pyiceberg/catalog/__init__.py

@@ -923,6 +923,7 @@ def _resolve_table_location(self, location: Optional[str], database_name: str, t
         return location.rstrip("/")
 
     def _get_default_warehouse_location(self, database_name: str, table_name: str) -> str:
+        """Return the default warehouse location using the convention of `warehousePath/databaseName/tableName`."""
         database_properties = self.load_namespace_properties(database_name)
         if database_location := database_properties.get(LOCATION):
             database_location = database_location.rstrip("/")
@@ -934,6 +935,19 @@ def _get_default_warehouse_location(self, database_name: str, table_name: str) -
 
         raise ValueError("No default path is set, please specify a location when creating a table")
 
+    def _get_hive_style_warehouse_location(self, database_name: str, table_name: str) -> str:
+        """Return the default warehouse location following the Hive convention of `warehousePath/databaseName.db/tableName`."""
+        database_properties = self.load_namespace_properties(database_name)
+        if database_location := database_properties.get(LOCATION):
+            database_location = database_location.rstrip("/")
+            return f"{database_location}/{table_name}"
+
+        if warehouse_path := self.properties.get(WAREHOUSE_LOCATION):
+            warehouse_path = warehouse_path.rstrip("/")
+            return f"{warehouse_path}/{database_name}.db/{table_name}"
+
+        raise ValueError("No default path is set, please specify a location when creating a table")
+
     @staticmethod
     def _write_metadata(metadata: TableMetadata, io: FileIO, metadata_path: str) -> None:
         ToOutputFile.table_metadata(metadata, io.new_output(metadata_path))

pyiceberg/catalog/dynamodb.py

@@ -32,11 +32,9 @@
 from pyiceberg.catalog import (
     BOTOCORE_SESSION,
     ICEBERG,
-    LOCATION,
     METADATA_LOCATION,
     PREVIOUS_METADATA_LOCATION,
     TABLE_TYPE,
-    WAREHOUSE_LOCATION,
     MetastoreCatalog,
     PropertiesUpdateSummary,
 )
@@ -655,17 +653,8 @@ def _convert_dynamo_table_item_to_iceberg_table(self, dynamo_table_item: Dict[st
         )
 
     def _get_default_warehouse_location(self, database_name: str, table_name: str) -> str:
-        """Return the default warehouse location following the Hive convention of `warehousePath/databaseName.db/tableName`."""
-        database_properties = self.load_namespace_properties(database_name)
-        if database_location := database_properties.get(LOCATION):
-            database_location = database_location.rstrip("/")
-            return f"{database_location}/{table_name}"
-
-        if warehouse_path := self.properties.get(WAREHOUSE_LOCATION):
-            warehouse_path = warehouse_path.rstrip("/")
-            return f"{warehouse_path}/{database_name}.db/{table_name}"
-
-        raise ValueError("No default path is set, please specify a location when creating a table")
+        """Override the default warehouse location to follow Hive-style conventions."""
+        return self._get_hive_style_warehouse_location(database_name, table_name)
 
 
 def _get_create_table_item(database_name: str, table_name: str, properties: Properties, metadata_location: str) -> Dict[str, Any]:

pyiceberg/catalog/glue.py

@@ -48,7 +48,6 @@
     METADATA_LOCATION,
     PREVIOUS_METADATA_LOCATION,
     TABLE_TYPE,
-    WAREHOUSE_LOCATION,
     MetastoreCatalog,
     PropertiesUpdateSummary,
 )
@@ -811,14 +810,5 @@ def __is_iceberg_table(table: TableTypeDef) -> bool:
         return table.get("Parameters", {}).get(TABLE_TYPE, "").lower() == ICEBERG
 
     def _get_default_warehouse_location(self, database_name: str, table_name: str) -> str:
-        """Return the default warehouse location following the Hive convention of `warehousePath/databaseName.db/tableName`."""
-        database_properties = self.load_namespace_properties(database_name)
-        if database_location := database_properties.get(LOCATION):
-            database_location = database_location.rstrip("/")
-            return f"{database_location}/{table_name}"
-
-        if warehouse_path := self.properties.get(WAREHOUSE_LOCATION):
-            warehouse_path = warehouse_path.rstrip("/")
-            return f"{warehouse_path}/{database_name}.db/{table_name}"
-
-        raise ValueError("No default path is set, please specify a location when creating a table")
+        """Override the default warehouse location to follow Hive-style conventions."""
+        return self._get_hive_style_warehouse_location(database_name, table_name)

pyiceberg/catalog/hive.py

@@ -63,7 +63,6 @@
     LOCATION,
     METADATA_LOCATION,
     TABLE_TYPE,
-    WAREHOUSE_LOCATION,
     MetastoreCatalog,
     PropertiesUpdateSummary,
 )
@@ -793,14 +792,5 @@ def drop_view(self, identifier: Union[str, Identifier]) -> None:
         raise NotImplementedError
 
     def _get_default_warehouse_location(self, database_name: str, table_name: str) -> str:
-        """Return the default warehouse location following the Hive convention of `warehousePath/databaseName.db/tableName`."""
-        database_properties = self.load_namespace_properties(database_name)
-        if database_location := database_properties.get(LOCATION):
-            database_location = database_location.rstrip("/")
-            return f"{database_location}/{table_name}"
-
-        if warehouse_path := self.properties.get(WAREHOUSE_LOCATION):
-            warehouse_path = warehouse_path.rstrip("/")
-            return f"{warehouse_path}/{database_name}.db/{table_name}"
-
-        raise ValueError("No default path is set, please specify a location when creating a table")
+        """Override the default warehouse location to follow Hive-style conventions."""
+        return self._get_hive_style_warehouse_location(database_name, table_name)