CC5 fix CQLSSTableWriterTest

CQLSSTableWriterDaemonTest SAI tests only work with Murmur3Partitioner, but other tests only work with the default ByteOrderedPartitioner;
Use JUnit assumeTrue along with new CQLSSTableWriterDaemonMurmur3Test class to cover variations: clientInitialization, daemonInitialization with (default) ByteOrderedPartitioner, and daemonInitialization with Murmur3Partitioner.

Author: djatnieks

test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterDaemonMurmur3Test.java

@@ -0,0 +1,46 @@
+/*
+ * 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.io.sstable;
+
+
+import org.junit.BeforeClass;
+
+import org.apache.cassandra.SchemaLoader;
+import org.apache.cassandra.config.Config;
+import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.db.commitlog.CommitLog;
+import org.apache.cassandra.dht.Murmur3Partitioner;
+import org.apache.cassandra.service.StorageService;
+
+public class CQLSSTableWriterDaemonMurmur3Test extends CQLSSTableWriterTest
+{
+    @BeforeClass
+    public static void setup() throws Exception
+    {
+        DatabaseDescriptor.daemonInitialization(() -> {
+            Config config = DatabaseDescriptor.loadConfig();
+            config.partitioner = Murmur3Partitioner.class.getName();
+            return config;
+        });
+        CommitLog.instance.start();
+        SchemaLoader.cleanupAndLeaveDirs();
+        Keyspace.setInitialized();
+        StorageService.instance.initServer();
+    }
+}

test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java

@@ -38,6 +38,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Rule;
@@ -569,6 +570,10 @@ public void testConcurrentWriters() throws Exception
     @SuppressWarnings("unchecked")
     public void testWritesWithUdts() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization with Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || !(DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner));
+
         final String schema = "CREATE TABLE " + qualifiedTable + " ("
                               + "  k int,"
                               + "  v1 list<frozen<tuple2>>,"
@@ -639,6 +644,10 @@ public void testWritesWithUdts() throws Exception
     @SuppressWarnings("unchecked")
     public void testWritesWithDependentUdts() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization with Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || !(DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner));
+
         final String schema = "CREATE TABLE " + qualifiedTable + " ("
                               + "  k int,"
                               + "  v1 frozen<nested_tuple>,"
@@ -699,6 +708,10 @@ public void testWritesWithDependentUdts() throws Exception
     @Test
     public void testUnsetValues() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization with Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || !(DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner));
+
         final String schema = "CREATE TABLE " + qualifiedTable + " ("
                               + "  k int,"
                               + "  c1 int,"
@@ -1238,6 +1251,10 @@ public void testWriteWithTimestampsAndTtl() throws Exception
     @Test
     public void testWriteWithSorted() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization with Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || !(DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner));
+
         String schema = "CREATE TABLE " + qualifiedTable + " ("
                         + "  k int PRIMARY KEY,"
                         + "  v blob )";
@@ -1269,6 +1286,10 @@ public void testWriteWithSorted() throws Exception
     @Test
     public void testWriteWithSortedAndMaxSize() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization with Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || !(DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner));
+
         String schema = "CREATE TABLE " + qualifiedTable + " ("
                         + "  k int PRIMARY KEY,"
                         + "  v blob )";
@@ -1359,6 +1380,9 @@ private void testWriters(String table1, String table2) throws IOException, Inval
     @Test
     public void testWriteWithSAI() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization without Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner);
         writeWithSaiInternal();
         writeWithSaiInternal();
     }
@@ -1410,6 +1434,10 @@ private void writeWithSaiInternal() throws Exception
     @Test
     public void testSkipBuildingIndexesWithSAI() throws Exception
     {
+        Assume.assumeTrue("Skip test when using DaemonInitialization without Murmur3Partitioner",
+                          !DatabaseDescriptor.isDaemonInitialized()
+                          || DatabaseDescriptor.getPartitioner() instanceof Murmur3Partitioner);
+
         String schema = "CREATE TABLE " + qualifiedTable + " ("
                         + "  k int PRIMARY KEY,"
                         + "  v1 text,"