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 13:21:49 UTC
svn commit: r1800406 - in /jackrabbit/oak/branches/1.6: ./
oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java
Author: thomasm
Date: Fri Jun 30 13:21:49 2017
New Revision: 1800406
URL: http://svn.apache.org/viewvc?rev=1800406&view=rev
Log:
OAK-6391 With FastQuerySize, getSize() returns -1 if there are exactly 21 rows
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 30 13:21:49 2017
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785838,1785919,1785946,1787074,1787145,1787217,1787425,1788056,1788378,1788387-1788389,1788850,1789056,1789534,1790382,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1798035,1798834,1799924
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java?rev=1800406&r1=1800405&r2=1800406&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java (original)
+++ jackrabbit/oak/branches/1.6/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIterator.java Fri Jun 30 13:21:49 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.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java?rev=1800406&r1=1800405&r2=1800406&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java (original)
+++ jackrabbit/oak/branches/1.6/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/PrefetchIteratorTest.java Fri Jun 30 13:21:49 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());