Flaky org.apache.cassandra.cql3.KeywordTest

patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-17615

test/unit/org/apache/cassandra/cql3/KeywordTest.java → test/unit/org/apache/cassandra/cql3/KeywordTestBase.java

@@ -20,32 +20,40 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.stream.Collectors;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
 import org.junit.Assert;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
 
 import org.apache.cassandra.exceptions.SyntaxException;
 
-@RunWith(Parameterized.class)
-public class KeywordTest extends CQLTester
+/**
+ * This class tests all keywords which took a long time. Hence it was split into multiple
+ * KeywordTestSplitN to prevent CI timing out. If timeouts reappear split it further
+ */
+public class KeywordTestBase extends CQLTester
 {
-    @Parameterized.Parameters(name = "keyword {0} isReserved {1}")
-    public static Collection<Object[]> keywords() {
-        return Arrays.stream(CqlParser.tokenNames)
-                     .filter(k -> k.startsWith("K_"))
-                     .map(k -> {
-                         String keyword = k.substring(2);
-                         return new Object[]{ keyword, ReservedKeywords.isReserved(keyword) };
-                     })
-                     .collect(Collectors.toSet());
+    public static List<Object[]> keywords = Arrays.stream(CqlParser.tokenNames)
+                                                  .filter(k -> k.startsWith("K_"))
+                                                  .map(k -> {
+                                                      String keyword = k.substring(2);
+                                                      return new Object[] { keyword,ReservedKeywords.isReserved(keyword) };
+                                                  })
+                                                  .collect(Collectors.toList());
+
+    public static Collection<Object[]> getKeywordsForSplit(int split, int totalSplits)
+    {
+        return Sets.newHashSet(Lists.partition(KeywordTestBase.keywords, KeywordTestBase.keywords.size() / totalSplits)
+                                    .get(split - 1));
     }
 
     String keyword;
     boolean isReserved;
-    public KeywordTest(String keyword, boolean isReserved)
+    public KeywordTestBase(String keyword, boolean isReserved)
     {
         this.keyword = keyword;
         this.isReserved = isReserved;

test/unit/org/apache/cassandra/cql3/KeywordTestSplit1.java

@@ -0,0 +1,45 @@
+/*
+ * 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.cql3;
+
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * This base class tests all keywords which took a long time. Hence it was split into multiple
+ * KeywordTestSplitN to prevent CI timing out. If timeouts reappear split it further
+ */
+@RunWith(Parameterized.class)
+public class KeywordTestSplit1 extends KeywordTestBase
+{
+    static int SPLIT = 1;
+    static int TOTAL_SPLITS = 2;
+
+    @Parameterized.Parameters(name = "keyword {0} isReserved {1}")
+    public static Collection<Object[]> keywords() {
+        return KeywordTestBase.getKeywordsForSplit(SPLIT, TOTAL_SPLITS);
+    }
+
+    public KeywordTestSplit1(String keyword, boolean isReserved)
+    {
+        super(keyword, isReserved);
+    }
+}

test/unit/org/apache/cassandra/cql3/KeywordTestSplit2.java

@@ -0,0 +1,45 @@
+/*
+ * 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.cql3;
+
+import java.util.Collection;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ * This base class tests all keywords which took a long time. Hence it was split into multiple
+ * KeywordTestSplitN to prevent CI timing out. If timeouts reappear split it further
+ */
+@RunWith(Parameterized.class)
+public class KeywordTestSplit2 extends KeywordTestBase
+{
+    static int SPLIT = 2;
+    static int TOTAL_SPLITS = 2;
+
+    @Parameterized.Parameters(name = "keyword {0} isReserved {1}")
+    public static Collection<Object[]> keywords() {
+        return KeywordTestBase.getKeywordsForSplit(SPLIT, TOTAL_SPLITS);
+    }
+
+    public KeywordTestSplit2(String keyword, boolean isReserved)
+    {
+        super(keyword, isReserved);
+    }
+}