CASANDRA-15663 (3.11) DESCRIBE KEYSPACE does not properly quote table names #1105
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
authored and reviewed by Ekaterina Dimitrova, Adam Holmberg and Andres de la Pena for CASSANDRA-16659
adelapena
commented
Jul 8, 2021
pylib/cqlshlib/cqlhandling.py
Outdated
Comment on lines
26
to
57
| cql_keywords = set(( | ||
| 'add', 'aggregate', 'all', 'allow', 'alter', 'and', 'apply', 'as', 'asc', 'ascii', 'authorize', 'batch', 'begin', | ||
| 'bigint', 'blob', 'boolean', 'by', 'called', 'cast', 'clustering', 'columnfamily', 'compact', 'contains', 'count', | ||
| 'counter', 'create', 'custom', 'date', 'decimal', 'default', 'delete', 'desc', 'describe', 'distinct', 'double', | ||
| 'drop', 'duration', 'entries', 'execute', 'exists', 'filtering', 'finalfunc', 'float', 'from', 'frozen', 'full', | ||
| 'function', 'functions', 'grant', 'group', 'if', 'in', 'index', 'inet', 'infinity', 'initcond', 'input', 'insert', | ||
| 'int', 'into', 'is', 'json', 'key', 'keys', 'keyspace', 'keyspaces', 'language', 'like', 'limit', 'list', 'login', | ||
| 'map', 'materialized', 'mbean', 'mbeans', 'modify', 'nan', 'nologin', 'norecursive', 'nosuperuser', 'not', 'null', | ||
| 'of', 'on', 'options', 'or', 'order', 'partition', 'password', 'per', 'permission', 'permissions', 'primary', | ||
| 'rename', 'replace', 'returns', 'revoke', 'role', 'roles', 'schema', 'select', 'set', 'sfunc', 'smallint', 'static', | ||
| 'storage', 'stype', 'superuser', 'table', 'text', 'time', 'timestamp', 'timeuuid', 'tinyint', 'to', 'token', | ||
| 'trigger', 'truncate', 'ttl', 'tuple', 'type', 'unlogged', 'unset', 'update', 'use', 'user', 'users', 'using', | ||
| 'uuid', 'values', 'varchar', 'varint', 'view', 'where', 'with', 'writetime' | ||
| )) | ||
| """ | ||
| Set of keywords in CQL. | ||
|
|
||
| Derived from .../cassandra/src/java/org/apache/cassandra/cql3/Lexer.g | ||
| """ | ||
|
|
||
| cql_keywords_unreserved = set(( | ||
| 'aggregate', 'all', 'as', 'called', 'clustering', 'compact', 'contains', 'custom', 'exists', 'filtering', | ||
| 'finalfunc', 'frozen', 'function', 'functions', 'group', 'initcond', 'input', 'keys', 'keyspaces', 'language', | ||
| 'like', 'list', 'login', 'map', 'nologin', 'nosuperuser', 'options', 'partition', 'password', 'per', 'permission', | ||
| 'permissions', 'returns', 'role', 'roles', 'sfunc', 'static', 'storage', 'stype', 'superuser', 'trigger', 'tuple', | ||
| 'type', 'user', 'users', 'values' | ||
| )) | ||
| """ | ||
| Set of unreserved keywords in CQL. | ||
|
|
||
| Derived from .../cassandra/src/java/org/apache/cassandra/cql3/Parser.g | ||
| """ |
There was a problem hiding this comment.
As mentioned on the Jira ticket, I think we only need to override cql_keywords_reserved
There was a problem hiding this comment.
src/antlr/Lexer.g
Outdated
| @@ -56,7 +56,8 @@ lexer grammar Lexer; | |||
| } | |||
|
|
|||
| // Case-insensitive keywords | |||
| // When adding a new reserved keyword, add entry to o.a.c.cql3.ReservedKeywords as well | |||
| // When adding a new reserved keyword, add entry to o.a.c.cql3.ReservedKeywords and | |||
| // pylib/cqlshlib/cqlhandling.py::CqlParsingRuleSet.cql_keywords_reserved as well | |||
There was a problem hiding this comment.
Nit: I think it's pylib/cqlshlib/cqlhandling.py::cql_keywords_reserved
There was a problem hiding this comment.
| private static final Set<String> reservedSet = ImmutableSet.copyOf(reservedKeywords); | ||
| private static final String FILE_NAME = "reserved_keywords.txt"; | ||
|
|
||
| static final Set<String> reservedKeywords = getFromResource(); |
There was a problem hiding this comment.
Nit: we have missed the @VisibleForTestingannotation for reservedKeywords
There was a problem hiding this comment.
pcmanus
pushed a commit
to pcmanus/cassandra
that referenced
this pull request
May 21, 2024
CNDB-9357: merge ds-trunk to vsearch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.