Incoporate PR review feedback

Signed-off-by: Ashish Singh <[email protected]>
opensearch-project · Apr 9, 2024 · 1c40cf1 · 1c40cf1
1 parent d32b501
commit 1c40cf1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/server/src/main/java/org/opensearch/common/blobstore/BlobPath.java b/server/src/main/java/org/opensearch/common/blobstore/BlobPath.java
@@ -79,6 +79,15 @@ public BlobPath add(String path) {
         return new BlobPath(Collections.unmodifiableList(paths));
     }
 
+    /**
+     * Add additional level of paths to the existing path and returns new {@link BlobPath} with the updated paths.
+     */
+    public BlobPath add(Iterable<String> paths) {
+        List<String> updatedPaths = new ArrayList<>(this.paths);
+        paths.iterator().forEachRemaining(updatedPaths::add);
+        return new BlobPath(Collections.unmodifiableList(updatedPaths));
+    }
+
     public String buildAsString() {
         String p = String.join(SEPARATOR, paths);
         if (p.isEmpty() || p.endsWith(SEPARATOR)) {

diff --git a/server/src/main/java/org/opensearch/index/remote/RemoteStoreEnums.java b/server/src/main/java/org/opensearch/index/remote/RemoteStoreEnums.java
@@ -104,7 +104,10 @@ boolean requiresHashAlgorithm() {
             @Override
             public BlobPath generatePath(PathInput pathInput, PathHashAlgorithm hashAlgorithm) {
                 assert Objects.nonNull(hashAlgorithm) : "hashAlgorithm is expected to be non-null";
-                return addPrefix(pathInput.basePath(), hashAlgorithm.hash(pathInput)).add(pathInput.indexUUID())
+                return BlobPath.cleanPath()
+                    .add(hashAlgorithm.hash(pathInput))
+                    .add(pathInput.basePath())
+                    .add(pathInput.indexUUID())
                     .add(pathInput.shardId())
                     .add(pathInput.dataCategory().getName())
                     .add(pathInput.dataType().getName());
@@ -274,13 +277,4 @@ public static PathHashAlgorithm parseString(String pathHashAlgorithm) {
          */
         public static final String NAME = "path_hash_algorithm";
     }
-
-    static BlobPath addPrefix(BlobPath blobPath, String prefix) {
-        BlobPath updatedPath = BlobPath.cleanPath();
-        updatedPath = updatedPath.add(prefix);
-        for (String path : blobPath) {
-            updatedPath = updatedPath.add(path);
-        }
-        return updatedPath;
-    }
 }
diff --git a/...r/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryHelperTests.java b/...r/src/test/java/org/opensearch/repositories/blobstore/BlobStoreRepositoryHelperTests.java
@@ -45,7 +45,6 @@
 
 import static org.opensearch.index.remote.RemoteStoreEnums.DataCategory.SEGMENTS;
 import static org.opensearch.index.remote.RemoteStoreEnums.DataType.LOCK_FILES;
-import static org.opensearch.test.OpenSearchTestCase.getShardLevelBlobPath;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.is;