Fix existing UTs

Signed-off-by: Sachin Kale <kalsac@amazon.com>
opensearch-project · Jun 29, 2023 · e2bcafe · e2bcafe
1 parent bab1a6e
commit e2bcafe
Show file tree

Hide file tree

Showing 2 changed files with 133 additions and 139 deletions.
diff --git a/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java b/server/src/main/java/org/opensearch/index/store/RemoteSegmentStoreDirectory.java
@@ -148,7 +148,10 @@ public RemoteSegmentMetadata initializeToSpecificCommit(long primaryTerm, long c
     public RemoteSegmentMetadata readLatestMetadataFile() throws IOException {
         RemoteSegmentMetadata remoteSegmentMetadata = null;
 
-        List<String> metadataFiles = remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(MetadataFilenameUtils.METADATA_PREFIX, 1);
+        List<String> metadataFiles = remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(
+            MetadataFilenameUtils.METADATA_PREFIX,
+            1
+        );
 
         if (metadataFiles.isEmpty() == false) {
             String latestMetadataFile = metadataFiles.get(0);
@@ -220,12 +223,23 @@ static class MetadataFilenameUtils {
         public static final String METADATA_PREFIX = "metadata";
 
         static String getMetadataFilePrefixForCommit(long primaryTerm, long generation) {
-            return String.join(SEPARATOR, METADATA_PREFIX, RemoteStoreUtils.invertLong(primaryTerm), RemoteStoreUtils.invertLong(generation));
+            return String.join(
+                SEPARATOR,
+                METADATA_PREFIX,
+                RemoteStoreUtils.invertLong(primaryTerm),
+                RemoteStoreUtils.invertLong(generation)
+            );
         }
 
         // Visible for testing
         static String getMetadataFilename(long primaryTerm, long generation, long translogGeneration) {
-            return String.join(SEPARATOR, METADATA_PREFIX, RemoteStoreUtils.invertLong(primaryTerm), RemoteStoreUtils.invertLong(generation), RemoteStoreUtils.invertLong(translogGeneration));
+            return String.join(
+                SEPARATOR,
+                METADATA_PREFIX,
+                RemoteStoreUtils.invertLong(primaryTerm),
+                RemoteStoreUtils.invertLong(generation),
+                RemoteStoreUtils.invertLong(translogGeneration)
+            );
         }
 
         // Visible for testing
@@ -235,7 +249,7 @@ static long getPrimaryTerm(String[] filenameTokens) {
 
         // Visible for testing
         static long getGeneration(String[] filenameTokens) {
-            return RemoteStoreUtils.invertLong(filenameTokens[1]);
+            return RemoteStoreUtils.invertLong(filenameTokens[2]);
         }
     }
 
@@ -379,8 +393,7 @@ String getMetadataFileForCommit(long primaryTerm, long generation) throws IOExce
         return metadataFiles.iterator().next();
     }
 
-    public void copyFrom(Directory from, String src, String dest, IOContext context, String checksum)
-        throws IOException {
+    public void copyFrom(Directory from, String src, String dest, IOContext context, String checksum) throws IOException {
         String remoteFilename;
         remoteFilename = getNewRemoteSegmentFilename(dest);
         remoteDataDirectory.copyFrom(from, src, remoteFilename, context);
@@ -523,7 +536,10 @@ public Map<String, UploadedSegmentMetadata> getSegmentsUploadedToRemoteStore(lon
      * @throws IOException in case of I/O error while reading from / writing to remote segment store
      */
     public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException {
-        List<String> sortedMetadataFileList = remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(MetadataFilenameUtils.METADATA_PREFIX, Integer.MAX_VALUE);
+        List<String> sortedMetadataFileList = remoteMetadataDirectory.listFilesByPrefixInLexicographicOrder(
+            MetadataFilenameUtils.METADATA_PREFIX,
+            Integer.MAX_VALUE
+        );
         if (sortedMetadataFileList.size() <= lastNMetadataFilesToKeep) {
             logger.info(
                 "Number of commits in remote segment store={}, lastNMetadataFilesToKeep={}",
@@ -534,8 +550,8 @@ public void deleteStaleSegments(int lastNMetadataFilesToKeep) throws IOException
         }
 
         List<String> metadataFilesEligibleToDelete = sortedMetadataFileList.subList(
-            0,
-            sortedMetadataFileList.size() - lastNMetadataFilesToKeep
+            lastNMetadataFilesToKeep,
+            sortedMetadataFileList.size()
         );
         List<String> metadataFilesToBeDeleted = metadataFilesEligibleToDelete.stream().filter(metadataFile -> {
             try {