Return-Path: Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: (qmail 39455 invoked from network); 18 Jan 2011 21:45:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jan 2011 21:45:47 -0000 Received: (qmail 15501 invoked by uid 500); 18 Jan 2011 21:45:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 15402 invoked by uid 500); 18 Jan 2011 21:45:47 -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 15394 invoked by uid 99); 18 Jan 2011 21:45:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 21:45:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jan 2011 21:45:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 271EF23889DA; Tue, 18 Jan 2011 21:45:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1060590 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java Date: Tue, 18 Jan 2011 21:45:23 -0000 To: commits@cassandra.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110118214523.271EF23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Tue Jan 18 21:45:22 2011 New Revision: 1060590 URL: http://svn.apache.org/viewvc?rev=1060590&view=rev Log: add some asserts to doCompaction patch by jbellis Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java?rev=1060590&r1=1060589&r2=1060590&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/CompactionManager.java Tue Jan 18 21:45:22 2011 @@ -362,10 +362,17 @@ public class CompactionManager implement { // The collection of sstables passed may be empty (but not null); even if // it is not empty, it may compact down to nothing if all rows are deleted. + assert sstables != null; + Table table = cfs.table; if (DatabaseDescriptor.isSnapshotBeforeCompaction()) table.snapshot("compact-" + cfs.columnFamily); + + // sanity check: all sstables must belong to the same cfs logger.info("Compacting [" + StringUtils.join(sstables, ",") + "]"); + for (SSTableReader sstable : sstables) + assert sstable.descriptor.cfname.equals(cfs.columnFamily); + String compactionFileLocation = table.getDataFileLocation(cfs.getExpectedCompactedFileSize(sstables)); // If the compaction file path is null that means we have no space left for this compaction. // try again w/o the largest one.