Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 435EAC3CF for ; Wed, 12 Mar 2014 16:58:45 +0000 (UTC) Received: (qmail 36374 invoked by uid 500); 12 Mar 2014 16:58:44 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 36348 invoked by uid 500); 12 Mar 2014 16:58:44 -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 36329 invoked by uid 99); 12 Mar 2014 16:58:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Mar 2014 16:58:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9D3619421D6; Wed, 12 Mar 2014 16:58:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aleksey@apache.org To: commits@cassandra.apache.org Date: Wed, 12 Mar 2014 16:58:43 -0000 Message-Id: <40f1023068674bd2884da08205ea7f39@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: Restore expiring->deleted (cell) compaction optimization Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 2e00ba8bf -> cf9ae5f9c Restore expiring->deleted (cell) compaction optimization patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for CASSANDRA-6844 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/19444ea1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/19444ea1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/19444ea1 Branch: refs/heads/cassandra-2.1 Commit: 19444ea1655d76db11a8048c4ecde81f305018c9 Parents: ed93ad4 Author: Aleksey Yeschenko Authored: Wed Mar 12 19:37:40 2014 +0300 Committer: Aleksey Yeschenko Committed: Wed Mar 12 19:37:40 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/SSTableIdentityIterator.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/19444ea1/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 906f91f..42dc4ee 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,7 @@ * Fix trigger mutations when base mutation list is immutable (CASSANDRA-6790) * Fix accounting in FileCacheService to allow re-using RAR (CASSANDRA-6838) * Fix static counter columns (CASSANDRA-6827) + * Restore expiring->deleted (cell) compaction optimization (CASSANDRA-6844) 2.0.6 http://git-wip-us.apache.org/repos/asf/cassandra/blob/19444ea1/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java index 4e23ac2..52da9bb 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java @@ -102,7 +102,7 @@ public class SSTableIdentityIterator implements Comparable