svn commit: r1857636 - in /jackrabbit/oak/branches/1.10: ./ oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsNodeTypeTest.java

[stillalex]

Author: stillalex
Date: Tue Apr 16 09:52:27 2019
New Revision: 1857636

URL: http://svn.apache.org/viewvc?rev=1857636&view=rev
Log:
OAK-8247 Add non-admin mode for Node.isNodeType() benchmark
 backport to 1.10


Modified:
    jackrabbit/oak/branches/1.10/   (props changed)
    
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
    
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsNodeTypeTest.java

Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 16 09:52:27 2019
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857577,1857635
 /jackrabbit/trunk:1345480

Modified: 
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1857636&r1=1857635&r2=1857636&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
 Tue Apr 16 09:52:27 2019
@@ -499,7 +499,7 @@ public class BenchmarkRunner {
             new StringWriteTest(),
             new BasicWriteTest(),
             new CanReadNonExisting(),
-            new IsNodeTypeTest(),
+            new IsNodeTypeTest(runAsAdmin.value(options)),
             new SetPropertyTransientTest()
         };
 

Modified: 
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsNodeTypeTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsNodeTypeTest.java?rev=1857636&r1=1857635&r2=1857636&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsNodeTypeTest.java
 (original)
+++ 
jackrabbit/oak/branches/1.10/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/IsNodeTypeTest.java
 Tue Apr 16 09:52:27 2019
@@ -16,9 +16,15 @@
  */
 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 static org.junit.Assert.assertTrue;
+
 import javax.jcr.Node;
 import javax.jcr.Session;
 
+import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
+
 /**
  * Benchmark for Node.isNodeType(String).
  */
@@ -26,14 +32,21 @@ public class IsNodeTypeTest extends Abst
 
     private static final String NT_FOLDER = "nt:folder";
 
+    private final boolean runAsAdmin;
+
     private String testNodeName = "test" + TEST_ID;
 
     private Node testNode;
 
+    public IsNodeTypeTest(boolean runAsAdmin) {
+        this.runAsAdmin = runAsAdmin;
+    }
+
     @Override
     public void beforeSuite() throws Exception {
         Session session = getRepository().login(getCredentials());
         session.getRootNode().addNode(testNodeName, NT_FOLDER);
+        addAccessControlEntry(session, "/", EveryonePrincipal.getInstance(), 
new String[] { JCR_READ }, true);
         session.save();
         session.logout();
         testNode = prepareThreadExecutionContext();
@@ -50,7 +63,15 @@ public class IsNodeTypeTest extends Abst
 
     @Override
     protected Node prepareThreadExecutionContext() throws Exception {
-        return loginWriter().getRootNode().getNode(testNodeName);
+        return getTestSession().getRootNode().getNode(testNodeName);
+    }
+
+    private Session getTestSession() {
+        if (runAsAdmin) {
+            return loginWriter();
+        } else {
+            return loginAnonymous();
+        }
     }
 
     @Override
@@ -62,7 +83,7 @@ public class IsNodeTypeTest extends Abst
     @Override
     protected void runTest(Node executionContext) throws Exception {
         for (int i = 0; i < 100000; i++) {
-            executionContext.isNodeType(NT_FOLDER);
+            assertTrue(executionContext.isNodeType(NT_FOLDER));
         }
     }