Author: jbellis
Date: Thu Oct 13 20:43:50 2011
New Revision: 1183084
URL: http://svn.apache.org/viewvc?rev=1183084&view=rev
Log:
update CQL parser to accept "timestamp" instead of "date"
patch by Paul Cannon; reviewed by jbellis for CASSANDRA-3149
Modified:
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/Cql.g
Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1183084&r1=1183083&r2=1183084&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Thu Oct 13 20:43:50 2011
@@ -11,6 +11,7 @@
* Fix handling of tombstone by SSTableExport/Import (CASSANDRA-3357)
* fix ColumnIndexer to use long offsets (CASSANDRA-3358)
* limit nodetool to 32MB of heap (CASSANDRA-3124)
+ * (CQL) update parser to accept "timestamp" instead of "date" (CASSANDRA-3149)
1.0.0-final
Modified:
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/Cql.g
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/Cql.g?rev=1183084&r1=1183083&r2=1183084&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/Cql.g
(original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/Cql.g
Thu Oct 13 20:43:50 2011
@@ -436,7 +436,7 @@ dropColumnFamilyStatement returns [Strin
;
comparatorType
- : 'blob' | 'ascii' | 'text' | 'varchar' | 'int' | 'varint' | 'bigint' |
'uuid' | 'counter' | 'boolean' | 'date' | 'float' | 'double' | 'decimal'
+ : 'blob' | 'ascii' | 'text' | 'varchar' | 'int' | 'varint' | 'bigint' |
'uuid' | 'counter' | 'boolean' | 'timestamp' | 'float' | 'double' | 'decimal'
;
term returns [Term item]
