Updated Branches: refs/heads/cassandra-1.2 27efded38 -> 089f92b1a
src/java/org/apache/cassandra/tools/SSTableExport.java patch by clohfink reviewed by dbrosius for cassandra-5781 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/089f92b1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/089f92b1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/089f92b1 Branch: refs/heads/cassandra-1.2 Commit: 089f92b1a04cbcc7d391ea7e61d90df56174ad73 Parents: 27efded Author: Dave Brosius <dbros...@apache.org> Authored: Sat Jul 20 15:12:54 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Sat Jul 20 15:12:54 2013 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/SSTableExport.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/089f92b1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index f8a3f09..23f19d4 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,7 @@ * Fix minor bug in Range.intersects(Bound) (CASSANDRA-5771) * cqlsh: handle disabled compression in DESCRIBE output (CASSANDRA-5766) * Ensure all UP events are notified on the native protocol (CASSANDRA-5769) + * Fix formatting of sstable2json with multiple -k arguments (CASSANDRA-5781) 1.2.6 http://git-wip-us.apache.org/repos/asf/cassandra/blob/089f92b1/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java index d3fca4c..05fe9f6 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@ -355,12 +355,11 @@ public class SSTableExport if (!row.getKey().equals(decoratedKey)) continue; - serializeRow(row, decoratedKey, outs); - if (i != 0) outs.println(","); - i++; + + serializeRow(row, decoratedKey, outs); } outs.println("\n]");
