natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-3.0' into cassandra-3.X

This commit is contained in:
Carl Yeksigian 2016-10-17 16:16:29 -04:00
parent 720acc611f bc9a079394
commit f5bc3784fb
2 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/java/org/apache/cassandra/cql3/ReservedKeywords.java
View File

@ -20,17 +20,18 @@ package org.apache.cassandra.cql3;
import java.util.Set;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableSet;
class ReservedKeywords
{
private static final String[] reservedKeywords = new String[]
@VisibleForTesting
static final String[] reservedKeywords = new String[]
{
"SELECT",
"FROM",
"WHERE",
"AND",
"KEY",
"ENTRIES",
"FULL",
"INSERT",
@ -39,7 +40,6 @@ class ReservedKeywords
"LIMIT",
"USING",
"USE",
"COUNT",
"SET",
"BEGIN",
"UNLOGGED",
@ -61,8 +61,6 @@ class ReservedKeywords
"DROP",
"PRIMARY",
"INTO",
"TIMESTAMP",
"TTL",
"ALTER",
"RENAME",
"ADD",
@ -81,27 +79,7 @@ class ReservedKeywords
"DESCRIBE",
"EXECUTE",
"NORECURSIVE",
"ASCII",
"BIGINT",
"BLOB",
"BOOLEAN",
"COUNTER",
"DECIMAL",
"DOUBLE",
"FLOAT",
"INET",
"INT",
"SMALLINT",
"TINYINT",
"TEXT",
"UUID",
"VARCHAR",
"VARINT",
"TIMEUUID",
"TOKEN",
"WRITETIME",
"DATE",
"TIME",
"NULL",
"NOT",
"NAN",

43
test/unit/org/apache/cassandra/cql3/ReservedKeywordsTest.java Normal file
View File

@ -0,0 +1,43 @@
/*
* 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.Test;
import junit.framework.Assert;
import org.apache.cassandra.exceptions.SyntaxException;
public class ReservedKeywordsTest
{
@Test
public void testReservedWordsForColumns() throws Exception
{
for (String reservedWord : ReservedKeywords.reservedKeywords)
{
try
{
QueryProcessor.parseStatement(String.format("ALTER TABLE ks.t ADD %s TEXT", reservedWord));
Assert.fail(String.format("Reserved keyword %s should not have parsed", reservedWord));
}
catch (SyntaxException ignore)
{
}
}
}
}