Remove JournalSegmentReader.getCurrentIndex()

This method is only ever called by SegmentedJournalReader, inline it
there. This removes one source of the magic 0 index.

JIRA: CONTROLLER-2106
Change-Id: I0fcb16e806d027d22f8e6370788aab21884c9e71
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentReader.java
index 4d63eaf550edffbfd74020517f8d0214020fba46..3665dccc9d4fdc1beb08f2ed970da509982e8616 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentReader.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegmentReader.java
@@ -41,15 +41,6 @@ abstract sealed class JournalSegmentReader<E> permits FileChannelJournalSegmentR
         firstIndex = segment.index();
     }
 
-    /**
-     * Returns the current reader index.
-     *
-     * @return The current reader index.
-     */
-    final long getCurrentIndex() {
-        return currentEntry != null ? currentEntry.index() : 0;
-    }
-
     /**
      * Returns the last read entry.
      *

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java
index e5a9094f3697c47c70532a6faabfb6881af7c579..861eed7f563654f954a63bc7552c36acbef1cc7d 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/SegmentedJournalReader.java
@@ -41,14 +41,14 @@ sealed class SegmentedJournalReader<E> implements JournalReader<E> permits Commi
 
   @Override
   public final long getCurrentIndex() {
-    long currentIndex = currentReader.getCurrentIndex();
-    if (currentIndex != 0) {
-      return currentIndex;
-    }
-    if (previousEntry != null) {
-      return previousEntry.index();
+    final var currentEntry = currentReader.getCurrentEntry();
+    if (currentEntry != null) {
+      final long currentIndex = currentEntry.index();
+      if (currentIndex != 0) {
+        return currentIndex;
+      }
     }
-    return 0;
+    return previousEntry != null ? previousEntry.index() : 0;
   }
 
   @Override