This is an automated email from the ASF dual-hosted git repository.
edimitrova pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6b885a44c3 Fix MemtableSizeTestBase#testSize (now
MemtableSizeTest#testSize) was not running in CI
6b885a44c3 is described below
commit 6b885a44c39ff3abcd5cb6c6c44eaa4004979aa7
Author: Ekaterina Dimitrova <ekaterina.dimitr...@datastax.com>
AuthorDate: Fri Jul 21 11:09:02 2023 -0400
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
---
.../org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java | 2 +-
.../apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java | 2 +-
.../apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java | 2 +-
.../db/memtable/{MemtableSizeTestBase.java => MemtableSizeTest.java} | 4 ++--
.../org/apache/cassandra/db/memtable/MemtableSizeUnslabbedTest.java | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java
b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java
index 4497e8cd83..2d7febdb47 100644
---
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.config.Config;
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
index 022f4f1792..b7d224eedb 100644
---
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.config.Config;
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
index 559f456d14..5fa67fedbf 100644
---
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.config.Config;
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/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
similarity index 99%
rename from test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
rename to test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
index 77605279b9..acbdc89993 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
@@ -43,14 +43,14 @@ import org.github.jamm.MemoryMeter;
// 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
index b59a4749f0..67042bf856 100644
--- 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.config.Config;
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
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
