Name it segmented raft log.

neo4j · May 9, 2016 · 389d0a0 · 389d0a0
1 parent 534e573
commit 389d0a0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 26 deletions.
diff --git a/...g/segmented/SegmentedPhysicalRaftLog.java → .../raft/log/segmented/SegmentedRaftLog.java b/...g/segmented/SegmentedPhysicalRaftLog.java → .../raft/log/segmented/SegmentedRaftLog.java
@@ -35,15 +35,13 @@
 import org.neo4j.cursor.IOCursor;
 import org.neo4j.helpers.collection.LruCache;
 import org.neo4j.io.fs.FileSystemAbstraction;
-import org.neo4j.kernel.impl.transaction.log.PhysicalLogFile;
 import org.neo4j.kernel.lifecycle.LifecycleAdapter;
 import org.neo4j.logging.Log;
 import org.neo4j.logging.LogProvider;
 
 /**
- * The physical RAFT log is an append only log supporting the operations required to support
+ * The segmented RAFT log is an append only log supporting the operations required to support
- * the RAFT consensus algorithm. The physical part relates to the fact that the implementation
+ * the RAFT consensus algorithm.
- * borrows from infrastructure around the already existing {@link PhysicalLogFile} and related.
  *
  * A RAFT log must be able to append new entries, but also truncate not yet committed entries,
  * prune out old compacted entries and skip to a later starting point.
@@ -58,7 +56,7 @@
  * by switching to the next segment file, called the next version. A new segment file is also started
  * when the threshold for a particular file has been reached.
  */
