remove .db for all but dynamo/glue/hive

Author: kevinjqliu

pyiceberg/catalog/__init__.py

@@ -930,7 +930,7 @@ def _get_default_warehouse_location(self, database_name: str, table_name: str) -
 
         if warehouse_path := self.properties.get(WAREHOUSE_LOCATION):
             warehouse_path = warehouse_path.rstrip("/")
-            return f"{warehouse_path}/{database_name}.db/{table_name}"
+            return f"{warehouse_path}/{database_name}/{table_name}"
 
         raise ValueError("No default path is set, please specify a location when creating a table")
 

pyiceberg/catalog/dynamodb.py

@@ -32,9 +32,11 @@
 from pyiceberg.catalog import (
     BOTOCORE_SESSION,
     ICEBERG,
+    LOCATION,
     METADATA_LOCATION,
     PREVIOUS_METADATA_LOCATION,
     TABLE_TYPE,
+    WAREHOUSE_LOCATION,
     MetastoreCatalog,
     PropertiesUpdateSummary,
 )
@@ -652,6 +654,19 @@ def _convert_dynamo_table_item_to_iceberg_table(self, dynamo_table_item: Dict[st
             catalog=self,
         )
 
+    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")
+
 
 def _get_create_table_item(database_name: str, table_name: str, properties: Properties, metadata_location: str) -> Dict[str, Any]:
     current_timestamp_ms = str(round(time() * 1000))

pyiceberg/catalog/glue.py

@@ -48,6 +48,7 @@
     METADATA_LOCATION,
     PREVIOUS_METADATA_LOCATION,
     TABLE_TYPE,
+    WAREHOUSE_LOCATION,
     MetastoreCatalog,
     PropertiesUpdateSummary,
 )
@@ -808,3 +809,16 @@ def view_exists(self, identifier: Union[str, Identifier]) -> bool:
     @staticmethod
     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")

pyiceberg/catalog/hive.py

@@ -63,6 +63,7 @@
     LOCATION,
     METADATA_LOCATION,
     TABLE_TYPE,
+    WAREHOUSE_LOCATION,
     MetastoreCatalog,
     PropertiesUpdateSummary,
 )
@@ -790,3 +791,16 @@ def update_namespace_properties(
 
     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")