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 d08fd1ebd8 Revert "Fix MemtableSizeTestBase#testSize (now
MemtableSizeTest#testSize) was not running in CI" Not needed patch by Ekaterina
Dimitrova; reviwed by Brandon Williams for CASSANDRA-18329
d08fd1ebd8 is described below
commit d08fd1ebd83edc4730316c9630e60b8c0b0be89d
Author: Ekaterina Dimitrova <[email protected]>
AuthorDate: Tue Jul 25 17:06:21 2023 -0400
Revert "Fix MemtableSizeTestBase#testSize (now MemtableSizeTest#testSize)
was not running in CI"
Not needed
patch by Ekaterina Dimitrova; reviwed by Brandon Williams for
CASSANDRA-18329
This reverts commit 6b885a44c39ff3abcd5cb6c6c44eaa4004979aa7.
---
.../org/apache/cassandra/db/memtable/MemtableSizeHeapBuffersTest.java | 2 +-
.../apache/cassandra/db/memtable/MemtableSizeOffheapBuffersTest.java | 2 +-
.../apache/cassandra/db/memtable/MemtableSizeOffheapObjectsTest.java | 2 +-
.../db/memtable/{MemtableSizeTest.java => MemtableSizeTestBase.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 2d7febdb47..4497e8cd83 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 MemtableSizeTest
+public class MemtableSizeHeapBuffersTest extends MemtableSizeTestBase
{
// 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 b7d224eedb..022f4f1792 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 MemtableSizeTest
+public class MemtableSizeOffheapBuffersTest extends MemtableSizeTestBase
{
// 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 5fa67fedbf..559f456d14 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 MemtableSizeTest
+public class MemtableSizeOffheapObjectsTest extends MemtableSizeTestBase
{
// Overrides CQLTester.setUpClass to run before it
@BeforeClass
diff --git a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
similarity index 99%
rename from test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
rename to test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
index ed7b90e382..33d1fcb7e5 100644
--- a/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTest.java
+++ b/test/unit/org/apache/cassandra/db/memtable/MemtableSizeTestBase.java
@@ -44,7 +44,7 @@ import org.github.jamm.MemoryMeter.Guess;
// 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 class MemtableSizeTest extends CQLTester
+public abstract class MemtableSizeTestBase extends CQLTester
{
// Note: To see a printout of the usage for each object, add
.printVisitedTree() here (most useful with smaller number of
// partitions).
@@ -54,7 +54,7 @@ public class MemtableSizeTest extends CQLTester
// .printVisitedTreeUpTo(1000)
.build();
- static final Logger logger =
LoggerFactory.getLogger(MemtableSizeTest.class);
+ static final Logger logger =
LoggerFactory.getLogger(MemtableSizeTestBase.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 67042bf856..b59a4749f0 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 MemtableSizeTest
+public class MemtableSizeUnslabbedTest extends MemtableSizeTestBase
{
// Overrides CQLTester.setUpClass to run before it
@BeforeClass
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
