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 2FB83E1F3 for ; Wed, 19 Dec 2012 02:48:09 +0000 (UTC) Received: (qmail 40916 invoked by uid 500); 19 Dec 2012 02:48:08 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 40650 invoked by uid 500); 19 Dec 2012 02:48:07 -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 40127 invoked by uid 99); 19 Dec 2012 02:48:06 -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, 19 Dec 2012 02:48:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3DE3D81ECFD; Wed, 19 Dec 2012 02:48:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [10/13] git commit: add one more compactedRow.close on empty (#4492) Message-Id: <20121219024806.3DE3D81ECFD@tyr.zones.apache.org> Date: Wed, 19 Dec 2012 02:48:06 +0000 (UTC) add one more compactedRow.close on empty (#4492) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e792187b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e792187b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e792187b Branch: refs/heads/cassandra-1.2.0 Commit: e792187bce376756284f784ef6c66e8d4331cef1 Parents: 82db566 Author: Jonathan Ellis Authored: Tue Dec 18 20:47:36 2012 -0600 Committer: Jonathan Ellis Committed: Tue Dec 18 20:47:36 2012 -0600 ---------------------------------------------------------------------- .../db/compaction/ParallelCompactionIterable.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e792187b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java index fc52393..933b44c 100644 --- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java @@ -115,6 +115,14 @@ public class ParallelCompactionIterable extends AbstractCompactionIterable if (compactedRow.isEmpty()) { controller.invalidateCachedRow(compactedRow.key); + try + { + compactedRow.close(); + } + catch (IOException e) + { + throw new RuntimeException(e); + } return null; } else