You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/30 16:20:40 UTC
[04/34] git commit: Fixed off by 1 issue with loading too many pages.
Fixed off by 1 issue with loading too many pages.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/ba1f456e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/ba1f456e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/ba1f456e
Branch: refs/pull/39/merge
Commit: ba1f456ef13f5cd44595c185e20a32b7eaead279
Parents: b5492f9
Author: Todd Nine <tn...@apigee.com>
Authored: Tue Jan 21 13:45:31 2014 -0800
Committer: Todd Nine <tn...@apigee.com>
Committed: Tue Jan 21 13:45:31 2014 -0800
----------------------------------------------------------------------
.../org/usergrid/persistence/query/ir/result/SliceIterator.java | 2 +-
.../org/usergrid/persistence/query/ir/result/UnionIterator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ba1f456e/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
index 6cc833d..855a844 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/SliceIterator.java
@@ -125,7 +125,7 @@ public class SliceIterator implements ResultIterator {
/**
* Skip the first value, it's from the previous cursor
*/
- if ( skipFirst && pagesLoaded == 0 && results.hasNext() ) {
+ if ( skipFirst && results.hasNext() ) {
results.next();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/ba1f456e/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
index 00e90b8..c7b31d1 100644
--- a/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
+++ b/stack/core/src/main/java/org/usergrid/persistence/query/ir/result/UnionIterator.java
@@ -165,7 +165,7 @@ public class UnionIterator extends MultiIterator {
index = ( index * -1 ) - 1;
- //outside the renage
+ //outside the range
if ( index >= maxSize ) {
return;
}