feat(iterator):Auto commit mode for applying log iterator

sofastack · fengjiachun · Oct 30, 2023 · Apr 9, 2023 · Apr 10, 2023 · Apr 10, 2023
commit 8ed148dce543b0b8a24aa97eb014974013c73c29
diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/Iterator.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/Iterator.java
@@ -32,7 +32,7 @@ public interface Iterator extends java.util.Iterator<ByteBuffer> {
      * Turn automatic submission mode on or off
      * @param status enable autocommit mode or not
      */
-    void setAutoCommit(boolean status);
+    void setAutoCommitPerLog(boolean status);
 
     /**
      * Return the data whose content is the same as what was passed to

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/IteratorImpl.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/IteratorImpl.java
@@ -50,8 +50,7 @@ public class IteratorImpl {
     private LogEntry            currEntry  = new LogEntry(); // blank entry
     private final AtomicLong    applyingIndex;
     private RaftException       error;
-    private boolean             autoCommit = false;         // Default not enabled
-    private boolean             lastCommit = true;          // Previous submission status
+    private boolean             autoCommitPerLog = false;         // Default enabled
 
     public IteratorImpl(final FSMCallerImpl fsmCaller, final LogManager logManager, final List<Closure> closures,
                         final long firstClosureIndex, final long lastAppliedIndex, final long committedIndex,
@@ -93,19 +92,11 @@ public boolean hasError() {
     }
 
     public void setAutoCommit(boolean status) {
-        this.autoCommit = status;
+        this.autoCommitPerLog = status;
     }
 
-    public boolean getAutoCommit() {
-        return this.autoCommit;
-    }
-
-    public void setLastCommitStatus(boolean status) {
-        this.lastCommit = status;
-    }
-
-    public boolean getLastCommitStatus() {
-        return this.lastCommit;
+    public boolean getAutoCommitPerLog() {
+        return this.autoCommitPerLog;
     }
 
     /**

diff --git a/jraft-core/src/main/java/com/alipay/sofa/jraft/core/IteratorWrapper.java b/jraft-core/src/main/java/com/alipay/sofa/jraft/core/IteratorWrapper.java
@@ -35,20 +35,15 @@ public IteratorWrapper(IteratorImpl iterImpl) {
 
     @Override
     public boolean hasNext() {
-        // commit the current log if auto-commit mode is on and not yet committed
-        if (impl.getAutoCommit() && !impl.getLastCommitStatus() && !impl.hasError()) {
-            commit();
-        }
-        boolean hasNext = this.impl.isGood() && this.impl.entry().getType() == EnumOutter.EntryType.ENTRY_TYPE_DATA;
-        // set committed to false for the next log
-        if (hasNext) {
-            impl.setLastCommitStatus(false);
-        }
-        return hasNext;
+        return this.impl.isGood() && this.impl.entry().getType() == EnumOutter.EntryType.ENTRY_TYPE_DATA;
     }
 
     @Override
     public ByteBuffer next() {
+        // commit the current log if auto-commit mode is on and not yet committed
+        if (impl.getAutoCommitPerLog() && !impl.hasError()) {
+            commit();
+        }
         final ByteBuffer data = getData();
         if (hasNext()) {
             this.impl.next();
@@ -57,7 +52,7 @@ public ByteBuffer next() {
     }
 
     @Override
-    public void setAutoCommit(boolean status) {
+    public void setAutoCommitPerLog(boolean status) {
         impl.setAutoCommit(status);
     }
 
@@ -79,11 +74,7 @@ public long getTerm() {
 
     @Override
     public boolean commit() {
-        boolean isSuccess = this.impl.commit();
-        if (isSuccess) {
-            impl.setLastCommitStatus(true);
-        }
-        return isSuccess;
+        return this.impl.commit();
     }
 
     @Override

diff --git a/jraft-core/src/test/java/com/alipay/sofa/jraft/core/IteratorTest.java b/jraft-core/src/test/java/com/alipay/sofa/jraft/core/IteratorTest.java
@@ -185,8 +185,8 @@ public void testSetErrorAndRollback() {
     }
 
     @Test
-    public void testAutoCommit() {
-        iter.setAutoCommit(true);
+    public void testAutoCommitPerLog() {
+        iter.setAutoCommitPerLog(true);
         int i = 1;
         while (iter.hasNext()) {
             assertEquals(i, iter.getIndex());