Move JournalWriter.getLastIndex()

[controller.git] / atomix-storage / src / main / java / io / atomix / storage / journal / JournalSegmentWriter.java

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java
index b18371f04424c015ce2a031dafccf7838bbd36c7..70cc790389484850e9e2e3bf0ec7379e583f5dc0 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentWriter.java
@@ -18,6 +18,7 @@ package io.atomix.storage.journal;
 import static io.atomix.storage.journal.SegmentEntry.HEADER_BYTES;
 import static java.util.Objects.requireNonNull;
 
+import io.atomix.storage.journal.StorageException.TooLarge;
 import io.atomix.storage.journal.index.JournalIndex;
 import io.atomix.storage.journal.index.Position;
 import io.netty.buffer.ByteBuf;
@@ -32,17 +33,17 @@ final class JournalSegmentWriter {
 
     private final FileWriter fileWriter;
     final @NonNull JournalSegment segment;
-    private final @NonNull JournalIndex index;
+    private final @NonNull JournalIndex journalIndex;
     final int maxSegmentSize;
     final int maxEntrySize;
 
     private int currentPosition;
 
     JournalSegmentWriter(final FileWriter fileWriter, final JournalSegment segment, final int maxEntrySize,
-            final JournalIndex index) {
+            final JournalIndex journalIndex) {
         this.fileWriter = requireNonNull(fileWriter);
         this.segment = requireNonNull(segment);
-        this.index = requireNonNull(index);
+        this.journalIndex = requireNonNull(journalIndex);
         maxSegmentSize = segment.file().maxSize();
         this.maxEntrySize = maxEntrySize;
         // adjust lastEntry value
@@ -51,31 +52,21 @@ final class JournalSegmentWriter {
 
     JournalSegmentWriter(final JournalSegmentWriter previous, final FileWriter fileWriter) {
         segment = previous.segment;
-        index = previous.index;
+        journalIndex = previous.journalIndex;
         maxSegmentSize = previous.maxSegmentSize;
         maxEntrySize = previous.maxEntrySize;
         currentPosition = previous.currentPosition;
         this.fileWriter = requireNonNull(fileWriter);
     }
 
-    /**
-     * Returns the last written index.
-     *
-     * @return The last written index.
-     */
-    long getLastIndex() {
-        final var last = index.last();
-        return last != null ? last.index() : segment.firstIndex() - 1;
-    }
-
     /**
      * Returns the next index to be written.
      *
      * @return The next index to be written.
      */
-    long getNextIndex() {
-        final var last = index.last();
-        return last != null ? last.index() + 1 : segment.firstIndex();
+    long nextIndex() {
+        final var lastPosition = journalIndex.last();
+        return lastPosition != null ? lastPosition.index() + 1 : segment.firstIndex();
     }
 
     /**
@@ -87,12 +78,11 @@ final class JournalSegmentWriter {
     Position append(final ByteBuf buf) {
         final var length = buf.readableBytes();
         if (length > maxEntrySize) {
-            throw new StorageException.TooLarge("Serialized entry size exceeds maximum allowed bytes ("
-                + maxEntrySize + ")");
+            throw new TooLarge("Serialized entry size exceeds maximum allowed bytes (" + maxEntrySize + ")");
         }
 
         // Store the entry index.
-        final long index = getNextIndex();
+        final long index = nextIndex();
         final int position = currentPosition;
 
         // check space available
@@ -114,7 +104,7 @@ final class JournalSegmentWriter {
 
         // Update the last entry with the correct index/term/length.
         currentPosition = nextPosition;
-        return this.index.index(index, position);
+        return journalIndex.index(index, position);
     }
 
     /**
@@ -147,7 +137,7 @@ final class JournalSegmentWriter {
                 break;
             }
 
-            this.index.index(nextIndex++, currentPosition);
+            journalIndex.index(nextIndex++, currentPosition);
 
             // Update the current position for indexing.
             currentPosition += HEADER_BYTES + buf.readableBytes();
@@ -161,12 +151,12 @@ final class JournalSegmentWriter {
      */
     void truncate(final long index) {
         // If the index is greater than or equal to the last index, skip the truncate.
-        if (index >= getLastIndex()) {
+        if (index >= segment.lastIndex()) {
             return;
         }
 
         // Truncate the index.
-        this.index.truncate(index);
+        journalIndex.truncate(index);
 
         if (index < segment.firstIndex()) {
             // Reset the writer to the first entry.