cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1182411 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cql/Cql.g
Date Wed, 12 Oct 2011 14:53:16 GMT
Author: jbellis
Date: Wed Oct 12 14:53:16 2011
New Revision: 1182411

URL: http://svn.apache.org/viewvc?rev=1182411&view=rev
Log:
update CQL grammar to require key clause in delete statement
patch by pyaskevich; reviewed by jbellis for CASSANDRA-3349

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=1182411&r1=1182410&r2=1182411&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Oct 12 14:53:16 2011
@@ -1,6 +1,8 @@
 0.8.8
  * fix truncate allowing data to be replayed post-restart (CASSANDRA-3297)
  * make iwriter final in IndexWriter to avoid NPE (CASSANDRA-2863)
+ * (CQL) update grammar to require key clause in delete statement
+   (CASSANDRA-3349)
 
 
 0.8.7

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=1182411&r1=1182410&r2=1182411&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 Wed Oct 12 14:53:16
2011
@@ -334,7 +334,7 @@ deleteStatement returns [DeleteStatement
           ( cols=termList { columnsList = $cols.items; })?
           K_FROM columnFamily=( IDENT | STRING_LITERAL | INTEGER )
           ( usingClauseDelete[attrs] )?
-          K_WHERE ( key_alias=term ('=' key=term           { keyList = Collections.singletonList(key);
}
+          ( K_WHERE key_alias=term ('=' key=term           { keyList = Collections.singletonList(key);
}
                                    | K_IN '(' keys=termList { keyList = $keys.items; } ')')
                   )?
       {



Mime
View raw message