Author: xedin
Date: Wed Sep 14 12:06:39 2011
New Revision: 1170555
URL: http://svn.apache.org/viewvc?rev=1170555&view=rev
Log:
Allow quoting of the ColumnFamily name in CLI `create column family` statement
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3195
Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170555&r1=1170554&r2=1170555&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Sep 14 12:06:39 2011
@@ -17,7 +17,8 @@
decommission (CASSANDRA-3041)
* Fix divide by zero error in GCInspector
* revert CASSANDRA-2388
-
+ * allow quoting of the ColumnFamily name in CLI `create column family`
+ statement (CASSANDRA-3195)
0.8.5
* fix NPE when encryption_options is unspecified (CASSANDRA-3007)
Modified:
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java?rev=1170555&r1=1170554&r2=1170555&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
Wed Sep 14 12:06:39 2011
@@ -1023,7 +1023,7 @@ public class CliClient
return;
// first value is the column family name, after that it is all
key=value
- CfDef cfDef = new CfDef(keySpace, statement.getChild(0).getText());
+ CfDef cfDef = new CfDef(keySpace,
CliUtils.unescapeSQLString(statement.getChild(0).getText()));
try
{
Modified:
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1170555&r1=1170554&r2=1170555&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
(original)
+++
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
Wed Sep 14 12:06:39 2011
@@ -109,7 +109,7 @@ public class CliTest extends CleanupHelp
"set sCf1['hello'][1][9999] = Long(1234);",
"del sCf1['hello'][9999];",
"get sCf1['hello'][1][9999];",
- "create column family Counter1 with comparator=UTF8Type and
default_validation_class=CounterColumnType;",
+ "create column family 'Counter1' with comparator=UTF8Type and
default_validation_class=CounterColumnType;",
"assume Counter1 keys as utf8;",
"incr Counter1['hello']['cassandra'];",
"incr Counter1['hello']['cassandra'] by 3;",
