Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid 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/01416233 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/01416233 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/01416233 Branch: refs/heads/two-dot-o-dev Commit: 01416233559de620b421308494d22cdc21c9a89f Parents: 24e7cda 34fd9cf Author: Shawn Feldman <sfeld...@apache.org> Authored: Thu Apr 23 09:31:56 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Thu Apr 23 09:31:56 2015 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/CoreModule.java | 8 +- .../corepersistence/CpEntityManager.java | 6 +- .../corepersistence/CpEntityManagerFactory.java | 6 +- .../corepersistence/CpRelationManager.java | 6 +- .../index/AsyncIndexProvider.java | 24 +- .../index/AsyncIndexService.java | 42 +++ .../index/AsyncReIndexService.java | 42 --- .../index/InMemoryAsyncIndexService.java | 88 +++++ .../index/InMemoryAsyncReIndexService.java | 108 ------ .../index/IndexProcessorFig.java | 86 +++++ .../corepersistence/index/IndexService.java | 6 +- .../corepersistence/index/IndexServiceImpl.java | 9 +- .../corepersistence/index/QueryFig.java | 103 ------ .../index/ReIndexServiceImpl.java | 12 +- .../index/SQSAsyncIndexService.java | 325 +++++++++++++++++++ .../index/SQSAsyncReIndexService.java | 269 --------------- .../corepersistence/util/CpNamingUtils.java | 8 +- .../util/SerializableMapper.java | 4 +- .../index/AsyncIndexServiceTest.java | 203 ++++++++++++ .../index/InMemoryAsycIndexServiceTest.java | 64 ++++ .../corepersistence/index/IndexServiceTest.java | 233 ++++++++++++- .../index/SQSAsyncIndexServiceTest.java | 143 +++----- .../impl/migration/EntityIdScope.java | 40 ++- .../core/metrics/MetricsFactoryImpl.java | 44 +-- .../migration/data/MigrationRelationship.java | 29 +- .../migration/data/VersionedMigrationSet.java | 31 +- .../persistence/core/rx/RxSchedulerFig.java | 4 +- .../core/scope/ApplicationScope.java | 4 + .../core/scope/ApplicationScopeImpl.java | 21 +- .../data/VersionedMigrationSetTest.java | 8 +- .../usergrid/persistence/model/entity/Id.java | 3 + .../persistence/model/entity/SimpleId.java | 42 ++- .../index/impl/IndexOperationMessage.java | 8 - 33 files changed, 1259 insertions(+), 770 deletions(-) ----------------------------------------------------------------------
