This is an automated email from the ASF dual-hosted git repository.
bereng pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-4.0 by this push:
new 27b5a017ea Flaky org.apache.cassandra.cql3.KeywordTest
27b5a017ea is described below
commit 27b5a017eaeb692cead5266cef43175b729fbe88
Author: Bereng <[email protected]>
AuthorDate: Fri May 13 11:08:04 2022 +0200
Flaky org.apache.cassandra.cql3.KeywordTest
patch by Berenguer Blasi; reviewed by Brandon Williams for CASSANDRA-17615
---
.../{KeywordTest.java => KeywordTestBase.java} | 36 ++++++++++-------
.../apache/cassandra/cql3/KeywordTestSplit1.java | 45 ++++++++++++++++++++++
.../apache/cassandra/cql3/KeywordTestSplit2.java | 45 ++++++++++++++++++++++
3 files changed, 112 insertions(+), 14 deletions(-)
diff --git a/test/unit/org/apache/cassandra/cql3/KeywordTest.java
b/test/unit/org/apache/cassandra/cql3/KeywordTestBase.java
similarity index 76%
rename from test/unit/org/apache/cassandra/cql3/KeywordTest.java
rename to test/unit/org/apache/cassandra/cql3/KeywordTestBase.java
index 720bc6ae3e..48512d0751 100644
--- a/test/unit/org/apache/cassandra/cql3/KeywordTest.java
+++ b/test/unit/org/apache/cassandra/cql3/KeywordTestBase.java
@@ -20,32 +20,40 @@ package org.apache.cassandra.cql3;
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;
diff --git a/test/unit/org/apache/cassandra/cql3/KeywordTestSplit1.java
b/test/unit/org/apache/cassandra/cql3/KeywordTestSplit1.java
new file mode 100644
index 0000000000..802285afa8
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/test/unit/org/apache/cassandra/cql3/KeywordTestSplit2.java
b/test/unit/org/apache/cassandra/cql3/KeywordTestSplit2.java
new file mode 100644
index 0000000000..2da989a5c2
--- /dev/null
+++ b/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);
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
