Author: jbellis
Date: Mon Mar 28 21:58:59 2011
New Revision: 1086417
URL: http://svn.apache.org/viewvc?rev=1086417&view=rev
Log:
revert merge of #2358
Modified:
cassandra/trunk/CHANGES.txt
cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java
Modified: cassandra/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1086417&r1=1086416&r2=1086417&view=diff
==============================================================================
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Mon Mar 28 21:58:59 2011
@@ -32,7 +32,6 @@
* fix potential infinite loop in ByteBufferUtil.inputStream (CASSANDRA-2365)
* fix encoding bugs in HintedHandoffManager, SystemTable when default
charset is not UTF8 (CASSANDRA-2367)
- * allow negative numbers in the cli (CASSANDRA-2358)
* fsync statistics component on write (CASSANDRA-2382)
* fix incorrect truncation of long to int when reading columns via block
index (CASSANDRA-2376)
Modified: cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1086417&r1=1086416&r2=1086417&view=diff
==============================================================================
--- cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java (original)
+++ cassandra/trunk/test/unit/org/apache/cassandra/cli/CliTest.java Mon Mar 28
21:58:59 2011
@@ -40,11 +40,7 @@ public class CliTest extends CleanupHelp
"create column family CF1 with comparator=UTF8Type and
column_metadata=[{ column_name:world, validation_class:IntegerType,
index_type:0, index_name:IdxName }, { column_name:world2,
validation_class:LongType, index_type:KEYS, index_name:LongIdxName}];",
"assume CF1 keys as utf8;",
"set CF1[hello][world] = 123848374878933948398384;",
- "set CF1[hello][-31337] = 'some string value';",
- "get CF1[hello][-31337];",
"get CF1[hello][world];",
- "set CF1[hello][-31337] = -23876;",
- "set CF1[hello][-31337] = long(-23876);",
"set CF1[hello][world2] = 15;",
"get CF1 where world2 = long(15);",
"get cF1 where world2 = long(15);",
@@ -88,10 +84,6 @@ public class CliTest extends CleanupHelp
"del SCF1['hello'][1][9999];",
"get SCF1['hello'][1][9999];",
"set SCF1['hello'][1][9999] = Long(1234);",
- "set SCF1['hello'][-1][-12] = Long(5678);",
- "get SCF1['hello'][-1][-12];",
- "set SCF1['hello'][-1][-12] = -340897;",
- "set SCF1['hello'][-1][-12] = integer(-340897);",
"del SCF1['hello'][9999];",
"get SCF1['hello'][1][9999];",
"create column family Counter1 with comparator=UTF8Type and
default_validation_class=CounterColumnType;",
