From 440ebfab340ae44f039d916a6548eedd9b20e98d Mon Sep 17 00:00:00 2001 From: David Capwell Date: Wed, 28 Oct 2020 11:17:57 -0700 Subject: [PATCH 1/2] CASSANDRA-16233 - remove replace from cql reserved words --- src/antlr/Parser.g | 2 +- .../cassandra/cql3/ReservedKeywords.java | 1 - .../cassandra/cql3/NotReservedTest.java | 35 +++++++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 test/unit/org/apache/cassandra/cql3/NotReservedTest.java diff --git a/src/antlr/Parser.g b/src/antlr/Parser.g index 43eec842bd79..04b0524e3ed0 100644 --- a/src/antlr/Parser.g +++ b/src/antlr/Parser.g @@ -1830,7 +1830,7 @@ non_type_ident returns [ColumnIdentifier id] unreserved_keyword returns [String str] : u=unreserved_function_keyword { $str = u; } - | k=(K_TTL | K_COUNT | K_WRITETIME | K_KEY | K_CAST | K_JSON | K_DISTINCT) { $str = $k.text; } + | k=(K_TTL | K_COUNT | K_WRITETIME | K_KEY | K_CAST | K_JSON | K_DISTINCT | K_REPLACE) { $str = $k.text; } ; unreserved_function_keyword returns [String str] diff --git a/src/java/org/apache/cassandra/cql3/ReservedKeywords.java b/src/java/org/apache/cassandra/cql3/ReservedKeywords.java index 30b1a6ed9115..b66a8349126f 100644 --- a/src/java/org/apache/cassandra/cql3/ReservedKeywords.java +++ b/src/java/org/apache/cassandra/cql3/ReservedKeywords.java @@ -85,7 +85,6 @@ class ReservedKeywords "NAN", "INFINITY", "OR", - "REPLACE", "DEFAULT", "UNSET", "MBEAN", diff --git a/test/unit/org/apache/cassandra/cql3/NotReservedTest.java b/test/unit/org/apache/cassandra/cql3/NotReservedTest.java new file mode 100644 index 000000000000..1d12d01ea3b2 --- /dev/null +++ b/test/unit/org/apache/cassandra/cql3/NotReservedTest.java @@ -0,0 +1,35 @@ +/* + * 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 org.junit.Assert; + import org.junit.Test; + + public class NotReservedTest extends CQLTester + { + @Test + public void replace() throws Throwable + { + createTable("CREATE TABLE %s (id text PRIMARY KEY, replace text);"); + execute("INSERT INTO %s (id, replace) VALUES ('a', 'b')"); + UntypedResultSet result = execute("SELECT id, replace FROM %s WHERE id='a'"); + UntypedResultSet.Row row = result.one(); + Assert.assertNotNull(row); + Assert.assertEquals("b", row.getString("replace")); + } + } From 4e55a772a4c992516f999cd6cc5a47a5e939a185 Mon Sep 17 00:00:00 2001 From: David Capwell Date: Wed, 28 Oct 2020 11:19:18 -0700 Subject: [PATCH 2/2] higher --- .circleci/config.yml | 98 ++++++++++++++++++++++---------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fcd26159a49a..bf7d60ce356d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,10 +3,10 @@ jobs: j8_jvm_upgrade_dtests: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 1 + parallelism: 2 steps: - attach_workspace: at: /home/cassandra @@ -94,10 +94,10 @@ jobs: j8_cqlsh-dtests-py2-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -171,10 +171,10 @@ jobs: j11_unit_tests: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -263,10 +263,10 @@ jobs: j8_cqlsh-dtests-py38-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -340,10 +340,10 @@ jobs: j11_cqlsh-dtests-py3-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -418,10 +418,10 @@ jobs: j11_cqlsh-dtests-py3-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -496,10 +496,10 @@ jobs: j11_cqlsh-dtests-py38-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -574,10 +574,10 @@ jobs: j8_cqlsh-dtests-py3-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -651,10 +651,10 @@ jobs: j8_cqlsh-dtests-py2-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -728,10 +728,10 @@ jobs: j11_cqlsh-dtests-py2-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -806,10 +806,10 @@ jobs: j11_dtests-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -887,10 +887,10 @@ jobs: j8_dtests-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -945,10 +945,10 @@ jobs: j8_upgradetests-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -1044,7 +1044,7 @@ jobs: utests_stress: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 1 @@ -1089,10 +1089,10 @@ jobs: j8_unit_tests: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 35 steps: - attach_workspace: at: /home/cassandra @@ -1180,10 +1180,10 @@ jobs: j11_jvm_dtests: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 1 + parallelism: 10 steps: - attach_workspace: at: /home/cassandra @@ -1353,10 +1353,10 @@ jobs: j11_cqlsh-dtests-py2-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -1431,10 +1431,10 @@ jobs: j8_dtests-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -1489,10 +1489,10 @@ jobs: j11_cqlsh-dtests-py38-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -1567,10 +1567,10 @@ jobs: j8_jvm_dtests: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 1 + parallelism: 14 steps: - attach_workspace: at: /home/cassandra @@ -1738,10 +1738,10 @@ jobs: j8_cqlsh-dtests-py3-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -1815,10 +1815,10 @@ jobs: j8_cqlsh-dtests-py38-with-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra @@ -1892,7 +1892,7 @@ jobs: utests_long: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 1 @@ -1937,7 +1937,7 @@ jobs: utests_fqltool: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l parallelism: 1 @@ -1982,10 +1982,10 @@ jobs: j11_dtests-no-vnodes: docker: - image: nastra/cassandra-testing-ubuntu1910-java11:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 25 steps: - attach_workspace: at: /home/cassandra @@ -2063,10 +2063,10 @@ jobs: utests_compression: docker: - image: nastra/cassandra-testing-ubuntu1910-java11-w-dependencies:20200603 - resource_class: medium + resource_class: xlarge working_directory: ~/ shell: /bin/bash -eo pipefail -l - parallelism: 4 + parallelism: 20 steps: - attach_workspace: at: /home/cassandra