Fix MemtableSizeTestBase#testSize (now MemtableSizeTest#testSize) was…

… not running in CI patch by Ekaterina Dimitrova; reviewed by Brandon Williams and Michael Semb Wever for CASSANDRA-18329
apache · Jul 22, 2023 · 6b885a4 · 6b885a4
1 parent b41e2f5
commit 6b885a4
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.MemtablePool;
 import org.apache.cassandra.utils.memory.SlabPool;
 
-public class MemtableSizeHeapBuffersTest extends MemtableSizeTestBase
+public class MemtableSizeHeapBuffersTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass

diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.MemtablePool;
 import org.apache.cassandra.utils.memory.SlabPool;
 
-public class MemtableSizeOffheapBuffersTest extends MemtableSizeTestBase
+public class MemtableSizeOffheapBuffersTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass

diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.MemtablePool;
 import org.apache.cassandra.utils.memory.NativePool;
 
-public class MemtableSizeOffheapObjectsTest extends MemtableSizeTestBase
+public class MemtableSizeOffheapObjectsTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass

diff --git a/...dra/db/memtable/MemtableSizeTestBase.java → ...ssandra/db/memtable/MemtableSizeTest.java b/...dra/db/memtable/MemtableSizeTestBase.java → ...ssandra/db/memtable/MemtableSizeTest.java
@@ -43,14 +43,14 @@
 // Note: This test can be run in idea with the allocation type configured in the test yaml and memtable using the
 // value memtableClass is initialized with.
 @RunWith(Parameterized.class)
-public abstract class MemtableSizeTestBase extends CQLTester
+public class MemtableSizeTest extends CQLTester
 {
     // Note: To see a printout of the usage for each object, add .enableDebug() here (most useful with smaller number of
     // partitions).
     static MemoryMeter meter = new MemoryMeter().ignoreKnownSingletons()
                                                 .withGuessing(MemoryMeter.Guess.FALLBACK_UNSAFE);
 
-    static final Logger logger = LoggerFactory.getLogger(MemtableSizeTestBase.class);
+    static final Logger logger = LoggerFactory.getLogger(MemtableSizeTest.class);
 
     static final int partitions = 50_000;
     static final int rowsPerPartition = 4;

diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java
@@ -25,7 +25,7 @@
 import org.apache.cassandra.utils.memory.HeapPool;
 import org.apache.cassandra.utils.memory.MemtablePool;
 
-public class MemtableSizeUnslabbedTest extends MemtableSizeTestBase
+public class MemtableSizeUnslabbedTest extends MemtableSizeTest
 {
     // Overrides CQLTester.setUpClass to run before it
     @BeforeClass