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:30:45 UTC
svn commit: r986023 - in
/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance:
AbstractPerformanceTest.java ThreeWayJoinTest.java
Author: jukka
Date: Mon Aug 16 16:30:45 2010
New Revision: 986023
URL: http://svn.apache.org/viewvc?rev=986023&view=rev
Log:
JCR-2715: Improved join query performance
Add a three-way join test to the test suite.
Added:
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java (with props)
Modified:
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.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=986023&r1=986022&r2=986023&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:30:45 2010
@@ -79,6 +79,7 @@ public abstract class AbstractPerformanc
runTest(suite, new ConcurrentReadWriteTest(), name);
runTest(suite, new SimpleSearchTest(), name);
runTest(suite, new TwoWayJoinTest(), name);
+ runTest(suite, new ThreeWayJoinTest(), name);
runTest(suite, new CreateManyChildNodesTest(), name);
runTest(suite, new UpdateManyChildNodesTest(), name);
runTest(suite, new TransientManyChildNodesTest(), name);
@@ -86,6 +87,11 @@ public abstract class AbstractPerformanc
private void runTest(
PerformanceTestSuite suite, AbstractTest test, String name) {
+ String selected = System.getProperty("test");
+ if (selected != null && !selected.equals(test.toString())) {
+ return;
+ }
+
try {
DescriptiveStatistics statistics = suite.runTest(test);
Added: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java?rev=986023&view=auto
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java (added)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java Mon Aug 16 16:30:45 2010
@@ -0,0 +1,110 @@
+/*
+ * 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.performance;
+
+import java.util.Random;
+
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.Row;
+import javax.jcr.query.RowIterator;
+
+/**
+ * Performance test for a three-way join that selects 50 triples from
+ * a set of 125k nodes. The query is constructed in a way that should
+ * allow a smart implementation to perform the join quite efficiently.
+ */
+public class ThreeWayJoinTest extends AbstractTest {
+
+ private static final int NODE_COUNT = 50;
+
+ private final Random random = new Random();
+
+ private Session session;
+
+ private Node root;
+
+ public void beforeSuite() throws RepositoryException {
+ String joins = getRepository().getDescriptor("query.joins");
+ if (joins == null || joins.equals("query.joins.none")) {
+ throw new RepositoryException(
+ "Join queries not supported by this repository");
+ }
+
+ session = loginWriter();
+ root = session.getRootNode().addNode("testroot", "nt:unstructured");
+
+ for (int i = 0; i < NODE_COUNT; i++) {
+ Node foo = root.addNode("node" + i, "nt:unstructured");
+ foo.setProperty("foo", i);
+ for (int j = 0; j < NODE_COUNT; j++) {
+ Node bar = foo.addNode("node" + j, "nt:unstructured");
+ bar.setProperty("bar", j);
+ for (int k = 0; k < NODE_COUNT; k++) {
+ Node baz = bar.addNode("node" + k, "nt:unstructured");
+ baz.setProperty("baz", k);
+ }
+ }
+ session.save();
+ }
+ }
+
+ public void runTest() throws Exception {
+ int x = random.nextInt(NODE_COUNT);
+ String query =
+ "SELECT a.foo AS a, b.bar AS b, c.baz AS c"
+ + " FROM [nt:unstructured] AS a"
+ + " INNER JOIN [nt:unstructured] AS b ON a.foo = b.bar"
+ + " INNER JOIN [nt:unstructured] AS c ON b.bar = c.baz"
+ + " WHERE a.foo = " + x;
+
+ QueryManager manager = session.getWorkspace().getQueryManager();
+ RowIterator iterator =
+ manager.createQuery(query, "JCR-SQL2").execute().getRows();
+ int count = 0;
+ while (iterator.hasNext()) {
+ Row row = iterator.nextRow();
+ long a = row.getValue("a").getLong();
+ long b = row.getValue("b").getLong();
+ long c = row.getValue("c").getLong();
+ if (a != x || b != x || c != x) {
+ throw new Exception(
+ "Invalid test result: "
+ + x + " -> " + a + ", " + b + ", " + c);
+ }
+ count++;
+ }
+ // FIXME: The query returns 125k results instead of the expected 50!
+ // if (count != NODE_COUNT) {
+ // throw new Exception(
+ // "Invalid test result count: " + count + " != " + NODE_COUNT);
+ // }
+ }
+
+ public void afterSuite() throws RepositoryException {
+ for (int i = 0; i < NODE_COUNT; i++) {
+ root.getNode("node" + i).remove();
+ session.save();
+ }
+
+ root.remove();
+ session.save();
+ }
+
+}
Propchange: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/ThreeWayJoinTest.java
------------------------------------------------------------------------------
svn:eol-style = native