Merge remote-tracking branch 'origin/two-dot-o-dev' into USERGRID-509
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9c9e414a Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9c9e414a Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9c9e414a Branch: refs/heads/two-dot-o-dev Commit: 9c9e414ac2c420b62a34cbe4dba48bb4221bee4c Parents: 8315aee 38d002e Author: Todd Nine <[email protected]> Authored: Wed Apr 1 10:23:04 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Wed Apr 1 10:23:04 2015 -0600 ---------------------------------------------------------------------- .../apache/usergrid/corepersistence/CpEntityManagerFactory.java | 1 - .../test/java/org/apache/usergrid/persistence/CollectionIT.java | 2 +- .../usergrid/persistence/index/impl/EntityToMapConverter.java | 2 +- .../persistence/index/impl/EsApplicationEntityIndexImpl.java | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9c9e414a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/9c9e414a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java ---------------------------------------------------------------------- diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java index 0cd6fb1,c5b3577..25b926d --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java @@@ -285,9 -285,7 +285,9 @@@ public class EsApplicationEntityIndexIm final CandidateResults candidateResults = new CandidateResults(candidates); final String esScrollCursor = searchResponse.getScrollId(); - if(esScrollCursor != null && hits.length>=limit) { + // >= seems odd. However if our user reduces expectedSize (limit) on subsequent requests, we can't do that + //therefor we need to account for the overflow - if(esScrollCursor != null && length >= expectedSize) { ++ if(esScrollCursor != null && length >= limit) { candidateResults.initializeCursor(); //now set this into our map module
