Author: eevans
Date: Thu Mar 10 17:11:18 2011
New Revision: 1080282
URL: http://svn.apache.org/viewvc?rev=1080282&view=rev
Log:
remove timeuuid term type
Patch by eevans for CASSANDRA-2027
Modified:
cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g
cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java
cassandra/trunk/test/system/test_cql.py
Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g?rev=1080282&r1=1080281&r2=1080282&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/Cql.g Thu Mar 10 17:11:18
2011
@@ -266,11 +266,7 @@ comparatorType
;
term returns [Term item]
- : ( t=timeuuid | t=literal ) { $item = t; }
- ;
-
-literal returns [Term term]
- : ( t=STRING_LITERAL | t=INTEGER | t=UUID ) { $term = new Term($t.text,
$t.type); }
+ : ( t=STRING_LITERAL | t=INTEGER | t=UUID ) { $item = new Term($t.text,
$t.type); }
;
termList returns [List<Term> items]
@@ -298,10 +294,6 @@ truncateStatement returns [String cfam]
endStmnt
: (EOF | ';')
;
-
-timeuuid returns [Term term]
- : 'timeuuid(' uuidstr=( STRING_LITERAL | INTEGER )? ')' { return new
Term($uuidstr.text, TermType.TIMEUUID); }
- ;
// Case-insensitive keywords
Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java?rev=1080282&r1=1080281&r2=1080282&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/Term.java Thu Mar 10
17:11:18 2011
@@ -27,7 +27,6 @@ import org.apache.cassandra.db.marshal.A
import org.apache.cassandra.db.marshal.IntegerType;
import org.apache.cassandra.db.marshal.LexicalUUIDType;
import org.apache.cassandra.db.marshal.MarshalException;
-import org.apache.cassandra.db.marshal.TimeUUIDType;
import org.apache.cassandra.thrift.InvalidRequestException;
/** A term parsed from a CQL statement. */
@@ -106,8 +105,6 @@ public class Term
return IntegerType.instance.fromString(text);
case UUID:
return LexicalUUIDType.instance.fromString(text);
- case TIMEUUID:
- return TimeUUIDType.instance.fromString(text);
}
// FIXME: handle scenario that should never happen
@@ -133,7 +130,7 @@ public class Term
enum TermType
{
- STRING, INTEGER, UUID, TIMEUUID;
+ STRING, INTEGER, UUID;
static TermType forInt(int type)
{
Modified: cassandra/trunk/test/system/test_cql.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_cql.py?rev=1080282&r1=1080281&r2=1080282&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_cql.py (original)
+++ cassandra/trunk/test/system/test_cql.py Thu Mar 10 17:11:18 2011
@@ -439,20 +439,18 @@ class TestCql(ThriftTester):
# Store and retrieve a timeuuid using it's hex-formatted string
timeuuid = uuid.uuid1()
conn.execute("""
- UPDATE StandardTimeUUID SET timeuuid('%s') = 10
- WHERE KEY = 'uuidtest'
+ UPDATE StandardTimeUUID SET '%s' = 10 WHERE KEY = 'uuidtest'
""" % str(timeuuid))
r = conn.execute("""
- SELECT timeuuid('%s') FROM StandardTimeUUID WHERE KEY = 'uuidtest'
+ SELECT '%s' FROM StandardTimeUUID WHERE KEY = 'uuidtest'
""" % str(timeuuid))
assert r[0].columns[0].name == timeuuid.bytes
# Tests a node-side conversion from long to UUID.
ms = uuid1bytes_to_millis(uuid.uuid1().bytes)
conn.execute("""
- UPDATE StandardTimeUUIDValues SET 'id' = timeuuid(%d)
- WHERE KEY = 'uuidtest'
+ UPDATE StandardTimeUUIDValues SET 'id' = %d WHERE KEY = 'uuidtest'
""" % ms)
r = conn.execute("""
@@ -462,8 +460,7 @@ class TestCql(ThriftTester):
# Tests a node-side conversion from ISO8601 to UUID.
conn.execute("""
- UPDATE StandardTimeUUIDValues
- SET 'id2' = timeuuid('2011-01-31 17:00:00-0000')
+ UPDATE StandardTimeUUIDValues SET 'id2' = '2011-01-31
17:00:00-0000'
WHERE KEY = 'uuidtest'
""")
@@ -475,31 +472,18 @@ class TestCql(ThriftTester):
assert ms == 1296493200000, \
"%d != 1296493200000 (2011-01-31 17:00:00-0000)" % ms
- # Tests node-side conversion of empty term to UUID
- conn.execute("""
- UPDATE StandardTimeUUIDValues SET 'id3' = timeuuid()
- WHERE KEY = 'uuidtest'
- """)
-
- r = conn.execute("""
- SELECT 'id3' FROM StandardTimeUUIDValues WHERE KEY = 'uuidtest'
- """)
- ms = uuid1bytes_to_millis(r[0].columns[0].value)
- assert ((time.time() * 1e3) - ms) < 100, \
- "timeuuid() not within 100ms of now (UPDATE vs. SELECT)"
-
# Tests node-side conversion of timeuuid("now") to UUID
conn.execute("""
- UPDATE StandardTimeUUIDValues SET 'id4' = timeuuid('now')
+ UPDATE StandardTimeUUIDValues SET 'id3' = 'now'
WHERE KEY = 'uuidtest'
""")
r = conn.execute("""
- SELECT 'id4' FROM StandardTimeUUIDValues WHERE KEY = 'uuidtest'
+ SELECT 'id3' FROM StandardTimeUUIDValues WHERE KEY = 'uuidtest'
""")
ms = uuid1bytes_to_millis(r[0].columns[0].value)
assert ((time.time() * 1e3) - ms) < 100, \
- "timeuuid(\"now\") not within 100ms of now (UPDATE vs. SELECT)"
+ "new timeuuid not within 100ms of now (UPDATE vs. SELECT)"
# TODO: slices of timeuuids from cf w/ TimeUUIDType comparator
