Merge remote-tracking branch 'origin/USERGRID-643' into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b28aeee0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b28aeee0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b28aeee0 Branch: refs/heads/USERGRID-608 Commit: b28aeee0522a3ebef8e2d349676ea381baf3ee37 Parents: b637535 53aa87c Author: GERey <gre...@apigee.com> Authored: Wed May 20 16:00:15 2015 -0700 Committer: GERey <gre...@apigee.com> Committed: Wed May 20 16:00:15 2015 -0700 ---------------------------------------------------------------------- .../usergrid/corepersistence/CoreModule.java | 4 + .../corepersistence/CpEntityManagerFactory.java | 14 - .../corepersistence/CpRelationManager.java | 1 - .../asyncevents/EventBuilder.java | 6 +- .../asyncevents/EventBuilderImpl.java | 18 +- .../asyncevents/InMemoryAsyncEventService.java | 7 +- .../asyncevents/SQSAsyncEventService.java | 9 +- .../index/EdgeScopeSerializer.java | 41 +++ .../index/EntityIndexOperation.java | 46 +++ .../index/IndexProcessorFig.java | 6 +- .../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 +- .../util/SerializableMapper.java | 91 ----- .../persistence/EntityManagerFactory.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 | 10 +- .../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 - 39 files changed, 1138 insertions(+), 685 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b28aeee0/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b28aeee0/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/InMemoryAsyncEventService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b28aeee0/stack/corepersistence/graph/src/main/java/org/apache/usergrid/persistence/graph/serialization/impl/EdgesObservableImpl.java ----------------------------------------------------------------------
