You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/05/26 21:41:41 UTC
[1/2] incubator-usergrid git commit: Removed comment as issue was
resolved.
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-608 3f8899dfa -> be2113c7a
Removed comment as issue was resolved.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/14a1def0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/14a1def0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/14a1def0
Branch: refs/heads/USERGRID-608
Commit: 14a1def069a269566c3b2e7edddf1cf01a5ee077
Parents: 3f8899d
Author: GERey <gr...@apigee.com>
Authored: Tue May 26 12:31:19 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Tue May 26 12:31:19 2015 -0700
----------------------------------------------------------------------
.../apache/usergrid/persistence/index/CandidateResults.java | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/14a1def0/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 c22d3b4..9de263f 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
@@ -49,12 +49,7 @@ public class CandidateResults implements Iterable<CandidateResult> {
offset = Optional.absent();
}
-
- /**
- * 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);
}
[2/2] incubator-usergrid git commit: Added version verification.
Posted by gr...@apache.org.
Added version verification.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/be2113c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/be2113c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/be2113c7
Branch: refs/heads/USERGRID-608
Commit: be2113c7a7636b3227aff2af6f69d5a87ec24754
Parents: 14a1def
Author: GERey <gr...@apigee.com>
Authored: Tue May 26 12:35:28 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Tue May 26 12:35:28 2015 -0700
----------------------------------------------------------------------
.../persistence/index/impl/EsApplicationEntityIndexImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/be2113c7/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 347a7b9..e1dd2bb 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
@@ -222,7 +222,7 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex {
//The settings for the scroll aren't tested and so we aren't sure what vlaues would be best in a production enviroment
//TODO: review this and make them not magic numbers when acking this PR.
searchResponse = srb.setScroll( new TimeValue( 6000 ) ).setSize( 100 ).execute().actionGet();
-
+
while(true){
//add search result hits to some sort of running tally of hits.
@@ -263,8 +263,8 @@ public class EsApplicationEntityIndexImpl implements ApplicationEntityIndex {
public CandidateResults getAllEntityVersionsBeforeMarkedVersion( final Id entityId, final UUID markedVersion ) {
Preconditions.checkNotNull( entityId, "entityId cannot be null" );
- //TODO: check to see if there is some version verifcation. I know there is but i forget where.
Preconditions.checkNotNull( markedVersion, "markedVersion cannot be null" );
+ ValidationUtils.verifyVersion( markedVersion );
SearchResponse searchResponse;