You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by tr...@apache.org on 2014/05/15 19:22:48 UTC
svn commit: r1594987 - in
/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark:
AbstractTest.java BenchmarkRunner.java LoginLogoutTest.java
LoginLogoutUserTest.java LoginTest.java LoginUserTest.java
Author: tripod
Date: Thu May 15 17:22:48 2014
New Revision: 1594987
URL: http://svn.apache.org/r1594987
Log:
Adding benchmarks LoginUserTest and LoginLogoutUserTest that use a normal user instead of the special admin
this closes #19
Added:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutUserTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginUserTest.java
Modified:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutTest.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginTest.java
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java?rev=1594987&r1=1594986&r2=1594987&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java Thu May 15 17:22:48 2014
@@ -415,6 +415,16 @@ abstract class AbstractTest<T> extends B
protected Session loginAnonymous() {
return login(new GuestCredentials());
}
+
+ /**
+ * Returns a new admin session that will be automatically closed once
+ * all the iterations of this test have been executed.
+ *
+ * @return admin session
+ */
+ protected Session loginAdministrative() {
+ return login(new SimpleCredentials("admin", "admin".toCharArray()));
+ }
/**
* Returns a new session for the given user
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1594987&r1=1594986&r2=1594987&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java Thu May 15 17:22:48 2014
@@ -122,6 +122,8 @@ public class BenchmarkRunner {
new OrderedIndexInsertNoIndexTest(),
new LoginTest(),
new LoginLogoutTest(),
+ new LoginUserTest(),
+ new LoginLogoutUserTest(),
new NamespaceTest(),
new NamespaceRegistryTest(),
new ReadPropertyTest(),
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutTest.java?rev=1594987&r1=1594986&r2=1594987&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutTest.java Thu May 15 17:22:48 2014
@@ -34,7 +34,7 @@ public class LoginLogoutTest extends Abs
@Override
public void runTest() throws RepositoryException {
Repository repository = getRepository();
- for (int i = 0; i < 1000; i++) {
+ for (int i = 0; i < LoginUserTest.COUNT; i++) {
Session session = repository.login(getCredentials());
try {
session.getRootNode();
Added: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutUserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutUserTest.java?rev=1594987&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutUserTest.java (added)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginLogoutUserTest.java Thu May 15 17:22:48 2014
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.benchmark;
+
+import javax.jcr.Credentials;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+import javax.jcr.security.Privilege;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+import org.apache.jackrabbit.api.security.user.User;
+import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
+
+public class LoginLogoutUserTest extends AbstractTest {
+
+ private final static String USER = "user";
+
+ @Override
+ public void setUp(Repository repository, Credentials credentials) throws Exception {
+ super.setUp(repository, new SimpleCredentials(USER, USER.toCharArray()));
+
+ // create test user
+ JackrabbitSession adminSession = (JackrabbitSession) loginAdministrative();
+ User user = adminSession.getUserManager().createUser(USER, USER);
+ AccessControlUtils.addAccessControlEntry(adminSession, user.getPath(), user.getPrincipal(), new String[]{Privilege.JCR_ALL}, true);
+ AccessControlUtils.addAccessControlEntry(adminSession, "/", user.getPrincipal(), new String[]{Privilege.JCR_ALL}, true);
+ adminSession.save();
+ }
+
+ @Override
+ public void runTest() throws RepositoryException {
+ Repository repository = getRepository();
+ for (int i = 0; i < LoginUserTest.COUNT; i++) {
+ Session session = repository.login(getCredentials());
+ try {
+ session.getRootNode();
+ } finally {
+ session.logout();
+ }
+ }
+ }
+}
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginTest.java?rev=1594987&r1=1594986&r2=1594987&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginTest.java Thu May 15 17:22:48 2014
@@ -24,7 +24,7 @@ import javax.jcr.SimpleCredentials;
public class LoginTest extends AbstractTest {
- private final Session[] sessions = new Session[1000];
+ private final Session[] sessions = new Session[LoginUserTest.COUNT];
@Override
public void setUp(Repository repository, Credentials credentials)
Added: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginUserTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginUserTest.java?rev=1594987&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginUserTest.java (added)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/LoginUserTest.java Thu May 15 17:22:48 2014
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.benchmark;
+
+import javax.jcr.Credentials;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.api.JackrabbitSession;
+
+public class LoginUserTest extends AbstractTest {
+
+ public final static int COUNT = 1000;
+
+ private final static String USER = "user";
+
+ private final Session[] sessions = new Session[COUNT];
+
+ @Override
+ public void setUp(Repository repository, Credentials credentials) throws Exception {
+ super.setUp(repository, new SimpleCredentials(USER, USER.toCharArray()));
+
+ // create test user
+ JackrabbitSession adminSession = (JackrabbitSession) loginAdministrative();
+ adminSession.getUserManager().createUser(USER, USER);
+ adminSession.save();
+ }
+
+ @Override
+ public void runTest() throws RepositoryException {
+ for (int i = 0; i < sessions.length; i++) {
+ sessions[i] = getRepository().login(getCredentials());
+ }
+ }
+
+ @Override
+ public void afterTest() throws RepositoryException {
+ for (Session session : sessions) {
+ session.logout();
+ }
+ }
+
+}