You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/03/04 11:41:05 UTC
git commit: rename constants to uppercase
Updated Branches:
refs/heads/trunk 4f0c4b7a2 -> 1a473094c
rename constants to uppercase
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1a473094
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1a473094
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1a473094
Branch: refs/heads/trunk
Commit: 1a473094c170e24a8c763fb811e5e8c2bc8ed268
Parents: 4f0c4b7
Author: Jonathan Ellis <jb...@apache.org>
Authored: Sat Mar 2 13:31:21 2013 -0600
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Mar 4 11:40:52 2013 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/cql/QueryProcessor.java | 2 +-
.../org/apache/cassandra/cql/StatementType.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a473094/src/java/org/apache/cassandra/cql/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java
index 8233429..e2fba6f 100644
--- a/src/java/org/apache/cassandra/cql/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java
@@ -366,7 +366,7 @@ public class QueryProcessor
String keyspace = null;
// Some statements won't have (or don't need) a keyspace (think USE, or CREATE).
- if (statement.type != StatementType.SELECT && StatementType.requiresKeyspace.contains(statement.type))
+ if (statement.type != StatementType.SELECT && StatementType.REQUIRES_KEYSPACE.contains(statement.type))
keyspace = clientState.getKeyspace();
CqlResult result = new CqlResult();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1a473094/src/java/org/apache/cassandra/cql/StatementType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/StatementType.java b/src/java/org/apache/cassandra/cql/StatementType.java
index 6f5afbe..94db6a3 100644
--- a/src/java/org/apache/cassandra/cql/StatementType.java
+++ b/src/java/org/apache/cassandra/cql/StatementType.java
@@ -24,7 +24,9 @@ public enum StatementType
SELECT, INSERT, UPDATE, BATCH, USE, TRUNCATE, DELETE, CREATE_KEYSPACE, CREATE_COLUMNFAMILY, CREATE_INDEX, DROP_INDEX,
DROP_KEYSPACE, DROP_COLUMNFAMILY, ALTER_TABLE;
- // Statement types that don't require a keyspace to be set.
- private static final EnumSet<StatementType> topLevel = EnumSet.of(USE, CREATE_KEYSPACE, DROP_KEYSPACE);
- public static final EnumSet<StatementType> requiresKeyspace = EnumSet.complementOf(topLevel);
+ /** Statement types that don't require a keyspace to be set */
+ private static final EnumSet<StatementType> TOP_LEVEL = EnumSet.of(USE, CREATE_KEYSPACE, DROP_KEYSPACE);
+
+ /** Statement types that require a keyspace to be set */
+ public static final EnumSet<StatementType> REQUIRES_KEYSPACE = EnumSet.complementOf(TOP_LEVEL);
}