Author: xedin Date: Sat Oct 15 20:16:31 2011 New Revision: 1183681 URL: http://svn.apache.org/viewvc?rev=1183681&view=rev Log: Fix completely removing column metadata using CLI patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3126
Modified: cassandra/branches/cassandra-0.8/CHANGES.txt cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/Cli.g 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=1183681&r1=1183680&r2=1183681&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/CHANGES.txt (original) +++ cassandra/branches/cassandra-0.8/CHANGES.txt Sat Oct 15 20:16:31 2011 @@ -16,7 +16,7 @@ (CASSANDRA-3185) * ColumnFamily min_compaction_threshold should be >= 2 (CASSANDRA-3342) * (Pig) add 0.8+ types and key validation type in schema (CASSANDRA-3280) - + * Fix completely removing column metadata using CLI (CASSANDRA-3126) 0.8.7 * Kill server on wrapped OOME such as from FileChannel.map (CASSANDRA-3201) Modified: cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/Cli.g URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/Cli.g?rev=1183681&r1=1183680&r2=1183681&view=diff ============================================================================== --- cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/Cli.g (original) +++ cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/Cli.g Sat Oct 15 20:16:31 2011 @@ -400,8 +400,8 @@ attrValue arrayConstruct - : '[' (hashConstruct ','?)+ ']' - -> ^(ARRAY (hashConstruct)+) + : '[' (hashConstruct ','?)* ']' + -> ^(ARRAY (hashConstruct)*) ; hashConstruct 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=1183681&r1=1183680&r2=1183681&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 Sat Oct 15 20:16:31 2011 @@ -155,6 +155,7 @@ public class CliTest extends CleanupHelp "drop column family cF8;", "create keyspace TESTIN;", "drop keyspace tesTIN;", + "update column family 123 with comparator=UTF8Type and column_metadata=[];", "drop column family 123;", "create column family myCF with column_type='Super' and comparator='UTF8Type' AND subcomparator='UTF8Type';", "assume myCF keys as utf8;",