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 D113417602 for ; Thu, 1 Oct 2015 13:37:16 +0000 (UTC) Received: (qmail 251 invoked by uid 500); 1 Oct 2015 13:37:11 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 218 invoked by uid 500); 1 Oct 2015 13:37:11 -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 207 invoked by uid 99); 1 Oct 2015 13:37:11 -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; Thu, 01 Oct 2015 13:37:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7D1CEE08CE; Thu, 1 Oct 2015 13:37:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cassandra git commit: Update compaction progress when getting the next partition, not row Date: Thu, 1 Oct 2015 13:37:11 +0000 (UTC) Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 80355a105 -> 4bb56c4f3 Update compaction progress when getting the next partition, not row Patch by marcuse; reviewed by tjake for CASSANDRA-10427 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bb56c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bb56c4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4bb56c4f Branch: refs/heads/cassandra-3.0 Commit: 4bb56c4f33d10e304da38509ac848305814e6050 Parents: 80355a1 Author: Marcus Eriksson Authored: Thu Oct 1 08:48:24 2015 +0200 Committer: Marcus Eriksson Committed: Thu Oct 1 15:34:58 2015 +0200 ---------------------------------------------------------------------- .../cassandra/db/partitions/PurgingPartitionIterator.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4bb56c4f/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java b/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java index e53e17b..5c7f6f4 100644 --- a/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java +++ b/src/java/org/apache/cassandra/db/partitions/PurgingPartitionIterator.java @@ -85,6 +85,7 @@ public abstract class PurgingPartitionIterator extends WrappingUnfilteredPartiti { UnfilteredRowIterator toReturn = next; next = null; + updateProgress(); return toReturn; } @@ -140,14 +141,6 @@ public abstract class PurgingPartitionIterator extends WrappingUnfilteredPartiti return purger.shouldPurge(((RangeTombstoneBoundMarker)marker).deletionTime()) ? null : marker; } } - - @Override - public Unfiltered next() - { - Unfiltered next = super.next(); - updateProgress(); - return next; - } }; } };