dcapwell commented on code in PR #3408:
URL: https://github.com/apache/cassandra/pull/3408#discussion_r1674716364


##########
test/simulator/test/org/apache/cassandra/simulator/test/AccordJournalSimulationTest.java:
##########
@@ -18,250 +18,359 @@
 package org.apache.cassandra.simulator.test;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
+import java.nio.ByteBuffer;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.zip.Checksum;
 import javax.annotation.Nullable;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.jimfs.Jimfs;
 
-import accord.topology.TopologyUtils;
+import org.apache.cassandra.concurrent.ExecutorFactory;
+import org.apache.cassandra.concurrent.ExecutorPlus;
 import org.apache.cassandra.config.AccordSpec;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.db.TypeSizes;
+import org.apache.cassandra.distributed.test.log.CMSTestBase;
+import org.apache.cassandra.harry.sut.TokenPlacementModel;
+import org.apache.cassandra.io.filesystem.ListenableFileSystem;
+import org.apache.cassandra.io.util.DataInputPlus;
+import org.apache.cassandra.io.util.DataOutputPlus;
+import org.apache.cassandra.journal.AsyncCallbacks;
+import org.apache.cassandra.journal.Journal;
+import org.apache.cassandra.journal.KeySupport;
+import org.apache.cassandra.journal.ValueSerializer;
 import org.apache.cassandra.schema.*;
-import org.junit.Ignore;
+
+import org.junit.Assert;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import accord.Utils;
-import accord.api.Data;
-import accord.api.RoutingKey;
-import accord.api.Update;
-import accord.api.Write;
-import accord.local.Node;
-import accord.messages.MessageType;
-import accord.messages.PreAccept;
-import accord.messages.TxnRequest;
-import accord.primitives.FullKeyRoute;
-import accord.primitives.FullRoute;
-import accord.primitives.Keys;
-import accord.primitives.Ranges;
-import accord.primitives.Seekables;
-import accord.primitives.Timestamp;
-import accord.primitives.Txn;
-import accord.primitives.TxnId;
-import accord.topology.Topologies;
-import org.apache.cassandra.concurrent.ExecutorFactory;
-import org.apache.cassandra.concurrent.ExecutorPlus;
+
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.ParameterizedClass;
-import org.apache.cassandra.db.ColumnFamilyStore;
 import org.apache.cassandra.db.Keyspace;
-import org.apache.cassandra.db.commitlog.CommitLog;
-import org.apache.cassandra.db.marshal.Int32Type;
 import org.apache.cassandra.dht.Murmur3Partitioner;
 import org.apache.cassandra.io.util.File;
-import org.apache.cassandra.io.util.Files;
-import org.apache.cassandra.service.accord.AccordJournal;
-import org.apache.cassandra.service.accord.TokenRange;
-import org.apache.cassandra.service.accord.api.AccordRoutingKey;
-import org.apache.cassandra.service.accord.api.PartitionKey;
-import org.apache.cassandra.service.accord.txn.TxnNamedRead;
-import org.apache.cassandra.service.accord.txn.TxnQuery;
-import org.apache.cassandra.service.accord.txn.TxnRead;
-import org.apache.cassandra.utils.ByteBufferUtil;
+import org.apache.cassandra.tcm.AtomicLongBackedProcessor;
+import org.apache.cassandra.tcm.ClusterMetadata;
 import org.apache.cassandra.utils.Isolated;
 import org.apache.cassandra.utils.concurrent.CountDownLatch;
 
 public class AccordJournalSimulationTest extends SimulationTestBase
 {
     @Test
-    @Ignore // TODO: re-enable
-    public void test() throws IOException
+    public void simpleRWTest() throws IOException
     {
-        simulate(arr(() -> run()),
-                 () -> check());
+        simulate(arr(() -> {
+                    ListenableFileSystem fs = new 
ListenableFileSystem(Jimfs.newFileSystem());
+                    File.unsafeSetFilesystem(fs);
+                    DatabaseDescriptor.daemonInitialization();
+                    DatabaseDescriptor.setCommitLogCompression(new 
ParameterizedClass("LZ4Compressor", ImmutableMap.of())); //
+                    
DatabaseDescriptor.setCommitLogWriteDiskAccessMode(Config.DiskAccessMode.standard);
+                    DatabaseDescriptor.initializeCommitLogDiskAccessMode();
+                    
System.out.println("DatabaseDescriptor.getCommitLogWriteDiskAccessMode() = " + 
DatabaseDescriptor.getCommitLogWriteDiskAccessMode());
+
+                    
DatabaseDescriptor.setPartitionerUnsafe(Murmur3Partitioner.instance);
+                    long seed = 1L;
+                    DatabaseDescriptor.setAccordJournalDirectory("/journal");
+                    new File("/journal").createDirectoriesIfNotExists();
+
+                    DatabaseDescriptor.setDumpHeapOnUncaughtException(false);
+
+                    Keyspace.setInitialized();
+
+                    CMSTestBase.CMSSut sut = new 
CMSTestBase.CMSSut(AtomicLongBackedProcessor::new,
+                            false,
+                            new FakeSchema(),
+                            new 
TokenPlacementModel.SimpleReplicationFactor(1));
+
+                    State.journal = new Journal<>("AccordJournal",
+                            new File("/journal"),
+                            new AccordSpec.JournalSpec(),
+                            new TestCallbacks(),
+                            new IdentityKeySerializer(),
+                            new IdentityValueSerializer());
+                }),
+                () -> check());
     }
 
-    private static void run()
+    public static void check()
     {
-        for (int i = 0; i < State.events; i++)
+        State.journal.start();
+        try
+        {
+            for (int i = 0; i < 100; i++)
+            {
+                int finalI = i;
+                State.executor.submit(() -> State.journal.asyncWrite("test" + 
finalI, "test" + finalI, Collections.singleton(1), null));
+            }
+
+            State.latch.await();
+
+            for (int i = 0; i < 100; i++)
+            {
+                System.out.println("Reading " + State.journal.readFirst("test" 
+ i));

Review Comment:
   also goes to the right log file, simulator has its own logger configs =)



-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: [email protected]

For queries about this service, please contact Infrastructure at:
[email protected]


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to