Repository: cassandra Updated Branches: refs/heads/trunk ccc848988 -> ca7256d76
fix jsontransformer for partitions with delete info for CASSANDRA-12418 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa148045 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa148045 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa148045 Branch: refs/heads/trunk Commit: fa14804543e9ed2cc781d9f8511ab7a5c22f8dd7 Parents: cded276 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Sep 4 01:07:13 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Sep 4 01:07:13 2016 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/tools/JsonTransformer.java | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa148045/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 5cf351a..21fc42c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -47,6 +47,7 @@ those static columns in query results (CASSANDRA-12123) * Avoid digest mismatch with empty but static rows (CASSANDRA-12090) * Fix EOF exception when altering column type (CASSANDRA-11820) + * Fix JsonTransformer output of partition with deletion info (CASSANDRA-12418) Merged from 2.2: * Add local address entry in PropertyFileSnitch (CASSANDRA-11332) * cqlshlib tests: increase default execute timeout (CASSANDRA-12481) http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa148045/src/java/org/apache/cassandra/tools/JsonTransformer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/JsonTransformer.java b/src/java/org/apache/cassandra/tools/JsonTransformer.java index 3deed96..590e527 100644 --- a/src/java/org/apache/cassandra/tools/JsonTransformer.java +++ b/src/java/org/apache/cassandra/tools/JsonTransformer.java @@ -193,6 +193,7 @@ public final class JsonTransformer if (!partition.partitionLevelDeletion().isLive()) { serializeDeletion(partition.partitionLevelDeletion()); + json.writeEndObject(); } else {
