You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yc...@apache.org on 2021/01/28 20:34:00 UTC
[cassandra] branch trunk updated (b55d830 -> 9178ec0)
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from b55d830 Merge branch 'cassandra-3.11' into trunk
new 68fd9ab test to demonstrate cqlsh DDL fails with the names
new bf9c53a add ACCESS & DATACENTERS to unreserved keywords
new 9178ec0 use highres
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.circleci/config.yml | 98 +++++++++++-----------
src/antlr/Parser.g | 2 +
.../apache/cassandra/tools/cqlsh/CqlshTest.java | 29 +++++++
3 files changed, 80 insertions(+), 49 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 03/03: use highres
Posted by yc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 9178ec0af8ae7a66069e066063e3d3b2112a522a
Author: yifan-c <yc...@apache.org>
AuthorDate: Thu Jan 28 12:33:37 2021 -0800
use highres
---
.circleci/config.yml | 98 ++++++++++++++++++++++++++--------------------------
1 file changed, 49 insertions(+), 49 deletions(-)
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68f5691..56e28ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,10 +3,10 @@ jobs:
j8_jvm_upgrade_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- 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: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -171,10 +171,10 @@ jobs:
j11_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -263,10 +263,10 @@ jobs:
j8_cqlsh-dtests-py38-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -340,10 +340,10 @@ jobs:
j11_cqlsh-dtests-py3-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -418,10 +418,10 @@ jobs:
j11_cqlsh-dtests-py3-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -496,10 +496,10 @@ jobs:
j11_cqlsh-dtests-py38-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -574,10 +574,10 @@ jobs:
j8_cqlsh-dtests-py3-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -651,10 +651,10 @@ jobs:
j8_cqlsh-dtests-py2-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -728,10 +728,10 @@ jobs:
j11_cqlsh-dtests-py2-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -806,10 +806,10 @@ jobs:
j11_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -887,10 +887,10 @@ jobs:
j8_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -945,10 +945,10 @@ jobs:
j8_upgradetests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1003,7 +1003,7 @@ jobs:
utests_stress:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
@@ -1048,10 +1048,10 @@ jobs:
j8_unit_tests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1139,10 +1139,10 @@ jobs:
j11_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 1
+ parallelism: 2
steps:
- attach_workspace:
at: /home/cassandra
@@ -1312,10 +1312,10 @@ jobs:
j11_cqlsh-dtests-py2-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1427,10 +1427,10 @@ jobs:
j8_dtests-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1485,10 +1485,10 @@ jobs:
j11_cqlsh-dtests-py38-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1563,10 +1563,10 @@ jobs:
j8_jvm_dtests:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 1
+ parallelism: 5
steps:
- attach_workspace:
at: /home/cassandra
@@ -1734,10 +1734,10 @@ jobs:
j8_cqlsh-dtests-py3-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1811,10 +1811,10 @@ jobs:
j8_cqlsh-dtests-py38-with-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -1888,7 +1888,7 @@ jobs:
utests_long:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
@@ -1969,7 +1969,7 @@ jobs:
utests_fqltool:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
parallelism: 1
@@ -2014,10 +2014,10 @@ jobs:
j11_dtests-no-vnodes:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
@@ -2095,10 +2095,10 @@ jobs:
utests_compression:
docker:
- image: apache/cassandra-testing-ubuntu2004-java11-w-dependencies:20210105
- resource_class: medium
+ resource_class: xlarge
working_directory: ~/
shell: /bin/bash -eo pipefail -l
- parallelism: 4
+ parallelism: 100
steps:
- attach_workspace:
at: /home/cassandra
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/03: test to demonstrate cqlsh DDL fails with the
names
Posted by yc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 68fd9abfe5186262ce1a2cabccd1af5bb2ef75fa
Author: yifan-c <yc...@apache.org>
AuthorDate: Thu Jan 28 10:46:07 2021 -0800
test to demonstrate cqlsh DDL fails with the names
---
.../apache/cassandra/tools/cqlsh/CqlshTest.java | 29 ++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/test/unit/org/apache/cassandra/tools/cqlsh/CqlshTest.java b/test/unit/org/apache/cassandra/tools/cqlsh/CqlshTest.java
index 4e6dd20..89ff055 100644
--- a/test/unit/org/apache/cassandra/tools/cqlsh/CqlshTest.java
+++ b/test/unit/org/apache/cassandra/tools/cqlsh/CqlshTest.java
@@ -18,6 +18,9 @@
package org.apache.cassandra.tools.cqlsh;
+import java.util.Arrays;
+import java.util.List;
+
import org.junit.BeforeClass;
import org.junit.Test;
@@ -28,6 +31,7 @@ import org.hamcrest.CoreMatchers;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
public class CqlshTest extends CQLTester
{
@@ -44,4 +48,29 @@ public class CqlshTest extends CQLTester
assertThat(tool.getCleanedStderr(), CoreMatchers.containsStringIgnoringCase("No keyspace has been specified"));
assertEquals(2, tool.getExitCode());
}
+
+ @Test
+ public void testUseUnreservedKeywordAsColumnName()
+ {
+ List<String> names = Arrays.asList("access", "datacenters");
+ for (String name : names)
+ {
+ testUseUnreservedKeywordAsColumnName(name);
+ testUseUnreservedKeywordAsColumnName(name.toUpperCase());
+ }
+ }
+
+ private void testUseUnreservedKeywordAsColumnName(String unreservedKeyword)
+ {
+ String createTableFormat = "CREATE TABLE %s.\"test_%s\" ( foo text PRIMARY KEY, \"%s\" text);";
+ ToolResult tool = ToolRunner.invokeCqlsh(String.format(createTableFormat, KEYSPACE_PER_TEST, unreservedKeyword, unreservedKeyword));
+ assertCqlshNoStderr(tool);
+ assertEquals("Create table failed", 0, tool.getExitCode());
+ }
+
+ private static void assertCqlshNoStderr(ToolResult toolResult)
+ {
+ String stderr = toolResult.getCleanedStderr();
+ assertTrue("Cqlsh failed: " + stderr, stderr.isEmpty());
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 02/03: add ACCESS & DATACENTERS to unreserved keywords
Posted by yc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ycai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit bf9c53a6ed3eec546fd33115f290d6b8a6c969db
Author: yifan-c <yc...@apache.org>
AuthorDate: Thu Jan 28 10:47:39 2021 -0800
add ACCESS & DATACENTERS to unreserved keywords
---
src/antlr/Parser.g | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/antlr/Parser.g b/src/antlr/Parser.g
index b0f1b94..3f6f43f 100644
--- a/src/antlr/Parser.g
+++ b/src/antlr/Parser.g
@@ -1893,5 +1893,7 @@ basic_unreserved_keyword returns [String str]
| K_PER
| K_PARTITION
| K_GROUP
+ | K_DATACENTERS
+ | K_ACCESS
) { $str = $k.text; }
;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org