You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/02/10 19:48:01 UTC
svn commit: r1069523 - in /cassandra/branches/cassandra-0.7: CHANGES.txt
src/java/org/apache/cassandra/cli/CliClient.java
Author: jbellis
Date: Thu Feb 10 18:48:01 2011
New Revision: 1069523
URL: http://svn.apache.org/viewvc?rev=1069523&view=rev
Log:
format subcolumn names with subcomparator
patch by xedin; reviewed by jbellis for CASSANDRA-2136
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=1069523&r1=1069522&r2=1069523&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Feb 10 18:48:01 2011
@@ -1,6 +1,7 @@
0.7.2
* copy DecoratedKey.key when inserting into caches to avoid retaining
a reference to the underlying buffer (CASSANDRA-2102)
+ * format subcolumn names with subcomparator (CASSANDRA-2136)
0.7.1
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=1069523&r1=1069522&r2=1069523&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 Thu Feb 10 18:48:01 2011
@@ -314,7 +314,8 @@ public class CliClient extends CliUserHe
AbstractType validator;
CfDef cfDef = getCfDef(columnFamily);
-
+ boolean isSuperCF = cfDef.column_type.equals("Super");
+
// Print out super columns or columns.
for (ColumnOrSuperColumn cosc : columns)
{
@@ -337,9 +338,16 @@ public class CliClient extends CliUserHe
{
Column column = cosc.column;
validator = getValidatorForValue(cfDef, column.getName());
- sessionState.out.printf("=> (column=%s, value=%s, timestamp=%d%s)%n", formatColumnName(keyspace, columnFamily, column),
- validator.getString(column.value), column.timestamp,
- column.isSetTtl() ? String.format(", ttl=%d", column.getTtl()) : "");
+
+ String formattedName = isSuperCF
+ ? formatSubcolumnName(keyspace, columnFamily, column)
+ : formatColumnName(keyspace, columnFamily, column);
+
+ sessionState.out.printf("=> (column=%s, value=%s, timestamp=%d%s)%n",
+ formattedName,
+ validator.getString(column.value),
+ column.timestamp,
+ column.isSetTtl() ? String.format(", ttl=%d", column.getTtl()) : "");
}
}
@@ -461,9 +469,15 @@ public class CliClient extends CliUserHe
valueAsString = (validator == null) ? new String(columnValue, Charsets.UTF_8) : validator.getString(ByteBuffer.wrap(columnValue));
}
+ String formattedColumnName = isSuper
+ ? formatSubcolumnName(keySpace, columnFamily, column)
+ : formatColumnName(keySpace, columnFamily, column);
+
// print results
sessionState.out.printf("=> (column=%s, value=%s, timestamp=%d%s)%n",
- formatColumnName(keySpace, columnFamily, column), valueAsString, column.timestamp,
+ formattedColumnName,
+ valueAsString,
+ column.timestamp,
column.isSetTtl() ? String.format(", ttl=%d", column.getTtl()) : "");
}