You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2010/10/04 12:48:59 UTC
svn commit: r1004194 - in /jackrabbit/trunk:
jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/
test/performance/base/src/main/java/org/apache/jackrabbit/performance/
Author: mreutegg
Date: Mon Oct 4 10:48:58 2010
New Revision: 1004194
URL: http://svn.apache.org/viewvc?rev=1004194&view=rev
Log:
JCR-2764: JackrabbitIndexReader prevents use of DocNumberCache
Added:
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PathBasedQueryTest.java (with props)
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitIndexReader.java
jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/AbstractPerformanceTest.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitIndexReader.java?rev=1004194&r1=1004193&r2=1004194&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitIndexReader.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitIndexReader.java Mon Oct 4 10:48:58 2010
@@ -19,6 +19,8 @@ package org.apache.jackrabbit.core.query
import org.apache.lucene.index.FilterIndexReader;
import org.apache.lucene.index.IndexReader;
import org.apache.jackrabbit.core.id.NodeId;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.index.TermDocs;
import java.io.IOException;
@@ -64,6 +66,15 @@ public final class JackrabbitIndexReader
this.reader = (MultiIndexReader) in;
}
+ /**
+ * Overwrite <code>termDocs(Term)</code> and forward the call to the
+ * wrapped reader.
+ */
+ @Override
+ public TermDocs termDocs(Term term) throws IOException {
+ return in.termDocs(term);
+ }
+
//--------------------------< FilterIndexReader >---------------------------
/**
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=1004194&r1=1004193&r2=1004194&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 Oct 4 10:48:58 2010
@@ -111,6 +111,7 @@ public abstract class AbstractPerformanc
runTest(new UpdateManyChildNodesTest(), name, conf);
runTest(new TransientManyChildNodesTest(), name, conf);
runTest(new CreateUserTest(), name, conf);
+ runTest(new PathBasedQueryTest(), name, conf);
try {
runTest(new AddGroupMembersTest(), name, conf);
runTest(new GroupMemberLookupTest(), name, conf);
Added: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PathBasedQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PathBasedQueryTest.java?rev=1004194&view=auto
==============================================================================
--- jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PathBasedQueryTest.java (added)
+++ jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PathBasedQueryTest.java Mon Oct 4 10:48:58 2010
@@ -0,0 +1,66 @@
+/*
+ * 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 javax.jcr.Node;
+import javax.jcr.Session;
+import javax.jcr.query.Query;
+import javax.jcr.query.QueryManager;
+
+/**
+ * <code>PathBasedQueryTest</code> implements a performance test executing a
+ * query that has a path constraint with low selectivity, whereas the predicate
+ * is very selective.
+ */
+public class PathBasedQueryTest extends AbstractTest {
+
+ private Session session;
+
+ private Node root;
+
+ @Override
+ protected void beforeSuite() throws Exception {
+ session = getRepository().login(getCredentials());
+ root = session.getRootNode().addNode(
+ getClass().getSimpleName(), "nt:unstructured");
+ int count = 0;
+ for (int i = 0; i < 5; i++) {
+ Node n = root.addNode("node-" + i);
+ for (int j = 0; j < 100; j++) {
+ n.addNode("node-" + j).setProperty("count", count++);
+ }
+ }
+ session.save();
+ }
+
+ @Override
+ protected void runTest() throws Exception {
+ QueryManager qm = session.getWorkspace().getQueryManager();
+ Query q = qm.createQuery("/jcr:root" + root.getPath() + "/*/*[@count = 250]",
+ Query.XPATH);
+ for (int i = 0; i < 10; i++) {
+ q.execute().getNodes().nextNode();
+ }
+ }
+
+ @Override
+ protected void afterSuite() throws Exception {
+ root.remove();
+ session.save();
+ session.logout();
+ }
+}
Propchange: jackrabbit/trunk/test/performance/base/src/main/java/org/apache/jackrabbit/performance/PathBasedQueryTest.java
------------------------------------------------------------------------------
svn:eol-style = native