cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stefa...@apache.org
Subject [01/10] cassandra git commit: Revert CASSANDRA-11427 because of CASSANDRA-12351 (CASSANDRA-12143).
Date Wed, 03 Aug 2016 03:12:15 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 5acfce666 -> f5c9d6e49
  refs/heads/cassandra-3.9 245fc2ade -> 717c6d6bf
  refs/heads/trunk 1d51512ef -> a69d13ba8


Revert CASSANDRA-11427 because of CASSANDRA-12351 (CASSANDRA-12143).


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

Branch: refs/heads/cassandra-3.9
Commit: f28631e0cf1bc6cb6a1bdf7a4fa1f4af720a77b6
Parents: 25159c3
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Aug 2 15:53:19 2016 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Aug 2 15:53:19 2016 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/f28631e0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c18bad7..6f709f7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2.8
+ * Revert CASSANDRA-11427 (CASSANDRA-12351)
  * Wait for tracing events before returning response and query at same consistency level
client side (CASSANDRA-11465)
  * cqlsh copyutil should get host metadata by connected address (CASSANDRA-11979)
  * Fixed cqlshlib.test.remove_test_db (CASSANDRA-12214)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/f28631e0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index ff63163..d0cb200 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2346,10 +2346,6 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
                     removeDroppedColumns(data);
                 }
 
-                // remove purgable tombstones from result - see CASSANDRA-11427
-                if (data != null)
-                    data.purgeTombstones(gcBefore(filter.timestamp));
-
                 rows.add(new Row(rawRow.key, data));
                 if (!ignoreTombstonedPartitions || !data.hasOnlyTombstones(filter.timestamp))
                     matched++;


Mime
View raw message