svn commit: r1032093 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java

[jbellis]

Author: jbellis
Date: Sat Nov  6 15:34:47 2010
New Revision: 1032093

URL: http://svn.apache.org/viewvc?rev=1032093&view=rev
Log:
attempt to convert indexed bytestype column names to utf8 in show keyspaces.  
patch by jbellis

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java

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=1032093&r1=1032092&r2=1032093&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
 Sat Nov  6 15:34:47 2010
@@ -1148,6 +1148,18 @@ public class CliClient extends CliUserHe
                     for (ColumnDef columnDef : cf_def.getColumn_metadata())
                     {
                         String columnName = 
columnNameValidator.getString(columnDef.name);
+                        if (columnNameValidator instanceof BytesType)
+                        {
+                            try
+                            {
+                                String columnString = 
UTF8Type.instance.getString(columnDef.name);
+                                columnName = columnString + " (" + columnName 
+ ")";
+                            }
+                            catch (MarshalException e)
+                            {
+                                // guess it wasn't a utf8 column name after all
+                            }
+                        }
 
                         sessionState.out.println(leftSpace + "  Column Name: " 
+ columnName);
                         sessionState.out.println(columnLeftSpace + "Validation 
Class: " + columnDef.getValidation_class());