You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2010/08/27 15:24:10 UTC
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
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 @@
<name>derby.stream.error.file</name>
<value>target/derby.log</value>
</property>
+ <property>
+ <name>only</name>
+ <value>${only}</value>
+ </property>
</systemProperties>
</configuration>
</plugin>