Factor out FileWriter interface

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

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 45405aae686f908642c9c3a7309bd113db992686..02921bed2b0550e2733706251ffe473228d66623 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
@@ -48,11 +48,11 @@ final class JournalSegment implements AutoCloseable {
   private boolean open = true;
 
   JournalSegment(
-      JournalSegmentFile file,
-      JournalSegmentDescriptor descriptor,
-      StorageLevel storageLevel,
-      int maxEntrySize,
-      double indexDensity) {
+      final JournalSegmentFile file,
+      final JournalSegmentDescriptor descriptor,
+      final StorageLevel storageLevel,
+      final int maxEntrySize,
+      final double indexDensity) {
     this.file = file;
     this.descriptor = descriptor;
     this.storageLevel = storageLevel;
@@ -64,10 +64,14 @@ final class JournalSegment implements AutoCloseable {
     } catch (IOException e) {
       throw new StorageException(e);
     }
-    writer = switch (storageLevel) {
-        case DISK -> new DiskJournalSegmentWriter(channel, this, maxEntrySize, journalIndex);
-        case MAPPED -> new MappedJournalSegmentWriter(channel, this, maxEntrySize, journalIndex).toFileChannel();
+
+    final var fileWriter = switch (storageLevel) {
+        case DISK -> new DiskFileWriter(file.file().toPath(), channel, descriptor.maxSegmentSize(), maxEntrySize);
+        case MAPPED -> new MappedFileWriter(file.file().toPath(), channel, descriptor.maxSegmentSize(), maxEntrySize);
     };
+    writer = new JournalSegmentWriter(fileWriter, this, maxEntrySize, journalIndex)
+        // relinquish mapped memory
+        .toFileChannel();
   }
 
   /**
@@ -125,7 +129,7 @@ final class JournalSegment implements AutoCloseable {
    * @param index the index to lookup
    * @return the position of the given index or a lesser index, or {@code null}
    */
-  @Nullable Position lookup(long index) {
+  @Nullable Position lookup(final long index) {
     return journalIndex.lookup(index);
   }