Feedback

Author: ifesdjeen

src/java/org/apache/cassandra/db/ColumnFamilyStore.java

@@ -3253,7 +3253,7 @@ void onTableDropped()
 
         data.notifyDropped(DatabaseDescriptor.getAutoSnapshotTtl());
 
-        // TODO (required): mutation tracking
+        // TODO (required): mutation tracking + table dropping
         if (metadata().replicationType().isTracked())
             throw new IllegalStateException("not implemented");
         else

src/java/org/apache/cassandra/journal/ActiveSegment.java

@@ -142,7 +142,7 @@ StaticSegment<K, V> asStatic()
     @Override
     public void persistMetadata()
     {
-        throw new UnsupportedOperationException("Can not mutate active segment's metadata. It should be done on flush.");
+        throw new UnsupportedOperationException("Can not mutate active segment's metadata.");
     }
 
     /**

src/java/org/apache/cassandra/journal/Journal.java

@@ -923,6 +923,7 @@ protected void closeActiveSegmentAndOpenAsStatic(ActiveSegment<K, V> activeSegme
     {
         closeActiveSegmentAndOpenAsStatic(activeSegment, null);
     }
+
     protected void closeActiveSegmentAndOpenAsStatic(ActiveSegment<K, V> activeSegment, @Nullable Runnable onDone)
     {
         if (activeSegment.isEmpty())

src/java/org/apache/cassandra/journal/Metadata.java

@@ -22,7 +22,6 @@
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 import java.util.zip.CRC32;
 
-import accord.utils.Invariants;
 import org.apache.cassandra.io.util.*;
 import org.apache.cassandra.utils.Crc;
 
@@ -38,20 +37,21 @@ public final class Metadata
 {
     private int fsyncLimit;
     // Indicates whether a segment needs to be replayed or no.
-    private volatile boolean needsReplay = true;
+    private volatile boolean needsReplay;
     private volatile int recordsCount;
     private static final AtomicIntegerFieldUpdater<Metadata> recordsCountUpdater =
         AtomicIntegerFieldUpdater.newUpdater(Metadata.class, "recordsCount");
 
     static Metadata empty()
     {
-        return new Metadata(0, 0);
+        return new Metadata(0, 0,  true);
     }
 
-    private Metadata(int recordsCount, int fsyncLimit)
+    private Metadata(int recordsCount, int fsyncLimit, boolean needsReplay)
     {
         this.recordsCount = recordsCount;
         this.fsyncLimit = fsyncLimit;
+        this.needsReplay = needsReplay;
     }
 
     void update()
@@ -64,10 +64,9 @@ void fsyncLimit(int fsyncLimit)
         this.fsyncLimit = fsyncLimit;
     }
 
-    public void needsReplay(boolean needsReplay)
+    public void clearNeedsReplay()
     {
-        Invariants.require(this.needsReplay && !needsReplay, "needsReplay can only go from true to false. Old value: %s, new value: %s", this.needsReplay, needsReplay);
-        this.needsReplay = needsReplay;
+        this.needsReplay = false;
     }
 
     int fsyncLimit()
@@ -112,7 +111,7 @@ static Metadata read(DataInputPlus in) throws IOException
         updateChecksumInt(crc, fsyncLimit);
         updateChecksumInt(crc, needsReplay ? 1 : 0);
         validateCRC(crc, in.readInt());
-        return new Metadata(recordsCount, fsyncLimit);
+        return new Metadata(recordsCount, fsyncLimit, needsReplay);
     }
 
     void persist(Descriptor descriptor)
@@ -162,7 +161,7 @@ static <K> Metadata rebuild(Descriptor descriptor, KeySupport<K> keySupport)
                 throw e;
         }
 
-        return new Metadata(recordsCount, fsyncLimit);
+        return new Metadata(recordsCount, fsyncLimit, true);
     }
 
     static <K> Metadata rebuildAndPersist(Descriptor descriptor, KeySupport<K> keySupport)

src/java/org/apache/cassandra/journal/Segments.java

@@ -136,20 +136,6 @@ void select(long minTimestamp, long maxTimestamp, Collection<Segment<K, V>> into
                 into.add(segment);
     }
 
-    Segment<K, V>[] select(long[] segmentIds)
-    {
-        @SuppressWarnings({ "unchecked" })
-        Segment<K, V>[] segments = new Segment[segmentIds.length];
-        for (int i = 0; i < segmentIds.length; i++)
-            segments[i] = Invariants.nonNull(this.segments.get(segmentIds[i]));
-        return segments;
-    }
-
-    Segment<K, V> select(long segmentId)
-    {
-        return Invariants.nonNull(this.segments.get(segmentId));
-    }
-
     boolean isSwitched(ActiveSegment<K, V> active)
     {
         for (Segment<K, V> segment : segments.values())