From 3afa2585d9b7c88dc7d83c929df6f70c988d27a7 Mon Sep 17 00:00:00 2001
From: David Capwell <dcapwell@apache.org>
Date: Wed, 14 Aug 2024 11:55:19 -0700
Subject: [PATCH] Memtable allocation type unslabbed_heap_buffers_logged will
 cause an assertion error for TrieMemtables and SegmentedTrieMemtables

patch by David Capwell; reviewed by Brandon Williams, Caleb Rackliffe for CASSANDRA-19835
---
 CHANGES.txt                                   |  1 +
 .../org/apache/cassandra/config/Config.java   |  1 +
 .../apache/cassandra/config/ConfigTest.java   | 42 +++++++++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 test/unit/org/apache/cassandra/config/ConfigTest.java

diff --git a/CHANGES.txt b/CHANGES.txt
index 7f14a4b10b..7e061bda27 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
 5.0-rc2
  * Fix direct IO support always being evaluated to false upon the first start of a node (CASSANDRA-19779)
+ * Memtable allocation type unslabbed_heap_buffers_logged will cause an assertion error for TrieMemtables and SegmentedTrieMemtables (CASSANDRA-19835)
 
 
 5.0-rc1
diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java
index 3e8c4fae77..94755d7b73 100644
--- a/src/java/org/apache/cassandra/config/Config.java
+++ b/src/java/org/apache/cassandra/config/Config.java
@@ -1185,6 +1185,7 @@ public class Config
             switch (this)
             {
                 case unslabbed_heap_buffers:
+                case unslabbed_heap_buffers_logged:
                 case heap_buffers:
                     return BufferType.ON_HEAP;
                 case offheap_buffers:
diff --git a/test/unit/org/apache/cassandra/config/ConfigTest.java b/test/unit/org/apache/cassandra/config/ConfigTest.java
new file mode 100644
index 0000000000..d52cb9dcaa
--- /dev/null
+++ b/test/unit/org/apache/cassandra/config/ConfigTest.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.cassandra.config;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import org.apache.cassandra.config.Config.MemtableAllocationType;
+import org.apache.cassandra.io.compress.BufferType;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ConfigTest
+{
+    @Test
+    public void memtableAllocationTypeBuffer()
+    {
+        for (MemtableAllocationType type : MemtableAllocationType.values())
+        {
+            BufferType bufferType = type.toBufferType();
+            if (type.name().contains("offheap"))            assertThat(bufferType).isEqualTo(BufferType.OFF_HEAP);
+            else if (type.name().contains("heap_buffers"))  assertThat(bufferType).isEqualTo(BufferType.ON_HEAP);
+            else                                            Assert.fail("Unexpected type: " + type);
+        }
+    }
+}
\ No newline at end of file