CNDB-12290 CC5 fix to use TrieMemtable as default in MemtableParams

datastax · Dec 31, 2024 · 816298e · 816298e
1 parent c27bf0a
commit 816298e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/java/org/apache/cassandra/db/memtable/DefaultMemtableFactory.java b/src/java/org/apache/cassandra/db/memtable/DefaultMemtableFactory.java
@@ -20,6 +20,9 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import com.google.common.collect.ImmutableMap;
+
+import org.apache.cassandra.config.InheritingClass;
 import org.apache.cassandra.db.commitlog.CommitLogPosition;
 import org.apache.cassandra.db.partitions.PartitionUpdate;
 import org.apache.cassandra.db.partitions.TriePartitionUpdate;
@@ -73,4 +76,6 @@ public PartitionUpdate.Factory partitionUpdateFactory()
     {
         return TriePartitionUpdate.FACTORY;
     }
+
+    public static InheritingClass CONFIGURATION = new InheritingClass(null, TrieMemtable.class.getName(), ImmutableMap.of());
 }
diff --git a/src/java/org/apache/cassandra/schema/MemtableParams.java b/src/java/org/apache/cassandra/schema/MemtableParams.java
@@ -34,8 +34,8 @@
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.InheritingClass;
 import org.apache.cassandra.config.ParameterizedClass;
+import org.apache.cassandra.db.memtable.DefaultMemtableFactory;
 import org.apache.cassandra.db.memtable.Memtable;
-import org.apache.cassandra.db.memtable.SkipListMemtableFactory;
 import org.apache.cassandra.exceptions.ConfigurationException;
 
 /**
@@ -95,8 +95,8 @@ public int hashCode()
     }
 
     private static final String DEFAULT_CONFIGURATION_KEY = "default";
-    private static final Memtable.Factory DEFAULT_MEMTABLE_FACTORY = SkipListMemtableFactory.INSTANCE;
-    private static final ParameterizedClass DEFAULT_CONFIGURATION = SkipListMemtableFactory.CONFIGURATION;
+    private static final Memtable.Factory DEFAULT_MEMTABLE_FACTORY = new DefaultMemtableFactory();
+    private static final ParameterizedClass DEFAULT_CONFIGURATION = DefaultMemtableFactory.CONFIGURATION;
     private static final Map<String, ParameterizedClass>
         CONFIGURATION_DEFINITIONS = expandDefinitions(DatabaseDescriptor.getMemtableConfigurations());
     private static final Map<String, MemtableParams> CONFIGURATIONS = new HashMap<>();