jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1523686 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: BenchmarkRunner.java getNodeTest.java
Date Mon, 16 Sep 2013 14:51:22 GMT
Author: mduerig
Date: Mon Sep 16 14:51:22 2013
New Revision: 1523686

URL: http://svn.apache.org/r1523686
Log:
OAK-663: oak-jcr performance optimization
Add benchmark for getNode

Added:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/getNodeTest.java
Modified:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java

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=1523686&r1=1523685&r2=1523686&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
Mon Sep 16 14:51:22 2013
@@ -20,18 +20,16 @@ import java.io.File;
 import java.util.List;
 import java.util.Set;
 
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
-
 import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
 import org.apache.jackrabbit.oak.fixture.JackrabbitRepositoryFixture;
 import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
 
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
 public class BenchmarkRunner {
 
     private static final long MB = 1024 * 1024;
@@ -77,6 +75,8 @@ public class BenchmarkRunner {
             new LoginLogoutTest(),
             new NamespaceTest(),
             new ReadPropertyTest(),
+            GetNodeTest.withAdmin(),
+            GetNodeTest.withAnonymous(),
             new SetPropertyTest(),
             new SmallFileReadTest(),
             new SmallFileWriteTest(),

Added: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/getNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/getNodeTest.java?rev=1523686&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/getNodeTest.java
(added)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/getNodeTest.java
Mon Sep 16 14:51:22 2013
@@ -0,0 +1,99 @@
+/*
+ * 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 static javax.jcr.security.Privilege.JCR_READ;
+import static org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils.addAccessControlEntry;
+
+import javax.jcr.Node;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.core.security.principal.EveryonePrincipal;
+
+/**
+ * {@code GetNodeTest} implements a performance test, which reads
+ * nodes from the repository. To determine the effect of access control
+ * evaluation the test can either run with anonymous or with admin.
+ */
+public abstract class GetNodeTest extends AbstractTest {
+    private final String name;
+
+    private Node testRoot;
+
+    public static Benchmark withAdmin() {
+        return new GetNodeTest("GetNodeWithAdmin") {
+            @Override
+            protected Session login() {
+                return loginWriter();
+            }
+        };
+    }
+
+    public static Benchmark withAnonymous() {
+        return new GetNodeTest("GetNodeWithAnonymous") {
+            @Override
+            protected Session login() {
+                return loginAnonymous();
+            }
+        };
+    }
+
+    protected GetNodeTest(String name) {
+        this.name = name;
+    }
+
+    protected abstract Session login();
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    @Override
+    protected void beforeSuite() throws Exception {
+        Session session = loginWriter();
+        testRoot = session.getRootNode().addNode(GetNodeTest.class.getSimpleName(), "nt:unstructured");
+        testRoot.addNode("node1").addNode("node2");
+
+        addAccessControlEntry(session, testRoot.getPath(), EveryonePrincipal.getInstance(),
+                new String[] {JCR_READ}, true);
+        session.save();
+
+        testRoot = login().getNode(testRoot.getPath());
+        session.logout();
+    }
+
+    @Override
+    protected void runTest() throws Exception {
+        for (int i = 0; i < 10000; i++) {
+            testRoot.getNode("node1").getNode("node2");
+            testRoot.getNode("node1/node2");
+            testRoot.hasNode("node-does-not-exist");
+        }
+    }
+
+    @Override
+    protected void afterSuite() throws Exception {
+        Session session = loginWriter();
+        session.getNode(testRoot.getPath()).remove();
+        testRoot.getSession().logout();
+        session.save();
+        session.logout();
+    }
+}



Mime
View raw message