Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4E5F6200B65 for ; Tue, 2 Aug 2016 15:55:11 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4CDCE160A65; Tue, 2 Aug 2016 13:55:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9321E160A76 for ; Tue, 2 Aug 2016 15:55:10 +0200 (CEST) Received: (qmail 99877 invoked by uid 500); 2 Aug 2016 13:55:09 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 99619 invoked by uid 99); 2 Aug 2016 13:55:09 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2016 13:55:09 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 89BF9E5CE0; Tue, 2 Aug 2016 13:55:09 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Tue, 02 Aug 2016 13:55:10 -0000 Message-Id: <47fccf6e34ec4bad86ad25feba49f12c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] cassandra git commit: Revert CASSANDRA-11427 because of CASSANDRA-12351 (CASSANDRA-12143). archived-at: Tue, 02 Aug 2016 13:55:11 -0000 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.0 Commit: f28631e0cf1bc6cb6a1bdf7a4fa1f4af720a77b6 Parents: 25159c3 Author: Sylvain Lebresne Authored: Tue Aug 2 15:53:19 2016 +0200 Committer: Sylvain Lebresne 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++;