Author: jbellis
Date: Fri Nov 5 19:33:08 2010
New Revision: 1031741
URL: http://svn.apache.org/viewvc?rev=1031741&view=rev
Log:
r/m extra subcomparator line in cli keyspaces output
patch by jbellis for CASSANDRA-1712
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1031741&r1=1031740&r2=1031741&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Nov 5 19:33:08 2010
@@ -16,6 +16,7 @@ dev
* add --skip-keys option to stress.py (CASSANDRA-1696)
* improve cli handling of non-string column names (CASSANDRA-1701)
* enable skipping bad rows on LazilyCompacted path (CASSANDRA-1702)
+ * r/m extra subcomparator line in cli keyspaces output (CASSANDRA-1712)
0.7.0-beta3
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java?rev=1031741&r1=1031740&r2=1031741&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
Fri Nov 5 19:33:08 2010
@@ -1130,12 +1130,6 @@ public class CliClient extends CliUserHe
}
sessionState.out.printf(" Columns sorted by: %s%s\n",
cf_def.comparator_type, cf_def.column_type.equals("Super") ? "/" +
cf_def.subcomparator_type : "");
-
- if (cf_def.subcomparator_type != null)
- {
- sessionState.out.println(" Subcolumns sorted by: " +
cf_def.comparator_type);
- }
-
sessionState.out.printf(" Row cache size / save period:
%s/%s\n", cf_def.row_cache_size, cf_def.row_cache_save_period_in_seconds);
sessionState.out.printf(" Key cache size / save period:
%s/%s\n", cf_def.key_cache_size, cf_def.key_cache_save_period_in_seconds);
sessionState.out.printf(" Memtable thresholds:
%s/%s/%s\n",
