Fix single node with error response when batch append (#75)

openmessaging · Nov 8, 2020 · 4eb9b64 · 4eb9b64
1 parent 9a3e83d
commit 4eb9b64
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/io/openmessaging/storage/dledger/BatchAppendFuture.java b/src/main/java/io/openmessaging/storage/dledger/BatchAppendFuture.java
@@ -19,6 +19,10 @@
 public class BatchAppendFuture<T> extends AppendFuture<T> {
     private long[] positions;
 
+    public BatchAppendFuture() {
+
+    }
+
     public BatchAppendFuture(long timeOutMs) {
         super(timeOutMs);
     }
@@ -30,4 +34,11 @@ public long[] getPositions() {
     public void setPositions(long[] positions) {
         this.positions = positions;
     }
+
+    public static <T> BatchAppendFuture<T> newCompletedFuture(long pos, T value) {
+        BatchAppendFuture<T> future = new BatchAppendFuture<T>();
+        future.setPos(pos);
+        future.complete(value);
+        return future;
+    }
 }
diff --git a/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java b/src/main/java/io/openmessaging/storage/dledger/DLedgerEntryPusher.java
@@ -149,6 +149,9 @@ public CompletableFuture<AppendEntryResponse> waitAck(DLedgerEntry entry, boolea
             response.setIndex(entry.getIndex());
             response.setTerm(entry.getTerm());
             response.setPos(entry.getPos());
+            if (isBatchWait) {
+                return BatchAppendFuture.newCompletedFuture(entry.getPos(), response);
+            }
             return AppendFuture.newCompletedFuture(entry.getPos(), response);
         } else {
             checkTermForPendingMap(entry.getTerm(), "waitAck");