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/16 18:29:04 UTC
svn commit: r986019 -
/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/
Author: jukka
Date: Mon Aug 16 16:29:04 2010
New Revision: 986019
URL: http://svn.apache.org/viewvc?rev=986019&view=rev
Log:
JCR-2715: Improved join query performance
Add the two-way joint test to the test suite.
Various minor improvements.
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/BigFileReadTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java
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=986019&r1=986018&r2=986019&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 Mon Aug 16 16:29:04 2010
@@ -78,6 +78,7 @@ public abstract class AbstractPerformanc
runTest(suite, new ConcurrentReadTest(), name);
runTest(suite, new ConcurrentReadWriteTest(), name);
runTest(suite, new SimpleSearchTest(), name);
+ runTest(suite, new TwoWayJoinTest(), name);
runTest(suite, new CreateManyChildNodesTest(), name);
runTest(suite, new UpdateManyChildNodesTest(), name);
runTest(suite, new TransientManyChildNodesTest(), name);
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileReadTest.java Mon Aug 16 16:29:04 2010
@@ -71,8 +71,4 @@ public class BigFileReadTest extends Abs
session.logout();
}
- public String toString() {
- return "read a " + FILE_SIZE + "MB file";
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/BigFileWriteTest.java Mon Aug 16 16:29:04 2010
@@ -31,7 +31,7 @@ public class BigFileWriteTest extends Ab
private Node file;
public void beforeSuite() throws RepositoryException {
- session = getRepository().login(getCredentials());
+ session = loginWriter();
}
public void runTest() throws RepositoryException {
@@ -50,12 +50,4 @@ public class BigFileWriteTest extends Ab
session.save();
}
- public void afterSuite() throws RepositoryException {
- session.logout();
- }
-
- public String toString() {
- return "write a " + FILE_SIZE + "MB file";
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/CreateManyChildNodesTest.java Mon Aug 16 16:29:04 2010
@@ -31,7 +31,7 @@ public class CreateManyChildNodesTest ex
private Session session;
public void beforeSuite() throws RepositoryException {
- session = getRepository().login(getCredentials());
+ session = loginWriter();
}
public void beforeTest() throws RepositoryException {
@@ -50,8 +50,4 @@ public class CreateManyChildNodesTest ex
session.save();
}
- public void afterSuite() throws RepositoryException {
- session.logout();
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginLogoutTest.java Mon Aug 16 16:29:04 2010
@@ -26,8 +26,4 @@ public class LoginLogoutTest extends Abs
}
}
- public String toString() {
- return "1000 x login().logout()";
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/LoginTest.java Mon Aug 16 16:29:04 2010
@@ -35,8 +35,4 @@ public class LoginTest extends AbstractT
}
}
- public String toString() {
- return "1000 x login()";
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/RefreshTest.java Mon Aug 16 16:29:04 2010
@@ -37,8 +37,4 @@ public class RefreshTest extends Abstrac
session.logout();
}
- public String toString() {
- return "1 000 000 x refresh(false)";
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileReadTest.java Mon Aug 16 16:29:04 2010
@@ -71,8 +71,4 @@ public class SmallFileReadTest extends A
session.logout();
}
- public String toString() {
- return FILE_COUNT + " x read a " + FILE_SIZE + "kB file";
- }
-
}
Modified: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java?rev=986019&r1=986018&r2=986019&view=diff
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java (original)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/SmallFileWriteTest.java Mon Aug 16 16:29:04 2010
@@ -33,7 +33,7 @@ public class SmallFileWriteTest extends
private Node root;
public void beforeSuite() throws RepositoryException {
- session = getRepository().login(getCredentials());
+ session = loginWriter();
}
public void beforeTest() throws RepositoryException {
@@ -57,12 +57,4 @@ public class SmallFileWriteTest extends
session.save();
}
- public void afterSuite() throws RepositoryException {
- session.logout();
- }
-
- public String toString() {
- return FILE_COUNT + " x write a " + FILE_SIZE + "kB file";
- }
-
}