Address PR comments

Signed-off-by: Sachin Kale <kalsac@amazon.com>
opensearch-project · Aug 29, 2022 · 5d30441 · 5d30441
1 parent 9e53228
commit 5d30441
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 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
@@ -372,7 +372,7 @@ private String getLocalSegmentFilename(String remoteFilename) {
 
     // Visible for testing
     public Map<String, UploadedSegmentMetadata> getSegmentsUploadedToRemoteStore() {
-        return this.segmentsUploadedToRemoteStore;
+        return Collections.unmodifiableMap(this.segmentsUploadedToRemoteStore);
     }
 
     /**

diff --git a/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java b/server/src/test/java/org/opensearch/index/store/RemoteSegmentStoreDirectoryTests.java
@@ -318,20 +318,39 @@ public void testCopyFromException() throws IOException {
     }
 
     public void testContainsFile() throws IOException {
-        populateMetadata();
+        List<String> metadataFiles = List.of("metadata__1__5__abc");
+        when(remoteMetadataDirectory.listFilesByPrefix(RemoteSegmentStoreDirectory.MetadataFilenameUtils.METADATA_PREFIX)).thenReturn(
+            metadataFiles
+        );
+
+        Map<String, String> metadata = new HashMap<>();
+        metadata.put("_0.cfe", "_0.cfe::_0.cfe__" + UUIDs.base64UUID() + "::1234");
+        metadata.put("_0.cfs", "_0.cfs::_0.cfs__" + UUIDs.base64UUID() + "::2345");
+
+        Map<String, Map<String, String>> metadataFilenameContentMapping = Map.of("metadata__1__5__abc", metadata);
+
+        IndexInput indexInput1 = mock(IndexInput.class);
+        when(indexInput1.readMapOfStrings()).thenReturn(metadataFilenameContentMapping.get("metadata__1__5__abc"));
+        when(remoteMetadataDirectory.openInput("metadata__1__5__abc", IOContext.DEFAULT)).thenReturn(indexInput1);
+
         remoteSegmentStoreDirectory.init();
 
-        // This is not the correct way to add files but the other way is to open up access to fields in UploadedSegmentMetadata
         Map<String, RemoteSegmentStoreDirectory.UploadedSegmentMetadata> uploadedSegmentMetadataMap = remoteSegmentStoreDirectory
             .getSegmentsUploadedToRemoteStore();
-        uploadedSegmentMetadataMap.put(
-            "_100.si",
-            new RemoteSegmentStoreDirectory.UploadedSegmentMetadata("_100.si", "_100.si__uuid1", "1234")
+
+        assertThrows(
+            UnsupportedOperationException.class,
+            () -> uploadedSegmentMetadataMap.put(
+                "_100.si",
+                new RemoteSegmentStoreDirectory.UploadedSegmentMetadata("_100.si", "_100.si__uuid1", "1234")
+            )
         );
 
-        assertTrue(remoteSegmentStoreDirectory.containsFile("_100.si", "1234"));
-        assertFalse(remoteSegmentStoreDirectory.containsFile("_100.si", "2345"));
-        assertFalse(remoteSegmentStoreDirectory.containsFile("_200.si", "1234"));
+        assertTrue(remoteSegmentStoreDirectory.containsFile("_0.cfe", "1234"));
+        assertTrue(remoteSegmentStoreDirectory.containsFile("_0.cfs", "2345"));
+        assertFalse(remoteSegmentStoreDirectory.containsFile("_0.cfe", "1234000"));
+        assertFalse(remoteSegmentStoreDirectory.containsFile("_0.cfs", "2345000"));
+        assertFalse(remoteSegmentStoreDirectory.containsFile("_0.si", "23"));
     }
 
     public void testUploadMetadataEmpty() throws IOException {