Author: thomasm
Date: Fri Oct 23 09:34:43 2015
New Revision: 1710157
URL: http://svn.apache.org/viewvc?rev=1710157&view=rev
Log:
OAK-2689 Test failure: QueryResultTest.testGetSize
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
jackrabbit/oak/trunk/oak-lucene/pom.xml
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java?rev=1710157&r1=1710156&r2=1710157&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
Fri Oct 23 09:34:43 2015
@@ -182,6 +182,18 @@ public class PrefetchIterator<K> impleme
*/
Result fastSizeCallback;
+ {
+ String s = System.getProperty("oak.queryMinPrefetch");
+ if (s != null) {
+ try {
+ min = Integer.parseInt(s);
+ max = Math.max(min, max);
+ } catch (Exception e) {
+ // ignore
+ }
+ }
+ }
+
}
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java?rev=1710157&r1=1710156&r2=1710157&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryJcrTestIT.java
Fri Oct 23 09:34:43 2015
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr.query;
+import junit.extensions.TestSetup;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.apache.jackrabbit.core.query.ChildAxisQueryTest;
@@ -56,7 +57,16 @@ public class QueryJcrTestIT extends TCKB
}
public static Test suite() {
- return new QueryJcrTestIT();
+ return new TestSetup(new QueryJcrTestIT()) {
+ @Override
+ protected void setUp() throws Exception {
+ System.setProperty("oak.queryMinPrefetch", "1000");
+ }
+ @Override
+ protected void tearDown() throws Exception {
+ System.clearProperty("oak.queryMinPrefetch");
+ }
+ };
}
@Override
Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1710157&r1=1710156&r2=1710157&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Fri Oct 23 09:34:43 2015
@@ -43,7 +43,6 @@
org.apache.jackrabbit.core.query.ExcerptTest#testPunctuationStartsFragmentEndsWithDots
<!-- OAK-318 -->
org.apache.jackrabbit.core.query.ExcerptTest#testPreferPhrase
<!-- OAK-318 -->
org.apache.jackrabbit.core.query.QueryResultTest#testSkip
<!-- OAK-484 -->
- org.apache.jackrabbit.core.query.QueryResultTest#testGetSize
<!-- OAK-2689 -->
org.apache.jackrabbit.core.query.DerefTest#testDeref
<!-- OAK-321 -->
org.apache.jackrabbit.core.query.DerefTest#testDerefInPredicate
<!-- OAK-321 -->
org.apache.jackrabbit.core.query.DerefTest#testRewrite
<!-- OAK-321 -->
