cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [9/10] git commit: suppress output of index_options when empty
Date Fri, 07 Dec 2012 17:44:37 GMT
suppress output of index_options when empty


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ac90589
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ac90589
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ac90589

Branch: refs/heads/cassandra-1.2.0
Commit: 1ac90589ead4b95a922d783ead75412dd46c0f28
Parents: 8d55474
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Dec 7 11:23:44 2012 -0600
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Dec 7 11:39:32 2012 -0600

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cli/CliClient.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ac90589/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index b32b0f7..a7e8d92 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -1822,7 +1822,7 @@ public class CliClient
                   .append(TAB + TAB + "index_name : '" + CliUtils.escapeSQLString(colDef.index_name)
+ "'," + NEWLINE)
                   .append(TAB + TAB + "index_type : " + CliUtils.escapeSQLString(Integer.toString(colDef.index_type.getValue())));
 
-            if (colDef.index_options != null)
+            if (colDef.index_options != null && !colDef.index_options.isEmpty())
             {
                 output.append(",").append(NEWLINE);
                 output.append(TAB + TAB + "index_options : {" + NEWLINE);


Mime
View raw message