Strip endpoint instead of appending during prefix comparison

linkedin · Nov 20, 2024 · 1a49f14 · 1a49f14
1 parent 712f8c3
commit 1a49f14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/services/tables/src/main/java/com/linkedin/openhouse/tables/utils/TableUUIDGenerator.java b/services/tables/src/main/java/com/linkedin/openhouse/tables/utils/TableUUIDGenerator.java
@@ -193,24 +193,16 @@ private Optional<UUID> extractUUIDFromRequestBody(
     }
 
     Storage storage = catalog.resolveStorage(TableIdentifier.of(databaseId, tableId));
-    java.nio.file.Path databaseDirPath;
-    if (StringUtils.isNotEmpty(storage.getClient().getEndpoint())) {
-      databaseDirPath =
-          Paths.get(
-              storage.getClient().getEndpoint(), storage.getClient().getRootPrefix(), databaseId);
-    } else {
-      databaseDirPath = Paths.get(storage.getClient().getRootPrefix(), databaseId);
-    }
-
+    java.nio.file.Path databaseDirPath = Paths.get(storage.getClient().getRootPrefix(), databaseId);
+    ;
     String manifestListKey = "manifest-list";
     java.nio.file.Path manifestListPath;
     try {
-      manifestListPath =
-          Paths.get(
-              new Gson()
-                  .fromJson(snapshotStr, JsonObject.class)
-                  .get(manifestListKey)
-                  .getAsString());
+      String manifestListPathString =
+          new Gson().fromJson(snapshotStr, JsonObject.class).get(manifestListKey).getAsString();
+      manifestListPathString =
+          StringUtils.removeStart(manifestListPathString, storage.getClient().getEndpoint());
+      manifestListPath = Paths.get(manifestListPathString);
     } catch (Exception exception) {
       throw new RequestValidationFailureException(
           String.format(

diff --git a/...test/java/com/linkedin/openhouse/tables/mock/uuid/TableUUIDGeneratorMultiStorageTest.java b/...test/java/com/linkedin/openhouse/tables/mock/uuid/TableUUIDGeneratorMultiStorageTest.java
@@ -82,7 +82,7 @@ private String getTableLocation(
     String tableLocationWithoutEndpoint =
         String.format("%s/%s/%s-%s", rootPrefix, databaseId, tableId, tableUUID.toString());
     if (StringUtils.isNotEmpty(endPoint)) {
-      return String.format("%s/%s", endPoint, tableLocationWithoutEndpoint);
+      return String.format("%s%s", endPoint, tableLocationWithoutEndpoint);
     }
 
     return tableLocationWithoutEndpoint;