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/27 01:06:26 UTC
[07/12] incubator-usergrid git commit: Merge branch 'two-dot-o-dev'
of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
USERGRID-641
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-641
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/17d2d730
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/17d2d730
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/17d2d730
Branch: refs/heads/USERGRID-608
Commit: 17d2d7303a321e4b61a8508ea2a789f7b77c68e0
Parents: b59abac 53563e8
Author: Todd Nine <tn...@apigee.com>
Authored: Thu May 21 18:21:01 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Thu May 21 18:21:01 2015 -0600
----------------------------------------------------------------------
portal/config.js | 4 +-
portal/js/global/ug-service.js | 4 +-
portal/js/users/users-controller.js | 19 +-
.../usergrid/corepersistence/CoreModule.java | 4 +
.../corepersistence/CpEntityManager.java | 2 +-
.../corepersistence/CpEntityManagerFactory.java | 14 -
.../corepersistence/CpRelationManager.java | 54 +--
.../asyncevents/EventBuilder.java | 6 +-
.../asyncevents/EventBuilderImpl.java | 18 +-
.../asyncevents/InMemoryAsyncEventService.java | 9 +-
.../asyncevents/SQSAsyncEventService.java | 9 +-
.../index/EdgeScopeSerializer.java | 41 +++
.../index/EntityIndexOperation.java | 46 +++
.../index/IndexProcessorFig.java | 6 +-
.../corepersistence/index/IndexServiceImpl.java | 3 +-
.../corepersistence/index/ReIndexAction.java | 6 +-
.../index/ReIndexRequestBuilder.java | 86 +++++
.../index/ReIndexRequestBuilderImpl.java | 122 +++++++
.../corepersistence/index/ReIndexService.java | 89 +++--
.../index/ReIndexServiceImpl.java | 251 ++++++++++++--
.../cursor/AbstractCursorSerializer.java | 2 +-
.../pipeline/cursor/CursorSerializerUtil.java | 54 ++-
.../pipeline/cursor/RequestCursor.java | 9 +-
.../pipeline/cursor/ResponseCursor.java | 49 +--
.../pipeline/read/AbstractPathFilter.java | 30 --
.../pipeline/read/CursorSeek.java | 53 +++
.../rx/impl/AllEntityIdsObservable.java | 5 +-
.../rx/impl/AllEntityIdsObservableImpl.java | 6 +-
.../corepersistence/util/CpNamingUtils.java | 3 +-
.../util/SerializableMapper.java | 91 -----
.../persistence/EntityManagerFactory.java | 2 -
.../usergrid/persistence/RelationManager.java | 2 -
.../rx/EdgesToTargetObservableIT.java | 4 +-
.../PerformanceEntityRebuildIndexTest.java | 346 ++++++++-----------
.../data/MigrationInfoSerializationImpl.java | 4 +-
.../migration/schema/MigrationManagerImpl.java | 14 +-
.../core/migration/util/AstayanxUtils.java | 49 +++
.../graph/serialization/EdgesObservable.java | 24 +-
.../serialization/impl/EdgesObservableImpl.java | 12 +-
.../impl/TargetIdObservableImpl.java | 2 +-
.../impl/migration/EdgeDataMigrationImpl.java | 2 +-
.../persistence/index/impl/IndexingUtils.java | 2 +
stack/pom.xml | 13 +
.../org/apache/usergrid/rest/IndexResource.java | 342 +++++++++---------
.../main/resources/usergrid-rest-context.xml | 3 -
.../resources/usergrid-rest-deploy-context.xml | 1 -
.../usergrid/management/OrganizationIT.java | 8 +-
.../resources/usergrid-custom-test.properties | 1 +
48 files changed, 1189 insertions(+), 737 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/17d2d730/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/17d2d730/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/17d2d730/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --cc stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index c766a1b,e6ab3ba..4a2d887
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@@ -656,20 -634,16 +637,16 @@@ public class CpRelationManager implemen
boolean found;
long current = System.currentTimeMillis(), length = 0;
do {
- results = searchCollection(collectionName, query);
+ results = searchCollection( collectionName, query );
length = System.currentTimeMillis() - current;
found = expectedResults == results.size();
- if(found){
+ if ( found ) {
break;
}
- Thread.sleep( sleepTime );
- }
- while ( !found && length <= maxLength );
- if ( logger.isInfoEnabled() ) {
- logger.info( String
- .format( "Consistent Search finished in %s, results=%s, expected=%s...dumping stack", length,
- results.size(), expectedResults ) );
- Thread.dumpStack();
+ Thread.sleep(sleepTime);
+ }while (!found && length <= maxLength);
+ if(logger.isInfoEnabled()){
+ logger.info(String.format("Consistent Search finished in %s, results=%s, expected=%s...dumping stack",length, results.size(),expectedResults));
}
return results;
}
@@@ -970,8 -924,9 +947,9 @@@
}
- final Observable<ResultsPage> resultsObservable = readPipelineBuilder.execute();
- return new ObservableQueryExecutor( resultsObservable ).next();
++
+ return new EntityQueryExecutor( results ).next();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/17d2d730/stack/core/src/main/java/org/apache/usergrid/corepersistence/pipeline/read/AbstractPathFilter.java
----------------------------------------------------------------------