usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From g...@apache.org
Subject [2/2] incubator-usergrid git commit: Fixed naming mismatch in CandidateResults.
Date Wed, 13 May 2015 19:27:53 GMT
Fixed naming mismatch in CandidateResults.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/79aea6ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/79aea6ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/79aea6ab

Branch: refs/heads/USERGRID-607
Commit: 79aea6ab9716966235b01b2aa4969862003e557a
Parents: b52ac2f
Author: GERey <greyes@apigee.com>
Authored: Wed May 13 12:27:50 2015 -0700
Committer: GERey <greyes@apigee.com>
Committed: Wed May 13 12:27:50 2015 -0700

----------------------------------------------------------------------
 .../apache/usergrid/persistence/index/CandidateResults.java   | 7 ++++++-
 .../persistence/index/impl/EsApplicationEntityIndexImpl.java  | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79aea6ab/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java
b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java
index a157e47..c22d3b4 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java
@@ -50,7 +50,12 @@ public class CandidateResults implements Iterable<CandidateResult>
{
     }
 
 
-    public void initializeCursor(int offset){
+    /**
+     * Hilarious! we call this initialize Cursor but everywhere else , even in the code call
it offset!
+     * wonderful!
+     * @param offset
+     */
+    public void initializeOffset( int offset ){
         this.offset = Optional.of(offset);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/79aea6ab/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
----------------------------------------------------------------------
diff --git 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
index f004ce8..2256769 100644
--- 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
@@ -54,7 +54,6 @@ import org.apache.usergrid.persistence.index.SearchEdge;
 import org.apache.usergrid.persistence.index.SearchTypes;
 import org.apache.usergrid.persistence.index.query.ParsedQuery;
 import org.apache.usergrid.persistence.index.query.ParsedQueryBuilder;
-import org.apache.usergrid.persistence.index.query.tree.QueryVisitor;
 import org.apache.usergrid.persistence.index.utils.IndexValidationUtils;
 import org.apache.usergrid.persistence.map.MapManager;
 import org.apache.usergrid.persistence.map.MapManagerFactory;
@@ -298,7 +297,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex
{
         // >= seems odd.  However if we get an overflow, we need to account for it.
         if (  hits.length >= limit ) {
 
-            candidateResults.initializeCursor(from+limit);
+            candidateResults.initializeOffset( from + limit );
 
         }
 


Mime
View raw message