cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [1/3] cassandra git commit: Fix sstabledump not showing cells after tombstone marker
Date Tue, 26 Apr 2016 13:07:57 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 bf7d4334e -> 049d70c2e
  refs/heads/trunk 16ea55b0e -> 300730790


Fix sstabledump not showing cells after tombstone marker

patch by yukim; reviewed by clohfink for CASSANDRA-11654


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

Branch: refs/heads/cassandra-3.0
Commit: 049d70c2e6654317978f23b6901dff524f5d1674
Parents: bf7d433
Author: Yuki Morishita <yukim@apache.org>
Authored: Tue Apr 26 08:06:56 2016 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Tue Apr 26 08:06:56 2016 -0500

----------------------------------------------------------------------
 CHANGES.txt                                              |  1 +
 src/java/org/apache/cassandra/tools/JsonTransformer.java | 11 ++++-------
 2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/049d70c2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 7d6760b..11bbbed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0.6
+ * Fix sstabledump not showing cells after tombstone marker (CASSANDRA-11654)
  * Ignore all LocalStrategy keyspaces for streaming and other related
    operations (CASSANDRA-11627)
  * Ensure columnfilter covers indexed columns for thrift 2i queries (CASSANDRA-11523)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/049d70c2/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 7b0ec5d..93bb686 100644
--- a/src/java/org/apache/cassandra/tools/JsonTransformer.java
+++ b/src/java/org/apache/cassandra/tools/JsonTransformer.java
@@ -263,13 +263,10 @@ public final class JsonTransformer
                 json.writeEndObject();
                 objectIndenter.setCompact(false);
             }
-            else
-            {
-                json.writeFieldName("cells");
-                json.writeStartArray();
-                row.cells().forEach(c -> serializeCell(c, liveInfo));
-                json.writeEndArray();
-            }
+            json.writeFieldName("cells");
+            json.writeStartArray();
+            row.cells().forEach(c -> serializeCell(c, liveInfo));
+            json.writeEndArray();
             json.writeEndObject();
         }
         catch (IOException e)


Mime
View raw message