CNDB-13785: fix IndexComponentDiscover#StateBuilder to pass MB instead of bytes (#1699)

Author: jasonstack

src/java/org/apache/cassandra/index/sai/disk/format/IndexComponentDiscovery.java

@@ -42,6 +42,7 @@
 import org.apache.cassandra.utils.NoSpamLogger;
 
 import static org.apache.cassandra.config.CassandraRelevantProperties.SAI_CUSTOM_COMPONENTS_DISCOVERY_CLASS;
+import static org.apache.cassandra.index.sai.disk.format.SSTableIndexComponentsState.State.toMB;
 
 /**
  * Handles "discovering" SAI index components files from disk for a given sstable.
@@ -253,9 +254,9 @@ private static class StateBuilder
         void addTo(SSTableIndexComponentsState.Builder builder, @Nullable String indexName)
         {
             if (indexName == null)
-                builder.addPerSSTable(buildId, totalSizeInBytes);
+                builder.addPerSSTable(buildId, toMB(totalSizeInBytes));
             else
-                builder.addPerIndex(indexName, buildId, totalSizeInBytes);
+                builder.addPerIndex(indexName, buildId, toMB(totalSizeInBytes));
         }
 
         static SSTableIndexComponentsState convert(Map<String, StateBuilder> states)

src/java/org/apache/cassandra/index/sai/disk/format/SSTableIndexComponentsState.java

@@ -342,7 +342,7 @@ private static State of(IndexComponents.ForRead components)
             return new State(components.buildId(), toMB(components.liveSizeOnDiskInBytes()));
         }
 
-        private static long toMB(long bytes)
+        public static long toMB(long bytes)
         {
             if (bytes == 0)
                 return 0;

test/unit/org/apache/cassandra/index/sai/disk/format/IndexDescriptorTest.java

@@ -19,6 +19,7 @@
 package org.apache.cassandra.index.sai.disk.format;
 
 import java.io.IOException;
+import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -272,30 +273,53 @@ public void testReload() throws Throwable
         assertTrue(components.has(IndexComponentType.KD_TREE_POSTING_LISTS));
     }
 
-    private static void createFileOnDisk(Descriptor descriptor, String componentStr) throws IOException
+    private static void createEmptyFileOnDisk(Descriptor descriptor, String componentStr) throws IOException
     {
         Files.touch(new File(PathUtils.getPath(descriptor.baseFileUri() + '-' + componentStr)).toJavaIOFile());
     }
 
+    private static void createileOnDisk(Descriptor descriptor, String componentStr, int size) throws IOException
+    {
+        if (size == 0)
+        {
+            createEmptyFileOnDisk(descriptor, componentStr);
+        }
+        else
+        {
+            Path filePath = PathUtils.getPath(descriptor.baseFileUri() + '-' + componentStr);
+            Files.write(new byte[size], filePath.toFile());
+        }
+    }
+
     static void createFakeDataFile(Descriptor descriptor) throws IOException
     {
-        createFileOnDisk(descriptor, SSTableFormat.Components.DATA.name());
+        createEmptyFileOnDisk(descriptor, SSTableFormat.Components.DATA.name());
     }
 
     static void createFakeTOCFile(Descriptor descriptor) throws IOException
     {
-        createFileOnDisk(descriptor, SSTableFormat.Components.TOC.name());
+        createEmptyFileOnDisk(descriptor, SSTableFormat.Components.TOC.name());
     }
 
     static void createFakePerSSTableComponents(Descriptor descriptor, Version version, int generation) throws IOException
+    {
+        createFakePerSSTableComponents(descriptor, version, generation, 0);
+    }
+
+    static void createFakePerSSTableComponents(Descriptor descriptor, Version version, int generation, int sizeInBytes) throws IOException
     {
         for (IndexComponentType type : version.onDiskFormat().perSSTableComponentTypes())
-            createFileOnDisk(descriptor, version.fileNameFormatter().format(type, (String)null, generation));
+            createileOnDisk(descriptor, version.fileNameFormatter().format(type, (String)null, generation), sizeInBytes);
     }
 
     static void createFakePerIndexComponents(Descriptor descriptor, IndexContext context, Version version, int generation) throws IOException
+    {
+        createFakePerIndexComponents(descriptor, context, version, generation, 0);
+    }
+
+    static void createFakePerIndexComponents(Descriptor descriptor, IndexContext context, Version version, int generation, int sizeInBytes) throws IOException
     {
         for (IndexComponentType type : version.onDiskFormat().perIndexComponentTypes(context))
-            createFileOnDisk(descriptor, version.fileNameFormatter().format(type, context, generation));
+            createileOnDisk(descriptor, version.fileNameFormatter().format(type, context, generation), sizeInBytes);
     }
 }

test/unit/org/apache/cassandra/index/sai/disk/format/SSTableIndexComponentsStateTest.java

@@ -29,6 +29,8 @@
 import org.apache.cassandra.index.sai.SAITester;
 import org.apache.cassandra.index.sai.disk.format.SSTableIndexComponentsState.UnapplicableDiffException;
 import org.apache.cassandra.io.sstable.Descriptor;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
+import org.mockito.Mockito;
 
 import static org.apache.cassandra.index.sai.disk.format.IndexDescriptorTest.createFakeDataFile;
 import static org.apache.cassandra.index.sai.disk.format.IndexDescriptorTest.createFakePerIndexComponents;
@@ -342,9 +344,17 @@ public void buildFromDescriptorTest() throws IOException
             Descriptor descriptor = Descriptor.fromFilename(temporaryFolder.newFolder().getAbsolutePath() + "/ca-1-bti-Data.db");
 
             createFakeDataFile(descriptor);
-            createFakePerSSTableComponents(descriptor, Version.latest(), 0);
-            createFakePerIndexComponents(descriptor, idx1, Version.latest(), 1);
-            createFakePerIndexComponents(descriptor, idx2, Version.DB, 0);
+            createFakePerSSTableComponents(descriptor, Version.latest(), 0, 1 * 1024 * 1024); // 1mb per file
+            createFakePerIndexComponents(descriptor, idx1, Version.latest(), 1, 2 * 1024 * 1024); // 2mb per file
+            createFakePerIndexComponents(descriptor, idx2, Version.DB, 0, 3 * 1024 * 1024); // 3mb per file
+
+            SSTableReader sstable = Mockito.mock(SSTableReader.class);
+            Mockito.when(sstable.getDescriptor()).thenReturn(descriptor);
+            SSTableIndexComponentsState discovered = IndexComponentDiscovery.instance().discoverComponents(sstable);
+            assertEquals(6, discovered.perSSTable().sizeInMB);
+            assertEquals(8, discovered.perIndex(idx1.getIndexName()).sizeInMB);
+            assertEquals(12, discovered.perIndex(idx2.getIndexName()).sizeInMB);
+            assertEquals(26, discovered.totalSizeInMB());
 
             IndexDescriptor indexDescriptor = loadDescriptor(descriptor, idx1, idx2);
 
@@ -355,12 +365,17 @@ public void buildFromDescriptorTest() throws IOException
 
             assertEquals(Version.latest(), state.perSSTable().buildId.version());
             assertEquals(0, state.perSSTable().buildId.generation());
+            assertEquals(6, state.perSSTable().sizeInMB);
 
             assertEquals(Version.latest(), state.perIndex(idx1.getIndexName()).buildId.version());
             assertEquals(1, state.perIndex(idx1.getIndexName()).buildId.generation());
+            assertEquals(8, state.perIndex(idx1.getIndexName()).sizeInMB);
 
             assertEquals(Version.DB, state.perIndex(idx2.getIndexName()).buildId.version());
             assertEquals(0, state.perIndex(idx2.getIndexName()).buildId.generation());
+            assertEquals(12, state.perIndex(idx2.getIndexName()).sizeInMB);
+
+            assertEquals(26, state.totalSizeInMB());
         }
         finally
         {