You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by th...@apache.org on 2017/06/30 14:22:30 UTC
svn commit: r1800418 - in /jackrabbit/oak/branches/1.4/oak-jcr/src:
main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java
Author: thomasm
Date: Fri Jun 30 14:22:30 2017
New Revision: 1800418
URL: http://svn.apache.org/viewvc?rev=1800418&view=rev
Log:
OAK-6391 With FastQuerySize, getSize() returns -1 if there are exactly 21 rows
Modified:
jackrabbit/oak/branches/1.4/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java
Modified: jackrabbit/oak/branches/1.4/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java?rev=1800418&r1=1800417&r2=1800418&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java (original)
+++ jackrabbit/oak/branches/1.4/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java Fri Jun 30 14:22:30 2017
@@ -118,16 +118,19 @@ public class PrefetchIterator<K> impleme
long nanos = System.nanoTime();
end = nanos + timeout * 1000 * 1000;
}
- while (position <= maxPrefetch) {
+ while (true) {
+ if (!it.hasNext()) {
+ size = position;
+ break;
+ }
+ if (position > maxPrefetch) {
+ break;
+ }
if (position > minPrefetch) {
if (end == 0 || System.nanoTime() > end) {
break;
}
}
- if (!it.hasNext()) {
- size = position;
- break;
- }
position++;
list.add(it.next());
}
Modified: jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java?rev=1800418&r1=1800417&r2=1800418&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java Fri Jun 30 14:22:30 2017
@@ -24,6 +24,8 @@ import static org.junit.Assert.fail;
import java.util.Iterator;
import java.util.NoSuchElementException;
+import org.apache.jackrabbit.oak.api.Result;
+import org.apache.jackrabbit.oak.api.ResultRow;
import org.apache.jackrabbit.oak.jcr.query.PrefetchIterator.PrefetchOptions;
import org.junit.Test;
@@ -33,6 +35,52 @@ import org.junit.Test;
public class PrefetchIteratorTest {
@Test
+ public void testFastSize() {
+ Iterable<Integer> s;
+ PrefetchIterator<Integer> it;
+ s = seq(0, 21);
+ it = new PrefetchIterator<Integer>(s.iterator(),
+ new PrefetchOptions() { {
+ size = -1;
+ fastSize = true;
+ fastSizeCallback = new Result() {
+
+ @Override
+ public String[] getColumnNames() {
+ return null;
+ }
+
+ @Override
+ public String[] getColumnSelectorNames() {
+ return null;
+ }
+
+ @Override
+ public Iterable<? extends ResultRow> getRows() {
+ return null;
+ }
+
+ @Override
+ public String[] getSelectorNames() {
+ return null;
+ }
+
+ @Override
+ public long getSize() {
+ return 100;
+ }
+
+ @Override
+ public long getSize(SizePrecision precision, long max) {
+ return 100;
+ }
+
+ };
+ } });
+ assertEquals(21, it.size());
+ }
+
+ @Test
public void testKnownSize() {
Iterable<Integer> s;
PrefetchIterator<Integer> it;
@@ -106,7 +154,7 @@ public class PrefetchIteratorTest {
}
String m = "s:" + size + " b:" + readBefore;
int max = testTimeout <= 0 ? 20 : 30;
- if (size > max && readBefore <= size) {
+ if (size > max && readBefore < size) {
assertEquals(m, -1, it.size());
// calling it twice must not change the result
assertEquals(m, -1, it.size());