Minor code refactoring

Signed-off-by: bansvaru <[email protected]>
opensearch-project · Jun 8, 2023 · 42eb605 · 42eb605
1 parent 0b4640b
commit 42eb605
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferManager.java b/server/src/main/java/org/opensearch/index/translog/transfer/TranslogTransferManager.java
@@ -59,6 +59,7 @@ public class TranslogTransferManager {
     private static final Logger logger = LogManager.getLogger(TranslogTransferManager.class);
 
     private final static String METADATA_DIR = "metadata";
+    private final static String DATA_DIR = "data";
 
     public TranslogTransferManager(
         ShardId shardId,
@@ -68,7 +69,7 @@ public TranslogTransferManager(
     ) {
         this.shardId = shardId;
         this.transferService = transferService;
-        this.remoteBaseTransferPath = remoteBaseTransferPath.add("data");
+        this.remoteBaseTransferPath = remoteBaseTransferPath.add(DATA_DIR);
         this.remoteMetadataTransferPath = remoteBaseTransferPath.add(METADATA_DIR);
         this.fileTransferTracker = fileTransferTracker;
     }

diff --git a/server/src/test/java/org/opensearch/index/translog/RemoteFSTranslogTests.java b/server/src/test/java/org/opensearch/index/translog/RemoteFSTranslogTests.java
@@ -112,6 +112,7 @@ public class RemoteFSTranslogTests extends OpenSearchTestCase {
     private final AtomicReference<LongConsumer> persistedSeqNoConsumer = new AtomicReference<>();
     private ThreadPool threadPool;
     private final static String METADATA_DIR = "metadata";
+    private final static String DATA_DIR = "data";
     BlobStoreRepository repository;
 
     BlobStoreTransferService blobStoreTransferService;
@@ -484,20 +485,15 @@ public void testSimpleOperationsUpload() throws Exception {
         translog.rollGeneration();
         assertEquals(6, translog.allUploaded().size());
 
-        Set<String> mdFiles = blobStoreTransferService.listAll(getTranslogDirectory().add("metadata"));
+        Set<String> mdFiles = blobStoreTransferService.listAll(getTranslogDirectory().add(METADATA_DIR));
         assertEquals(2, mdFiles.size());
         logger.info("All md files {}", mdFiles);
 
-        Set<String> tlogFiles = blobStoreTransferService.listAll(getTranslogDirectory().add("data").add(String.valueOf(primaryTerm.get())));
+        Set<String> tlogFiles = blobStoreTransferService.listAll(getTranslogDirectory().add(DATA_DIR).add(String.valueOf(primaryTerm.get())));
         logger.info("All data files {}", tlogFiles);
 
         // assert content of ckp and tlog files
-        BlobPath path = repository.basePath()
-            .add(shardId.getIndex().getUUID())
-            .add(String.valueOf(shardId.id()))
-            .add(TRANSLOG)
-            .add("data")
-            .add(String.valueOf(primaryTerm.get()));
+        BlobPath path = getTranslogDirectory().add(DATA_DIR).add(String.valueOf(primaryTerm.get()));
         for (TranslogReader reader : translog.readers) {
             final long readerGeneration = reader.getGeneration();
             logger.error("Asserting content of {}", readerGeneration);
@@ -532,14 +528,7 @@ public void testSimpleOperationsUpload() throws Exception {
             assertEquals(4, translog.allUploaded().size());
             assertEquals(
                 4,
-                blobStoreTransferService.listAll(
-                    repository.basePath()
-                        .add(shardId.getIndex().getUUID())
-                        .add(String.valueOf(shardId.id()))
-                        .add(TRANSLOG)
-                        .add("data")
-                        .add(String.valueOf(primaryTerm.get()))
-                ).size()
+                blobStoreTransferService.listAll(getTranslogDirectory().add(DATA_DIR).add(String.valueOf(primaryTerm.get()))).size()
             );
         });
 
@@ -552,14 +541,7 @@ public void testSimpleOperationsUpload() throws Exception {
             assertEquals(4, translog.allUploaded().size());
             assertEquals(
                 4,
-                blobStoreTransferService.listAll(
-                    repository.basePath()
-                        .add(shardId.getIndex().getUUID())
-                        .add(String.valueOf(shardId.id()))
-                        .add(TRANSLOG)
-                        .add("data")
-                        .add(String.valueOf(primaryTerm.get()))
-                ).size()
+                blobStoreTransferService.listAll(getTranslogDirectory().add(DATA_DIR).add(String.valueOf(primaryTerm.get()))).size()
             );
         });