cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject svn commit: r1196956 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cli/CliClient.java
Date Thu, 03 Nov 2011 06:19:47 GMT
Author: jbellis
Date: Thu Nov  3 06:19:47 2011
New Revision: 1196956

URL: http://svn.apache.org/viewvc?rev=1196956&view=rev
Log:
fix displaying cfdef entries for super columnfamilies
patch by jbellis for CASSANDRA-3415

Modified:
    cassandra/branches/cassandra-0.8/CHANGES.txt
    cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1196956&r1=1196955&r2=1196956&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Thu Nov  3 06:19:47 2011
@@ -1,5 +1,6 @@
 0.8.9
  * acquire compactionlock during truncate (CASSANDRA-3399)
+ * fix displaying cfdef entries for super columnfamilies (CASSANDRA-3415)
 
 
 0.8.8

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=1196956&r1=1196955&r2=1196956&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 Thu
Nov  3 06:19:47 2011
@@ -1705,9 +1705,9 @@ public class CliClient
     {
         sb.append(NEWLINE + TAB + TAB + "{");
 
-        final AbstractType comparator = getFormatType((cfDef.column_type == "Super")
-                                                        ? cfDef.subcomparator_type
-                                                        : cfDef.comparator_type);
+        final AbstractType comparator = getFormatType(cfDef.column_type.equals("Super")
+                                                      ? cfDef.subcomparator_type
+                                                      : cfDef.comparator_type);
         sb.append("column_name : '" + CliUtils.escapeSQLString(comparator.getString(colDef.name))
+ "'," + NEWLINE);
         String validationClass = normaliseType(colDef.validation_class, "org.apache.cassandra.db.marshal");
         sb.append(TAB + TAB + "validation_class : " + CliUtils.escapeSQLString(validationClass));



Mime
View raw message