jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1453787 - in /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark: BenchmarkRunner.java ReadManyTest.java
Date Thu, 07 Mar 2013 11:49:07 GMT
Author: jukka
Date: Thu Mar  7 11:49:07 2013
New Revision: 1453787

URL: http://svn.apache.org/r1453787
Log:
OAK-641: Improved benchmark tooling

Add some large-scale read benchmarks

Added:
    jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.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=1453787&r1=1453786&r2=1453787&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 Mar  7 11:49:07 2013
@@ -75,7 +75,13 @@ public class BenchmarkRunner {
             new UpdateManyChildNodesTest(),
             new TransientManyChildNodesTest(),
             new WikipediaImport(wikipedia.value(options)),
-            new ManyNodes()
+            new ManyNodes(),
+            ReadManyTest.linear("LinearReadEmpty", 1, ReadManyTest.EMPTY),
+            ReadManyTest.linear("LinearReadFiles", 1, ReadManyTest.FILES),
+            ReadManyTest.linear("LinearReadNodes", 1, ReadManyTest.NODES),
+            ReadManyTest.uniform("UniformReadEmpty", 1, ReadManyTest.EMPTY),
+            ReadManyTest.uniform("UniformReadFiles", 1, ReadManyTest.FILES),
+            ReadManyTest.uniform("UniformReadNodes", 1, ReadManyTest.NODES),
         };
 
         Set<String> argset = Sets.newHashSet(options.nonOptionArguments());

Added: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java?rev=1453787&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
(added)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/ReadManyTest.java
Thu Mar  7 11:49:07 2013
@@ -0,0 +1,179 @@
+/*
+ * 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 java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Random;
+
+import javax.jcr.Binary;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
+import org.apache.jackrabbit.commons.JcrUtils;
+
+import com.google.common.io.ByteStreams;
+import com.google.common.io.NullOutputStream;
+
+abstract class ReadManyTest extends AbstractTest {
+
+    private static final Random RANDOM = new Random(1234567890L);
+
+    public interface Content {
+        void create(Node parent, String name) throws RepositoryException;
+        void read(Node node) throws RepositoryException;
+    }
+
+    public static final Content EMPTY = new Content() {
+        @Override
+        public void create(Node parent, String name) throws RepositoryException {
+            parent.addNode(name);
+        }
+        @Override
+        public void read(Node node) {
+        }
+    };
+
+    public static final Content FILES = new Content() {
+        @Override
+        public void create(Node parent, String name) throws RepositoryException {
+            byte[] randomBytes = new byte[10 * 1024];
+            RANDOM.nextBytes(randomBytes);
+            InputStream stream = new ByteArrayInputStream(randomBytes);
+            JcrUtils.putFile(parent, name, "application/octet-stream", stream);
+        }
+        @Override
+        public void read(Node node) throws RepositoryException {
+            Binary binary = node.getProperty("jcr:content/jcr:data").getBinary();
+            try {
+                InputStream stream = binary.getStream();
+                try {
+                    ByteStreams.copy(stream, new NullOutputStream());
+                } finally {
+                    stream.close();
+                }
+            } catch (IOException e) {
+                throw new RepositoryException("Unexpected IOException", e);
+            } finally {
+                binary.dispose();
+            }
+        }
+    };
+
+    public static final Content NODES = new Content() {
+        @Override
+        public void create(Node parent, String name) throws RepositoryException {
+            Node node = parent.addNode(name);
+            for (int i = 0; i < 10; i++) {
+                char[] randomText = new char[1000];
+                for (int j = 0; j < randomText.length; j++) {
+                    if ((j % 10) != 0) {
+                        randomText[j] = (char) ('a' + RANDOM.nextInt('z' - 'a'));
+                    } else {
+                        randomText[j] = ' ';
+                    }
+                }
+
+                Node child = node.addNode("node" + i);
+                child.setProperty("title", "child" + i);
+                child.setProperty("content", new String(randomText));
+            }
+        }
+        @Override
+        public void read(Node node) throws RepositoryException {
+            for (Node child : JcrUtils.getChildNodes(node)) {
+                child.getProperty("title").getString();
+                child.getProperty("content").getString();
+            }
+        }
+    };
+
+    public static ReadManyTest linear(String name, int scale, Content content) {
+        return new ReadManyTest(name, scale, content) {
+            @Override
+            protected void runTest() throws Exception {
+                Node top = root.getNode("node" + RANDOM.nextInt(scale));
+                Node middle = top.getNode("node" + RANDOM.nextInt(1000));
+                for (Node bottom : JcrUtils.getChildNodes(middle)) {
+                    content.read(bottom);
+                }
+            }
+        };
+    }
+
+    public static ReadManyTest uniform(String name, int scale, Content content) {
+        return new ReadManyTest(name, scale, content) {
+            @Override
+            protected void runTest() throws Exception {
+                for (int i = 0; i < 1000; i++) {
+                    content.read(root
+                            .getNode("node" + RANDOM.nextInt(scale))
+                            .getNode("node" + RANDOM.nextInt(1000))
+                            .getNode("node" + RANDOM.nextInt(1000)));
+                }
+            }
+        };
+    }
+
+    private final String name;
+
+    protected final int scale;
+
+    protected final Content content;
+
+    private Session session;
+
+    protected Node root;
+
+    protected ReadManyTest(String name, int scale, Content content) {
+        this.name = name;
+        this.scale = scale;
+        this.content = content;
+    }
+
+    @Override
+    protected void beforeSuite() throws Exception {
+        session = getRepository().login(getCredentials());
+        root = session.getRootNode().addNode("content");
+        for (int i = 0; i < scale; i++) {
+            Node top = root.addNode("node" + i);
+            for (int j = 0; j < 1000; j++) {
+                Node middle = top.addNode("node" + j);
+                for (int k = 0; k < 1000; k++) {
+                    content.create(middle, "node" + k);
+                }
+                session.save(); // save once every 1k leaf entries
+                System.out.println(j);
+            }
+        }
+    }
+
+    @Override
+    protected void afterSuite() throws Exception {
+        root.remove();
+        session.save();
+        session.logout();
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+}



Mime
View raw message