CNDB-13031: change Descriptor#fileFor to use the same file system as Descriptor#directory

Author: jasonstack

src/java/org/apache/cassandra/io/sstable/Component.java

@@ -161,14 +161,35 @@ public static Component parse(String name)
         }
     }
 
+    /**
+     * @return file that uses the resolved file system as provided absolutePath URI
+     */
     public File getFile(String absolutePath)
     {
+        // new file will have the default file open options from file system
         File ret;
         if (absolutePath.lastIndexOf(separator) != (absolutePath.length() - 1))
             ret = new File(PathUtils.getPath(absolutePath + separator + name));
         else
             ret = new File(PathUtils.getPath(absolutePath + name));
 
+        // update open options
+        return StorageProvider.instance.withOpenOptions(ret, this);
+    }
+
+    /**
+     * @return file that uses the same file system as provided directory and resolved from provided directory
+     */
+    public File getFile(File directory, String filenamePart)
+    {
+        // new file will have the same file open options as provided directory
+        File ret;
+        if (filenamePart.lastIndexOf(separator) != (filenamePart.length() - 1))
+            ret = directory.resolve(filenamePart + separator + name);
+        else
+            ret = directory.resolve(filenamePart + name);
+
+        // update open options
         return StorageProvider.instance.withOpenOptions(ret, this);
     }
 

src/java/org/apache/cassandra/io/sstable/Descriptor.java

@@ -150,7 +150,7 @@ public String filenameFor(Component component)
 
     public File fileFor(Component component)
     {
-        return componentFileMap.computeIfAbsent(component, c -> component.getFile(baseFileURI));
+        return componentFileMap.computeIfAbsent(component, c -> component.getFile(directory, filenamePart));
     }
 
     public String baseFilename()

test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java

@@ -17,7 +17,7 @@
  */
 package org.apache.cassandra.io.sstable;
 
-import java.nio.file.Path;
+import java.net.URI;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
@@ -31,8 +31,8 @@
 import org.apache.cassandra.io.util.File;
 import org.apache.cassandra.io.util.FileUtils;
 import org.apache.cassandra.utils.ByteBufferUtil;
-import org.apache.cassandra.utils.DseLegacy;
 import org.apache.cassandra.utils.Pair;
+import org.mockito.Mockito;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -114,6 +114,29 @@ private void checkFromFilename(Descriptor original)
         assertEquals(Component.DATA, Descriptor.validFilenameWithComponent(file.name()));
     }
 
+    @Test
+    public void testFromFileWithResolveByDirectory() throws Exception
+    {
+        String rawUri = tempDataDir.absolutePath() + File.pathSeparator() + ksname + File.pathSeparator() + cfname + '-' + cfId;
+
+        File cfDirectory = Mockito.mock(File.class);
+        Mockito.when(cfDirectory.toCanonical()).thenReturn(cfDirectory);
+        Mockito.when(cfDirectory.toUri()).thenReturn(URI.create(rawUri));
+
+        File componentFile = Mockito.mock(File.class);
+        Mockito.when(cfDirectory.resolve(Mockito.anyString())).thenReturn(componentFile);
+
+        Descriptor desc = new Descriptor(cfDirectory, ksname, cfname, new SequenceBasedSSTableId(1), SSTableFormat.Type.BIG);
+        assertEquals(cfDirectory.toCanonical(), desc.directory);
+        assertEquals(ksname, desc.ksname);
+        assertEquals(cfname, desc.cfname);
+        assertEquals(new SequenceBasedSSTableId(1), desc.id);
+
+        // verify data component is resolved from given directory
+        File dataComponent = desc.fileFor(Component.DATA);
+        assertEquals(dataComponent, componentFile);
+    }
+
     @Test
     public void testEquality()
     {