You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bd...@apache.org on 2026/04/14 21:46:57 UTC
(cassandra) 08/36: Separate TestParams by use-case (Accord vs. Mutation Journal)
This is an automated email from the ASF dual-hosted git repository.
bdeggleston pushed a commit to branch cep-45-mutation-tracking
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 6c26813c2abc76633da9e2eae184a8c1fc4da95a
Author: Caleb Rackliffe <ca...@gmail.com>
AuthorDate: Thu Aug 14 11:31:24 2025 -0500
Separate TestParams by use-case (Accord vs. Mutation Journal)
---
.../cassandra/service/accord/AccordJournalBurnTest.java | 2 +-
.../service/accord/AccordJournalCompactionTest.java | 3 ++-
.../db/compaction/CompactionAccordIteratorsTest.java | 2 +-
test/unit/org/apache/cassandra/journal/JournalTest.java | 4 ++--
test/unit/org/apache/cassandra/journal/SegmentTest.java | 2 +-
test/unit/org/apache/cassandra/journal/TestParams.java | 13 +++++++++++--
.../apache/cassandra/replication/MutationJournalTest.java | 2 +-
.../cassandra/service/accord/AccordJournalOrderTest.java | 2 +-
8 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java b/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java
index aba9a8c69e..4b298d9d1e 100644
--- a/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java
+++ b/test/distributed/org/apache/cassandra/service/accord/AccordJournalBurnTest.java
@@ -190,7 +190,7 @@ public class AccordJournalBurnTest extends BurnTestBase
directory.deleteRecursiveOnExit();
ColumnFamilyStore cfs = ks.getColumnFamilyStore("journal_" + nodeId);
cfs.disableAutoCompaction();
- AccordJournal journal = new AccordJournal(new TestParams()
+ AccordJournal journal = new AccordJournal(new TestParams(Version.LATEST.version)
{
@Override
public int segmentSize()
diff --git a/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java b/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java
index 3290a0e7a1..950db6298b 100644
--- a/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java
+++ b/test/distributed/org/apache/cassandra/service/accord/AccordJournalCompactionTest.java
@@ -50,6 +50,7 @@ import org.apache.cassandra.io.util.File;
import org.apache.cassandra.journal.TestParams;
import org.apache.cassandra.schema.SchemaConstants;
import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.service.accord.serializers.Version;
import org.apache.cassandra.utils.AccordGenerators;
import static accord.api.Journal.FieldUpdates;
@@ -96,7 +97,7 @@ public class AccordJournalCompactionTest
Gen<NavigableMap<Timestamp, Ranges>> safeToReadGen = AccordGenerators.safeToReadGen(DatabaseDescriptor.getPartitioner());
Gen<RangesForEpoch> rangesForEpochGen = AccordGenerators.rangesForEpoch(DatabaseDescriptor.getPartitioner());
- AccordJournal journal = new AccordJournal(new TestParams()
+ AccordJournal journal = new AccordJournal(new TestParams(Version.LATEST.version)
{
@Override
public int segmentSize()
diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java
index 04cd92fc89..121e913769 100644
--- a/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java
+++ b/test/unit/org/apache/cassandra/db/compaction/CompactionAccordIteratorsTest.java
@@ -269,7 +269,7 @@ public class CompactionAccordIteratorsTest
compactionInfos.put(commandStore.id(), compactionInfo);
when(mockAccordService.agent()).thenReturn(mock(Agent.class));
when(mockAccordService.getCompactionInfo()).thenReturn(compactionInfos);
- when(mockAccordService.journalConfiguration()).thenReturn(new TestParams());
+ when(mockAccordService.journalConfiguration()).thenReturn(TestParams.ACCORD);
return mockAccordService;
}
diff --git a/test/unit/org/apache/cassandra/journal/JournalTest.java b/test/unit/org/apache/cassandra/journal/JournalTest.java
index 62342777a7..5a064d95eb 100644
--- a/test/unit/org/apache/cassandra/journal/JournalTest.java
+++ b/test/unit/org/apache/cassandra/journal/JournalTest.java
@@ -50,7 +50,7 @@ public class JournalTest
directory.deleteRecursiveOnExit();
Journal<TimeUUID, Long> journal =
- new Journal<>("TestJournal", directory, TestParams.INSTANCE, TimeUUIDKeySupport.INSTANCE, LongSerializer.INSTANCE, SegmentCompactor.noop(), new OpOrder());
+ new Journal<>("TestJournal", directory, TestParams.ACCORD, TimeUUIDKeySupport.INSTANCE, LongSerializer.INSTANCE, SegmentCompactor.noop(), new OpOrder());
journal.start();
@@ -71,7 +71,7 @@ public class JournalTest
journal.shutdown();
- journal = new Journal<>("TestJournal", directory, TestParams.INSTANCE, TimeUUIDKeySupport.INSTANCE, LongSerializer.INSTANCE, SegmentCompactor.noop(), new OpOrder());
+ journal = new Journal<>("TestJournal", directory, TestParams.ACCORD, TimeUUIDKeySupport.INSTANCE, LongSerializer.INSTANCE, SegmentCompactor.noop(), new OpOrder());
journal.start();
assertEquals(1L, (long) journal.readLast(id1));
diff --git a/test/unit/org/apache/cassandra/journal/SegmentTest.java b/test/unit/org/apache/cassandra/journal/SegmentTest.java
index 240922a01e..c265b3a824 100644
--- a/test/unit/org/apache/cassandra/journal/SegmentTest.java
+++ b/test/unit/org/apache/cassandra/journal/SegmentTest.java
@@ -204,6 +204,6 @@ public class SegmentTest
private static Params params()
{
- return TestParams.INSTANCE;
+ return TestParams.ACCORD;
}
}
diff --git a/test/unit/org/apache/cassandra/journal/TestParams.java b/test/unit/org/apache/cassandra/journal/TestParams.java
index d464f00fad..2f65140733 100644
--- a/test/unit/org/apache/cassandra/journal/TestParams.java
+++ b/test/unit/org/apache/cassandra/journal/TestParams.java
@@ -19,11 +19,20 @@ package org.apache.cassandra.journal;
import java.util.concurrent.TimeUnit;
+import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.accord.serializers.Version;
public class TestParams implements Params
{
- public static final TestParams INSTANCE = new TestParams();
+ public static final TestParams ACCORD = new TestParams(Version.LATEST.version);
+ public static final TestParams MUTATION_JOURNAL = new TestParams(MessagingService.current_version);
+
+ private final int userVersion;
+
+ public TestParams(int userVersion)
+ {
+ this.userVersion = userVersion;
+ }
@Override
public int segmentSize()
@@ -82,6 +91,6 @@ public class TestParams implements Params
@Override
public int userVersion()
{
- return Version.LATEST.version;
+ return userVersion;
}
}
diff --git a/test/unit/org/apache/cassandra/replication/MutationJournalTest.java b/test/unit/org/apache/cassandra/replication/MutationJournalTest.java
index 26fcc9f1af..a0c778a3e4 100644
--- a/test/unit/org/apache/cassandra/replication/MutationJournalTest.java
+++ b/test/unit/org/apache/cassandra/replication/MutationJournalTest.java
@@ -66,7 +66,7 @@ public class MutationJournalTest
File directory = new File(Files.createTempDirectory("mutation-journal-test-simple"));
directory.deleteRecursiveOnExit();
- journal = new MutationJournal(directory, TestParams.INSTANCE);
+ journal = new MutationJournal(directory, TestParams.MUTATION_JOURNAL);
journal.start();
}
diff --git a/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java b/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java
index a4b8c75955..6ee367c33b 100644
--- a/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java
+++ b/test/unit/org/apache/cassandra/service/accord/AccordJournalOrderTest.java
@@ -75,7 +75,7 @@ public class AccordJournalOrderTest
{
if (new File(DatabaseDescriptor.getAccordJournalDirectory()).exists())
ServerTestUtils.cleanupDirectory(DatabaseDescriptor.getAccordJournalDirectory());
- AccordJournal accordJournal = new AccordJournal(TestParams.INSTANCE);
+ AccordJournal accordJournal = new AccordJournal(TestParams.ACCORD);
accordJournal.start(null);
RandomSource randomSource = RandomSource.wrap(new Random(0));
TxnId id1 = AccordGens.txnIds().next(randomSource);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org