Change FileChannel prefix to Disk

We use FileChannelJournalSegment{Reader,Writer} for StorageLevel.DISK,
and Mapped* for StorageLevel.MAPPED.

Fix this by a quick rename to DiskJournaSegment{Reader,Writer},
improving internal consistency and shortening class names.

Change-Id: Ia6d7311ed93527ff77cde3f7b57bb34689f962cd
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java b/atomix-storage/src/main/java/io/atomix/storage/journal/DiskJournalSegmentReader.java
similarity index 96%
rename from atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java
rename to atomix-storage/src/main/java/io/atomix/storage/journal/DiskJournalSegmentReader.java
index 613594eb8360b68c11dd578d57afa5ca2ef58b5b..771c0a89d3975666ac7c9726144fb8c3d01be6cf 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/DiskJournalSegmentReader.java
@@ -28,12 +28,12 @@ import java.util.zip.CRC32;
  *
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
-final class FileChannelJournalSegmentReader<E> extends JournalSegmentReader<E> {
+final class DiskJournalSegmentReader<E> extends JournalSegmentReader<E> {
   private final FileChannel channel;
   private final ByteBuffer memory;
   private long currentPosition;
 
-  FileChannelJournalSegmentReader(
+  DiskJournalSegmentReader(
       FileChannel channel,
       JournalSegment<E> segment,
       int maxEntrySize,

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/DiskJournalSegmentWriter.java
similarity index 96%
rename from atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java
rename to atomix-storage/src/main/java/io/atomix/storage/journal/DiskJournalSegmentWriter.java
index f4c7ec52c3c53f7d739eff7fa30da1945010f8d1..3f6371781a4061caf2b0fcb7b43d21e26036aaff 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentWriter.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/DiskJournalSegmentWriter.java
@@ -42,14 +42,14 @@ import java.util.zip.CRC32;
  *
  * @author <a href="http://github.com/kuujo">Jordan Halterman</a>
  */
-final class FileChannelJournalSegmentWriter<E> extends JournalSegmentWriter<E> {
+final class DiskJournalSegmentWriter<E> extends JournalSegmentWriter<E> {
   private static final ByteBuffer ZERO_ENTRY_HEADER = ByteBuffer.wrap(new byte[ENTRY_HEADER_BYTES]);
 
   private final ByteBuffer memory;
   private Indexed<E> lastEntry;
   private long currentPosition;
 
-  FileChannelJournalSegmentWriter(
+  DiskJournalSegmentWriter(
       FileChannel channel,
       JournalSegment<E> segment,
       int maxEntrySize,
@@ -60,7 +60,7 @@ final class FileChannelJournalSegmentWriter<E> extends JournalSegmentWriter<E> {
     reset(0);
   }
 
-  FileChannelJournalSegmentWriter(JournalSegmentWriter<E> previous, int position) {
+  DiskJournalSegmentWriter(JournalSegmentWriter<E> previous, int position) {
     super(previous);
     memory = allocMemory(maxEntrySize);
     lastEntry = previous.getLastEntry();
@@ -84,7 +84,7 @@ final class FileChannelJournalSegmentWriter<E> extends JournalSegmentWriter<E> {
   }
 
   @Override
-  FileChannelJournalSegmentWriter<E> toFileChannel() {
+  DiskJournalSegmentWriter<E> toFileChannel() {
     return this;
   }
 

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java
index a8bced5da9cbb6e1ea851ac2668e48336fba6a2d..3d5ab7ade9883d07712be09c978cc2db40839168 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/JournalSegment.java
@@ -66,7 +66,7 @@ final class JournalSegment<E> implements AutoCloseable {
       throw new StorageException(e);
     }
     writer = switch (storageLevel) {
-        case DISK -> new FileChannelJournalSegmentWriter<>(channel, this, maxEntrySize, index, namespace);
+        case DISK -> new DiskJournalSegmentWriter<>(channel, this, maxEntrySize, index, namespace);
         case MAPPED -> new MappedJournalSegmentWriter<>(channel, this, maxEntrySize, index, namespace).toFileChannel();
     };
   }
@@ -173,7 +173,7 @@ final class JournalSegment<E> implements AutoCloseable {
 
     final var buffer = writer.buffer();
     final var reader = buffer == null
-      ? new FileChannelJournalSegmentReader<>(channel, this, maxEntrySize, index, namespace)
+      ? new DiskJournalSegmentReader<>(channel, this, maxEntrySize, index, namespace)
         : new MappedJournalSegmentReader<>(buffer, this, maxEntrySize, index, namespace);
     readers.add(reader);
     return reader;

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 3665dccc9d4fdc1beb08f2ed970da509982e8616..c9f8c1b05d5624128e7202375f501a464d75b5d7 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
@@ -22,7 +22,7 @@ import io.atomix.storage.journal.index.Position;
 import java.util.NoSuchElementException;
 import org.eclipse.jdt.annotation.Nullable;
 
-abstract sealed class JournalSegmentReader<E> permits FileChannelJournalSegmentReader, MappedJournalSegmentReader {
+abstract sealed class JournalSegmentReader<E> permits DiskJournalSegmentReader, MappedJournalSegmentReader {
     final int maxEntrySize;
     private final JournalIndex index;
     final JournalSerdes namespace;

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 309ce39be96c251b2b4acf858063918238398c2c..ddc70fca0e9405589760e0dc700f63efca49b1e9 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
@@ -23,7 +23,7 @@ import java.nio.channels.FileChannel;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 
-abstract sealed class JournalSegmentWriter<E> permits FileChannelJournalSegmentWriter, MappedJournalSegmentWriter {
+abstract sealed class JournalSegmentWriter<E> permits DiskJournalSegmentWriter, MappedJournalSegmentWriter {
     /**
      * The size of the header, comprising of:
      * <ul>
@@ -128,5 +128,5 @@ abstract sealed class JournalSegmentWriter<E> permits FileChannelJournalSegmentW
 
     abstract @NonNull MappedJournalSegmentWriter<E> toMapped();
 
-    abstract @NonNull FileChannelJournalSegmentWriter<E> toFileChannel();
+    abstract @NonNull DiskJournalSegmentWriter<E> toFileChannel();
 }

diff --git a/atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java b/atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java
index d30440e6d66e9314a2c01c2dc03382fa53d9495d..5749f24228d467893110abff7df3128e38e8f2c2 100644 (file)
--- a/atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java
+++ b/atomix-storage/src/main/java/io/atomix/storage/journal/MappedJournalSegmentWriter.java
@@ -87,10 +87,10 @@ final class MappedJournalSegmentWriter<E> extends JournalSegmentWriter<E> {
   }
 
   @Override
-  FileChannelJournalSegmentWriter<E> toFileChannel() {
+  DiskJournalSegmentWriter<E> toFileChannel() {
     final int position = buffer.position();
     close();
-    return new FileChannelJournalSegmentWriter<>(this, position);
+    return new DiskJournalSegmentWriter<>(this, position);
   }
 
   @Override