Author: eevans
Date: Thu Mar 10 15:45:59 2011
New Revision: 1080254
URL: http://svn.apache.org/viewvc?rev=1080254&view=rev
Log:
remove unicode 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=1080254&r1=1080253&r2=1080254&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 15:45:59
2011
@@ -270,7 +270,7 @@ term returns [Term item]
;
literal returns [Term term]
- : ( t=STRING_LITERAL | t=INTEGER | t=UNICODE | t=UUID ) { $term = new
Term($t.text, $t.type); }
+ : ( t=STRING_LITERAL | t=INTEGER | t=UUID ) { $term = new Term($t.text,
$t.type); }
;
termList returns [List<Term> items]
@@ -421,11 +421,7 @@ IDENT
COMPIDENT
: IDENT ( ':' IDENT)*
;
-
-UNICODE
- : 'u' STRING_LITERAL
- ;
-
+
UUID
: HEX HEX HEX HEX HEX HEX HEX HEX '-'
HEX HEX HEX HEX '-'
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=1080254&r1=1080253&r2=1080254&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
15:45:59 2011
@@ -124,8 +124,6 @@ public class Term
return AsciiType.instance.fromString(text);
case INTEGER:
return IntegerType.instance.fromString(text);
- case UNICODE:
- return UTF8Type.instance.fromString(text);
case UUID:
return LexicalUUIDType.instance.fromString(text);
case TIMEUUID:
@@ -155,7 +153,7 @@ public class Term
enum TermType
{
- STRING, INTEGER, UNICODE, UUID, TIMEUUID;
+ STRING, INTEGER, UUID, TIMEUUID;
static TermType forInt(int type)
{
@@ -163,8 +161,6 @@ enum TermType
return STRING;
else if (type == CqlParser.INTEGER)
return INTEGER;
- else if (type == CqlParser.UNICODE)
- return UNICODE;
else if (type == CqlParser.UUID)
return UUID;
Modified: cassandra/trunk/test/system/test_cql.py
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_cql.py?rev=1080254&r1=1080253&r2=1080254&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_cql.py (original)
+++ cassandra/trunk/test/system/test_cql.py Thu Mar 10 15:45:59 2011
@@ -61,10 +61,10 @@ def load_sample(dbconn):
dbconn.execute(query, "cd1", "vd1", "col", "val", "kd")
dbconn.execute("""
- UPDATE StandardUtf82 SET u'%s' = 've1', 'col' = 'val' WHERE KEY = 'kd'
+ UPDATE StandardUtf82 SET '%s' = 've1', 'col' = 'val' WHERE KEY = 'kd'
""" % u'\xa9'.encode('utf8'))
dbconn.execute("""
- UPDATE StandardUtf82 SET u'cf1' = 'vf1', 'col' = 'val' WHERE KEY = 'kd'
+ UPDATE StandardUtf82 SET 'cf1' = 'vf1', 'col' = 'val' WHERE KEY = 'kd'
""")
dbconn.execute("""