-public class SegmentedPhysicalRaftLog extends LifecycleAdapter implements RaftLog
+public class SegmentedRaftLog extends LifecycleAdapter implements RaftLog
 {
     private final Log log;
 
@@ -76,7 +74,7 @@ public class SegmentedPhysicalRaftLog extends LifecycleAdapter implements RaftLo
 
     private State state;
 
-    public SegmentedPhysicalRaftLog(
+    public SegmentedRaftLog(
             FileSystemAbstraction fileSystem,
             File directory,
             long rotateAtSize,

diff --git a/...e/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java b/...e/core-edge/src/main/java/org/neo4j/coreedge/server/core/EnterpriseCoreEditionModule.java
@@ -54,7 +54,7 @@
 import org.neo4j.coreedge.raft.log.physical.PhysicalRaftLog;
 import org.neo4j.coreedge.raft.log.RaftLog;
 import org.neo4j.coreedge.raft.log.RaftLogMetadataCache;
-import org.neo4j.coreedge.raft.log.segmented.SegmentedPhysicalRaftLog;
+import org.neo4j.coreedge.raft.log.segmented.SegmentedRaftLog;
 import org.neo4j.coreedge.raft.log.physical.PhysicalRaftLogFile;
 import org.neo4j.coreedge.raft.membership.CoreMemberSetBuilder;
 import org.neo4j.coreedge.raft.membership.MembershipWaiter;
@@ -527,7 +527,7 @@ private RaftLog createRaftLog(
                 long rotateAtSize = config.get( CoreEdgeClusterSettings.raft_log_rotation_size );
                 int metaDataCacheSize = config.get( CoreEdgeClusterSettings.raft_log_meta_data_cache_size );
 
-                return life.add( new SegmentedPhysicalRaftLog(
+                return life.add( new SegmentedRaftLog(
                         fileSystem,
                         new File( clusterStateDirectory, PhysicalRaftLog.DIRECTORY_NAME ),
                         rotateAtSize,

diff --git a/...st/java/org/neo4j/coreedge/raft/log/segmented/SegmentedPhysicalRaftLogVerificationIT.java b/...st/java/org/neo4j/coreedge/raft/log/segmented/SegmentedPhysicalRaftLogVerificationIT.java
@@ -24,7 +24,6 @@
 import org.neo4j.coreedge.raft.log.DummyRaftableContentSerializer;
 import org.neo4j.coreedge.raft.log.RaftLog;
 import org.neo4j.coreedge.raft.log.RaftLogVerificationIT;
-import org.neo4j.coreedge.raft.log.segmented.SegmentedPhysicalRaftLog;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.logging.NullLogProvider;
 
@@ -41,7 +40,7 @@ protected RaftLog createRaftLog() throws Throwable
         long rotateAtSizeBytes = 128;
         int entryCacheSize = 4;
 
-        SegmentedPhysicalRaftLog newRaftLog = new SegmentedPhysicalRaftLog( fsa, directory, rotateAtSizeBytes,
+        SegmentedRaftLog newRaftLog = new SegmentedRaftLog( fsa, directory, rotateAtSizeBytes,
                 new DummyRaftableContentSerializer(), NullLogProvider.getInstance(), entryCacheSize );
 
         newRaftLog.init();

diff --git a/...SegmentedPhysicalRaftLogContractTest.java → ...gmented/SegmentedRaftLogContractTest.java b/...SegmentedPhysicalRaftLogContractTest.java → ...gmented/SegmentedRaftLogContractTest.java
@@ -30,7 +30,6 @@
 import org.neo4j.coreedge.raft.log.RaftLog;
 import org.neo4j.coreedge.raft.log.RaftLogContractTest;
 import org.neo4j.coreedge.raft.log.RaftLogEntry;
-import org.neo4j.coreedge.raft.log.segmented.SegmentedPhysicalRaftLog;
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.lifecycle.LifeSupport;
@@ -41,9 +40,9 @@
 import static org.neo4j.coreedge.raft.log.RaftLogHelper.readLogEntry;
 
 // TODO: Separate into small-cache and no-cache tests. Perhaps parameterize this one (0, 5, 1024) cache sizes.
-public class SegmentedPhysicalRaftLogContractTest extends RaftLogContractTest
+public class SegmentedRaftLogContractTest extends RaftLogContractTest
 {
-    private SegmentedPhysicalRaftLog raftLog;
+    private SegmentedRaftLog raftLog;
     private LifeSupport life = new LifeSupport();
     private FileSystemAbstraction fileSystem;
 
@@ -61,7 +60,7 @@ public void tearDown() throws Throwable
         life.shutdown();
     }
 
-    private SegmentedPhysicalRaftLog createRaftLog( int cacheSize )
+    private SegmentedRaftLog createRaftLog( int cacheSize )
     {
         if ( fileSystem == null )
         {
@@ -70,7 +69,7 @@ private SegmentedPhysicalRaftLog createRaftLog( int cacheSize )
         File directory = new File( "raft-log" );
         fileSystem.mkdir( directory );
 
-        SegmentedPhysicalRaftLog newRaftLog = new SegmentedPhysicalRaftLog( fileSystem, directory, 10 * 1024,
+        SegmentedRaftLog newRaftLog = new SegmentedRaftLog( fileSystem, directory, 10 * 1024,
                 new DummyRaftableContentSerializer(),
                 NullLogProvider.getInstance(), cacheSize );
         life.add( newRaftLog );
@@ -83,7 +82,7 @@ private SegmentedPhysicalRaftLog createRaftLog( int cacheSize )
     public void shouldReadBackInCachedEntry() throws Throwable
     {
         // Given
-        SegmentedPhysicalRaftLog raftLog = (SegmentedPhysicalRaftLog) createRaftLog();
+        SegmentedRaftLog raftLog = (SegmentedRaftLog) createRaftLog();
         int term = 0;
         ReplicatedInteger content = ReplicatedInteger.valueOf( 4 );
 
@@ -101,7 +100,7 @@ public void shouldReadBackNonCachedEntry() throws Exception
     {
         // Given
         int cacheSize = 1;
-        SegmentedPhysicalRaftLog raftLog = createRaftLog( cacheSize );
+        SegmentedRaftLog raftLog = createRaftLog( cacheSize );
         int term = 0;
         ReplicatedInteger content1 = ReplicatedInteger.valueOf( 4 );
         ReplicatedInteger content2 = ReplicatedInteger.valueOf( 5 );
@@ -124,7 +123,7 @@ public void shouldReadBackNonCachedEntry() throws Exception
     public void shouldRestoreCommitIndexOnStartup() throws Throwable
     {
         // Given
-        SegmentedPhysicalRaftLog raftLog = createRaftLog( 100 /* cache size */  );
+        SegmentedRaftLog raftLog = createRaftLog( 100 /* cache size */  );
         int term = 0;
         ReplicatedInteger content1 = ReplicatedInteger.valueOf( 4 );
         ReplicatedInteger content2 = ReplicatedInteger.valueOf( 5 );
@@ -144,7 +143,7 @@ public void shouldRestoreCommitIndexOnStartup() throws Throwable
     public void shouldRestoreCorrectCommitAndAppendIndexOnStartupAfterTruncation() throws Exception
     {
         // Given
-        SegmentedPhysicalRaftLog raftLog = createRaftLog( 100 /* cache size */  );
+        SegmentedRaftLog raftLog = createRaftLog( 100 /* cache size */  );
         int term = 0;
         ReplicatedInteger content = ReplicatedInteger.valueOf( 4 );
         raftLog.append( new RaftLogEntry( term, content ) );
@@ -167,7 +166,7 @@ public void shouldRestoreCorrectCommitAndAppendIndexOnStartupAfterTruncation() t
     public void shouldRestoreCorrectCommitAndAppendIndexWithTruncationRecordsAndAppendedRecordsAfterThat() throws Exception
     {
         // Given
-        SegmentedPhysicalRaftLog raftLog = createRaftLog( 100 /* cache size */  );
+        SegmentedRaftLog raftLog = createRaftLog( 100 /* cache size */  );
         int term = 0;
         ReplicatedInteger content = ReplicatedInteger.valueOf( 4 );
         raftLog.append( new RaftLogEntry( term, content ) );

diff --git a/...SegmentedPhysicalRaftLogRotationTest.java → ...gmented/SegmentedRaftLogRotationTest.java b/...SegmentedPhysicalRaftLogRotationTest.java → ...gmented/SegmentedRaftLogRotationTest.java
@@ -31,13 +31,12 @@
 import org.neo4j.coreedge.raft.ReplicatedString;
 import org.neo4j.coreedge.raft.log.DummyRaftableContentSerializer;
 import org.neo4j.coreedge.raft.log.RaftLogEntry;
-import org.neo4j.coreedge.raft.log.segmented.SegmentedPhysicalRaftLog;
 import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.lifecycle.LifeSupport;
 import org.neo4j.logging.NullLogProvider;
 
-public class SegmentedPhysicalRaftLogRotationTest
+public class SegmentedRaftLogRotationTest
 {
     private LifeSupport life = new LifeSupport();
     private FileSystemAbstraction fileSystem;
@@ -49,7 +48,7 @@ public void tearDown() throws Throwable
         life.shutdown();
     }
 
-    private SegmentedPhysicalRaftLog createRaftLog( long rotateAtSize )
+    private SegmentedRaftLog createRaftLog( long rotateAtSize )
     {
         if ( fileSystem == null )
         {
@@ -58,7 +57,7 @@ private SegmentedPhysicalRaftLog createRaftLog( long rotateAtSize )
         File directory = new File( "raft-log" );
         fileSystem.mkdir( directory );
 
-        SegmentedPhysicalRaftLog newRaftLog = new SegmentedPhysicalRaftLog( fileSystem, directory, rotateAtSize,
+        SegmentedRaftLog newRaftLog = new SegmentedRaftLog( fileSystem, directory, rotateAtSize,
                 new DummyRaftableContentSerializer(),
                 NullLogProvider.getInstance(), 1000 );
         life.add( newRaftLog );
@@ -73,7 +72,7 @@ public void shouldRotateOnAppendWhenRotateSizeIsReached() throws Exception
         // Given
         AtomicLong currentVersion = new AtomicLong();
         int rotateAtSize = 100;
-        SegmentedPhysicalRaftLog log = createRaftLog( rotateAtSize );
+        SegmentedRaftLog log = createRaftLog( rotateAtSize );
 
         StringBuilder builder = new StringBuilder();
         for ( int i = 0; i < rotateAtSize; i++ )
@@ -93,7 +92,7 @@ public void shouldRotateOnAppendWhenRotateSizeIsReached() throws Exception
     public void shouldBeAbleToRecoverToLatestStateAfterRotation() throws Throwable
     {
         int rotateAtSize = 100;
-        SegmentedPhysicalRaftLog log = createRaftLog( rotateAtSize );
+        SegmentedRaftLog log = createRaftLog( rotateAtSize );
 
         StringBuilder builder = new StringBuilder();
         for ( int i = 0; i < rotateAtSize - 40; i++ )