Return-Path: Delivered-To: apmail-incubator-cassandra-commits-archive@minotaur.apache.org Received: (qmail 83565 invoked from network); 28 Aug 2009 03:06:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Aug 2009 03:06:14 -0000 Received: (qmail 1899 invoked by uid 500); 28 Aug 2009 03:06:14 -0000 Delivered-To: apmail-incubator-cassandra-commits-archive@incubator.apache.org Received: (qmail 1862 invoked by uid 500); 28 Aug 2009 03:06:14 -0000 Mailing-List: contact cassandra-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cassandra-dev@incubator.apache.org Delivered-To: mailing list cassandra-commits@incubator.apache.org Received: (qmail 1852 invoked by uid 99); 28 Aug 2009 03:06:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Aug 2009 03:06:13 +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; Fri, 28 Aug 2009 03:06:10 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC20B23888C5; Fri, 28 Aug 2009 03:05:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r808742 - /incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java Date: Fri, 28 Aug 2009 03:05:49 -0000 To: cassandra-commits@incubator.apache.org From: jbellis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090828030549.DC20B23888C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jbellis Date: Fri Aug 28 03:05:49 2009 New Revision: 808742 URL: http://svn.apache.org/viewvc?rev=808742&view=rev Log: call doAntiCompaction in the tests the same way we do in the actual code -- by submitting it to the MinorCompactionManager so it serializes with other compaction tasks. patch by Sandeep Tata; reviewed by jbellis for CASSANDRA-395 Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java Modified: incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java?rev=808742&r1=808741&r2=808742&view=diff ============================================================================== --- incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java (original) +++ incubator/cassandra/trunk/test/unit/org/apache/cassandra/db/BootstrapTest.java Fri Aug 28 03:05:49 2009 @@ -60,7 +60,7 @@ Range r = new Range(partitioner.getToken("0"), partitioner.getToken("zzzzzzz")); ranges.add(r); - boolean result = store.doAntiCompaction(ranges, new EndPoint("127.0.0.1", 9150), fileList); + boolean result = store.forceCompaction(ranges, new EndPoint("127.0.0.1", 9150), 0, fileList); assertEquals(true, result); // some keys should have qualified assertEquals(true, fileList.size() >= 3); //Data, index, filter files