svn commit: r1184949 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/cli/CliClient.java

[xedin]

Author: xedin
Date: Sun Oct 16 22:43:17 2011
New Revision: 1184949

URL: http://svn.apache.org/viewvc?rev=1184949&view=rev
Log:
Fix CLI `show schema` to include "compression_options"
patch by Pavel Yaskevich; reviewed by Brandon Williams for CASSANDRA-3368

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

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1184949&r1=1184948&r2=1184949&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Sun Oct 16 22:43:17 2011
@@ -15,7 +15,7 @@
  * Fix handling of tombstone by SSTableExport/Import (CASSANDRA-3357)
  * Only count compaction as active (for throttling) when they have
    successfully acquired the compaction lock (CASSANDRA-3344)
-
+ * Fix CLI `show schema` to include "compression_options" (CASSANDRA-3368)
 
 1.0.0-final
  * close scrubbed sstable fd before deleting it (CASSANDRA-3318)

Modified: 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java?rev=1184949&r1=1184948&r2=1184949&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
 (original)
+++ 
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cli/CliClient.java
 Sun Oct 16 22:43:17 2011
@@ -1688,6 +1688,30 @@ public class CliClient
             colSb.append("]");
             writeAttrRaw(sb, false, "column_metadata", colSb.toString());
         }
+
+        if (cfDef.compression_options != null && 
!cfDef.compression_options.isEmpty())
+        {
+            StringBuilder compOptions = new StringBuilder();
+
+            compOptions.append("{");
+
+            int i = 0, size = cfDef.compression_options.size();
+
+            for (Map.Entry<String, String> entry : 
cfDef.compression_options.entrySet())
+            {
+                compOptions.append(CliUtils.quote(entry.getKey())).append(" : 
").append(CliUtils.quote(entry.getValue()));
+
+                if (i != size - 1)
+                    compOptions.append(", ");
+
+                i++;
+            }
+
+            compOptions.append("}");
+
+            writeAttrRaw(sb, false, "compression_options", 
compOptions.toString());
+        }
+
         sb.append(";");
         sb.append(NEWLINE);
         sb.append(NEWLINE);