Merge branch 'USERGRID-1018' into 2.1-release
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0c12abb1 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0c12abb1 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0c12abb1 Branch: refs/heads/USERGRID-933 Commit: 0c12abb154c85ea5ccfd936490a2f84b0ffe5d24 Parents: 61dd559 0d4dd11 Author: Todd Nine <tn...@apigee.com> Authored: Fri Sep 18 10:48:34 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Fri Sep 18 10:48:34 2015 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/CoreModule.java | 51 +++- .../corepersistence/CpRelationManager.java | 23 +- .../asyncevents/AsyncEventService.java | 2 + .../migration/CoreMigration.java | 45 +--- .../migration/CoreMigrationPlugin.java | 38 ++- .../migration/DeDupConnectionDataMigration.java | 93 ++++++++ .../migration/EntityTypeMappingMigration.java | 104 -------- .../migration/MigrationModuleVersionPlugin.java | 5 - .../corepersistence/migration/Versions.java | 31 --- .../builder/PipelineBuilderFactory.java | 3 + .../service/ConnectionScope.java | 53 +++++ .../service/ConnectionService.java | 10 + .../service/ConnectionServiceImpl.java | 89 ++++++- .../corepersistence/util/CpNamingUtils.java | 13 +- .../corepersistence/TestCoreModule.java | 34 +++ .../DeDupConnectionDataMigrationTest.java | 145 ++++++++++++ .../migration/EntityTypeMappingMigrationIT.java | 125 ---------- .../service/ConnectionServiceImplTest.java | 235 +++++++++++++++++++ stack/core/src/test/resources/log4j.properties | 6 +- .../serialization/impl/SerializationModule.java | 4 +- .../migration/CollectionMigrationPlugin.java | 8 +- .../migration/MvccEntityDataMigrationImpl.java | 10 +- ...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 39 +-- .../migration/data/AbstractMigrationPlugin.java | 17 +- .../core/migration/data/DataMigration.java | 11 +- .../migration/data/MigrationDataProvider.java | 2 +- .../core/migration/data/MigrationPlugin.java | 4 +- .../migration/schema/MigrationManagerFig.java | 1 + .../migration/data/TestProgressObserver.java | 10 +- .../persistence/graph/guice/GraphModule.java | 4 +- .../graph/impl/GraphManagerImpl.java | 4 +- .../impl/stage/EdgeDeleteListenerImpl.java | 4 +- .../graph/impl/stage/EdgeDeleteRepairImpl.java | 61 ++--- .../impl/TargetIdObservableImpl.java | 13 +- .../impl/migration/EdgeDataMigrationImpl.java | 12 +- .../impl/migration/GraphMigrationPlugin.java | 8 +- .../impl/shard/impl/EdgeSearcher.java | 14 +- .../impl/ShardedEdgeSerializationImpl.java | 59 +++-- .../shard/impl/serialize/EdgeSerializer.java | 21 +- .../persistence/graph/GraphManagerIT.java | 73 +++++- .../migration/EdgeDataMigrationImplTest.java | 59 +++-- .../persistence/index/guice/IndexModule.java | 4 +- .../index/migration/EsIndexMigrationPlugin.java | 8 +- 43 files changed, 1038 insertions(+), 517 deletions(-) ----------------------------------------------------------------------
