svn commit: r1185091 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cql/Cql.g

[xedin]

Author: xedin
Date: Mon Oct 17 10:20:14 2011
New Revision: 1185091

URL: http://svn.apache.org/viewvc?rev=1185091&view=rev
Log:
(CQL) Fix internal application error specifying 'using consistency ...' in 
lower case
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3366

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1185091&r1=1185090&r2=1185091&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Mon Oct 17 10:20:14 2011
@@ -17,6 +17,8 @@
  * ColumnFamily min_compaction_threshold should be >= 2 (CASSANDRA-3342)
  * (Pig) add 0.8+ types and key validation type in schema (CASSANDRA-3280)
  * Fix completely removing column metadata using CLI (CASSANDRA-3126)
+ * (CQL) Fix internal application error specifying 'using consistency ...'
+   in lower case (CASSANDRA-3366)
 
 0.8.7
  * Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201)

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g?rev=1185091&r1=1185090&r2=1185091&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g 
(original)
+++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cql/Cql.g 
Mon Oct 17 10:20:14 2011
@@ -148,7 +148,7 @@ selectStatement returns [SelectStatement
           | K_COUNT '(' s2=selectExpression ')' { expression = s2; isCountOp = 
true; }
           )
           K_FROM columnFamily=( IDENT | STRING_LITERAL | INTEGER )
-          ( K_USING K_CONSISTENCY K_LEVEL { cLevel = 
ConsistencyLevel.valueOf($K_LEVEL.text); } )?
+          ( K_USING K_CONSISTENCY K_LEVEL { cLevel = 
ConsistencyLevel.valueOf($K_LEVEL.text.toUpperCase()); } )?
           ( K_WHERE whereClause )?
           ( K_LIMIT rows=INTEGER { numRecords = Integer.parseInt($rows.text); 
} )?
           endStmnt
@@ -230,7 +230,7 @@ usingClauseDelete[Attributes attrs]
     ;
 
 usingClauseDeleteObjective[Attributes attrs]
-    : K_CONSISTENCY K_LEVEL  { 
attrs.setConsistencyLevel(ConsistencyLevel.valueOf($K_LEVEL.text)); }
+    : K_CONSISTENCY K_LEVEL  { 
attrs.setConsistencyLevel(ConsistencyLevel.valueOf($K_LEVEL.text.toUpperCase()));
 }
     | K_TIMESTAMP ts=INTEGER { attrs.setTimestamp(Long.valueOf($ts.text)); }
     ;