Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 48358 invoked from network); 27 Aug 2010 13:25:36 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Aug 2010 13:25:36 -0000 Received: (qmail 42651 invoked by uid 500); 27 Aug 2010 13:25:35 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 42327 invoked by uid 500); 27 Aug 2010 13:25:32 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 42320 invoked by uid 99); 27 Aug 2010 13:25:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Aug 2010 13:25:31 +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, 27 Aug 2010 13:25:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7E0EB238899C; Fri, 27 Aug 2010 13:24:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r990145 - in /jackrabbit/trunk/test/performance: base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java parent/pom.xml Date: Fri, 27 Aug 2010 13:24:10 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100827132410.7E0EB238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Fri Aug 27 13:24:10 2010 New Revision: 990145 URL: http://svn.apache.org/viewvc?rev=990145&view=rev Log: JCR-2699: Improve read/write concurrency ThreeWayJoinTest improvements. Add an option to only run a single test. Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java jackrabbit/trunk/test/performance/parent/pom.xml Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java?rev=990145&r1=990144&r2=990145&view=diff ============================================================================== --- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java (original) +++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java Fri Aug 27 13:24:10 2010 @@ -91,7 +91,7 @@ public abstract class AbstractPerformanc private void runTest( PerformanceTestSuite suite, AbstractTest test, String name) { - String selected = System.getProperty("test"); + String selected = System.getProperty("only"); if (selected != null && !selected.equals(test.toString())) { return; } Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java?rev=990145&r1=990144&r2=990145&view=diff ============================================================================== --- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java (original) +++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java Fri Aug 27 13:24:10 2010 @@ -32,7 +32,7 @@ import javax.jcr.query.RowIterator; */ public class ThreeWayJoinTest extends AbstractTest { - private static final int NODE_COUNT = 50; + private static final int NODE_COUNT = 30; private final Random random = new Random(); @@ -90,11 +90,10 @@ public class ThreeWayJoinTest extends Ab } count++; } - // FIXME: The query returns 125k results instead of the expected 50! - // if (count != NODE_COUNT) { - // throw new Exception( - // "Invalid test result count: " + count + " != " + NODE_COUNT); - // } + if (count != NODE_COUNT * NODE_COUNT * NODE_COUNT) { + throw new Exception( + "Invalid test result count: " + count); + } } public void afterSuite() throws RepositoryException { Modified: jackrabbit/trunk/test/performance/parent/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/parent/pom.xml?rev=990145&r1=990144&r2=990145&view=diff ============================================================================== --- jackrabbit/trunk/test/performance/parent/pom.xml (original) +++ jackrabbit/trunk/test/performance/parent/pom.xml Fri Aug 27 13:24:10 2010 @@ -56,6 +56,10 @@ derby.stream.error.file target/derby.log + + only + ${only} +