AWS: Glue catalog strip trailing slash on DB URI (apache#8870)

Jonnathan7 · Oct 19, 2023 · d92be9b · d92be9b
1 parent 45da568
commit d92be9b
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java b/aws/src/main/java/org/apache/iceberg/aws/glue/GlueCatalog.java
@@ -281,6 +281,7 @@ protected String defaultWarehouseLocation(TableIdentifier tableIdentifier) {
                 .build());
     String dbLocationUri = response.database().locationUri();
     if (dbLocationUri != null) {
+      dbLocationUri = LocationUtil.stripTrailingSlash(dbLocationUri);
       return String.format("%s/%s", dbLocationUri, tableIdentifier.name());
     }
 
@@ -514,7 +515,9 @@ public Map<String, String> loadNamespaceMetadata(Namespace namespace)
       Map<String, String> result = Maps.newHashMap(database.parameters());
 
       if (database.locationUri() != null) {
-        result.put(IcebergToGlueConverter.GLUE_DB_LOCATION_KEY, database.locationUri());
+        result.put(
+            IcebergToGlueConverter.GLUE_DB_LOCATION_KEY,
+            LocationUtil.stripTrailingSlash(database.locationUri()));
       }
 
       if (database.description() != null) {

diff --git a/aws/src/test/java/org/apache/iceberg/aws/glue/TestGlueCatalog.java b/aws/src/test/java/org/apache/iceberg/aws/glue/TestGlueCatalog.java
@@ -152,6 +152,19 @@ public void testDefaultWarehouseLocationDbUri() {
     Assertions.assertThat(location).isEqualTo("s3://bucket2/db/table");
   }
 
+  @Test
+  public void testDefaultWarehouseLocationDbUriTrailingSlash() {
+    Mockito.doReturn(
+            GetDatabaseResponse.builder()
+                .database(Database.builder().name("db").locationUri("s3://bucket2/db/").build())
+                .build())
+        .when(glue)
+        .getDatabase(Mockito.any(GetDatabaseRequest.class));
+    String location = glueCatalog.defaultWarehouseLocation(TableIdentifier.of("db", "table"));
+
+    Assertions.assertThat(location).isEqualTo("s3://bucket2/db/table");
+  }
+
   @Test
   public void testDefaultWarehouseLocationCustomCatalogId() {
     GlueCatalog catalogWithCustomCatalogId = new GlueCatalog();
@@ -478,9 +491,15 @@ public void testListNamespacesBadName() {
   public void testLoadNamespaceMetadata() {
     Map<String, String> parameters = Maps.newHashMap();
     parameters.put("key", "val");
+    parameters.put(IcebergToGlueConverter.GLUE_DB_LOCATION_KEY, "s3://bucket2/db");
     Mockito.doReturn(
             GetDatabaseResponse.builder()
-                .database(Database.builder().name("db1").parameters(parameters).build())
+                .database(
+                    Database.builder()
+                        .name("db1")
+                        .parameters(parameters)
+                        .locationUri("s3://bucket2/db/")
+                        .build())
                 .build())
         .when(glue)
         .getDatabase(Mockito.any(GetDatabaseRequest.class));