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 8722B10A11 for ; Mon, 21 Oct 2013 22:54:36 +0000 (UTC) Received: (qmail 14701 invoked by uid 500); 21 Oct 2013 22:54:36 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 14606 invoked by uid 500); 21 Oct 2013 22:54:34 -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 14587 invoked by uid 99); 21 Oct 2013 22:54:33 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Oct 2013 22:54:33 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id F2BDB4FAB0; Mon, 21 Oct 2013 22:54:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dbrosius@apache.org To: commits@cassandra.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: remove calculation of unused expected compacted filesize Date: Mon, 21 Oct 2013 22:54:32 +0000 (UTC) Updated Branches: refs/heads/cassandra-1.2 7e057f504 -> a9b403e64 remove calculation of unused expected compacted filesize Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a9b403e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a9b403e6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a9b403e6 Branch: refs/heads/cassandra-1.2 Commit: a9b403e649aaa4de5e28d3bd4c562568d0ae3fbc Parents: 7e057f5 Author: Dave Brosius Authored: Mon Oct 21 18:54:01 2013 -0400 Committer: Dave Brosius Committed: Mon Oct 21 18:54:01 2013 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a9b403e6/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index b34856e..d26a072 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -582,8 +582,7 @@ public class CompactionManager implements CompactionManagerMBean SSTableReader newSstable = null; logger.info("Cleaning up " + sstable); - // Calculate the expected compacted filesize - long expectedRangeFileSize = cfs.getExpectedCompactedFileSize(Arrays.asList(sstable), OperationType.CLEANUP); + File compactionFileLocation = cfs.directories.getDirectoryForNewSSTables(); if (compactionFileLocation == null) throw new IOException("disk full");