comment

palantir · Oct 31, 2024 · a6d9082 · a6d9082
1 parent f823fcd
commit a6d9082
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/src/java/com/palantir/cassandra/db/ColumnFamilyStoreManager.java b/src/java/com/palantir/cassandra/db/ColumnFamilyStoreManager.java
@@ -18,18 +18,13 @@
 
 package com.palantir.cassandra.db;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.CopyOnWriteArrayList;
 
 import com.palantir.cassandra.db.compaction.IColumnFamilyStoreWriteAheadLogger;
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.io.sstable.Descriptor;
-import org.apache.cassandra.utils.Pair;
 
 
 public class ColumnFamilyStoreManager implements IColumnFamilyStoreValidator, IColumnFamilyStoreWriteAheadLogger
@@ -68,8 +63,8 @@ public Map<Descriptor, Set<Integer>> filterValidAncestors(CFMetaData cfMetaData,
     }
 
     @Override
-    public boolean shouldRemoveUnusedSstables() {
-        return validator.shouldRemoveUnusedSstables();
+    public boolean shouldRemoveUnusedSstablesBasedOnAncestorMetadata() {
+        return validator.shouldRemoveUnusedSstablesBasedOnAncestorMetadata();
     }
 
     @Override

diff --git a/src/java/com/palantir/cassandra/db/IColumnFamilyStoreValidator.java b/src/java/com/palantir/cassandra/db/IColumnFamilyStoreValidator.java
@@ -39,7 +39,7 @@ Map<Descriptor, Set<Integer>> filterValidAncestors(CFMetaData cfMetaData,
      * {@link org.apache.cassandra.db.ColumnFamilyStore#removeUnusedSstables(CFMetaData, Map)}, false otherwise
      * (e.g. if a different cleanup system is being used outside of {@link org.apache.cassandra.service.CassandraDaemon}).
      */
-    default boolean shouldRemoveUnusedSstables() {
+    default boolean shouldRemoveUnusedSstablesBasedOnAncestorMetadata() {
         return true;
     }
 

diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -25,7 +25,6 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
-import java.util.stream.Collectors;
 
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;

diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -270,7 +270,7 @@ private void completeSetupMayThrowSstableException() {
 
             for (CFMetaData cfm : Schema.instance.getKeyspaceMetaData(keyspaceName).values())
             {
-                if (ColumnFamilyStoreManager.instance.shouldRemoveUnusedSstables()) {
+                if (ColumnFamilyStoreManager.instance.shouldRemoveUnusedSstablesBasedOnAncestorMetadata()) {
                     ColumnFamilyStore.removeUnusedSstables(cfm, unfinishedCompactions.getOrDefault(cfm.ksAndCFName, ImmutableMap.of()));
                 }
                 ColumnFamilyStore.scrubDataDirectories(cfm);