Repository: incubator-usergrid Updated Branches: refs/heads/USERGRID-643 dbfff9970 -> cb179d351
Merge branch 'two-dot-o-dev' 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/9995576a Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9995576a Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9995576a Branch: refs/heads/USERGRID-643 Commit: 9995576a5cc11d5d5931c22f7bd2cb0715ac8d46 Parents: cf8b551 30e0e45 Author: Shawn Feldman <[email protected]> Authored: Mon May 11 09:46:16 2015 -0700 Committer: Shawn Feldman <[email protected]> Committed: Mon May 11 09:46:16 2015 -0700 ---------------------------------------------------------------------- .../usergrid/corepersistence/CoreModule.java | 31 +- .../corepersistence/CpEntityManager.java | 2 +- .../corepersistence/CpEntityManagerFactory.java | 2 +- .../corepersistence/CpRelationManager.java | 4 +- .../asyncevents/AsyncIndexProvider.java | 8 +- .../asyncevents/EventBuilder.java | 105 +++ .../asyncevents/EventBuilderImpl.java | 154 ++++ .../asyncevents/InMemoryAsyncEventService.java | 59 +- .../events/EntityDeletedHandler.java | 81 --- .../events/EntityVersionCreatedHandler.java | 83 --- .../events/EntityVersionDeletedHandler.java | 142 ---- .../migration/AppInfoMigrationPlugin.java | 3 +- .../index/InMemoryAsycIndexServiceTest.java | 5 +- .../collection/EntityCollectionManager.java | 20 +- .../cache/CachedEntityCollectionManager.java | 18 +- .../collection/event/EntityDeleted.java | 45 -- .../collection/event/EntityVersionCreated.java | 39 - .../collection/event/EntityVersionDeleted.java | 46 -- .../collection/guice/CollectionModule.java | 39 - .../EntityCollectionManagerFactoryImpl.java | 39 +- .../impl/EntityCollectionManagerImpl.java | 386 ++++------ .../collection/impl/EntityDeletedTask.java | 137 ---- .../impl/EntityVersionCleanupTask.java | 247 ------- .../impl/EntityVersionCreatedTask.java | 115 --- .../impl/EntityVersionTaskFactory.java | 60 -- .../mvcc/stage/delete/UniqueCleanup.java | 133 ++++ .../mvcc/stage/delete/VersionCompact.java | 125 ++++ .../MvccLogEntrySerializationStrategy.java | 14 + .../serialization/SerializationFig.java | 30 +- .../serialization/impl/LogEntryIterator.java | 114 --- .../impl/MinMaxLogEntryIterator.java | 121 ++++ .../MvccEntitySerializationStrategyV3Impl.java | 39 +- .../MvccLogEntrySerializationProxyImpl.java | 14 + .../MvccLogEntrySerializationStrategyImpl.java | 83 ++- .../migration/MvccEntityDataMigrationImpl.java | 30 +- .../collection/EntityCollectionManagerIT.java | 216 ++++-- .../impl/EntityVersionCleanupTaskTest.java | 715 ------------------- .../impl/EntityVersionCreatedTaskTest.java | 241 ------- .../mvcc/stage/delete/UniqueCleanupTest.java | 712 ++++++++++++++++++ .../mvcc/stage/delete/VersionCompactTest.java | 238 ++++++ .../impl/LogEntryIteratorTest.java | 132 ---- .../impl/MinMaxLogEntryIteratorTest.java | 131 ++++ ...MvccEntitySerializationStrategyImplTest.java | 2 +- ...ccLogEntrySerializationStrategyImplTest.java | 132 +++- .../collection/util/LogEntryMock.java | 103 +-- .../src/test/resources/log4j.properties | 1 + .../core/executor/TaskExecutorFactory.java | 95 +++ .../persistence/core/rx/RxTaskScheduler.java | 2 - .../core/task/NamedTaskExecutorImpl.java | 286 -------- .../usergrid/persistence/core/task/Task.java | 48 -- .../persistence/core/task/TaskExecutor.java | 41 -- .../core/task/NamedTaskExecutorImplTest.java | 271 ------- .../usergrid/persistence/graph/GraphFig.java | 26 +- .../persistence/graph/GraphManager.java | 33 +- .../persistence/graph/GraphManagerFactory.java | 2 +- .../usergrid/persistence/graph/MarkedEdge.java | 8 +- .../persistence/graph/SearchByEdge.java | 6 + .../persistence/graph/SearchByEdgeType.java | 6 + .../persistence/graph/guice/GraphModule.java | 11 - .../graph/impl/GraphManagerImpl.java | 657 ++++++----------- .../graph/impl/SimpleMarkedEdge.java | 3 + .../graph/impl/SimpleSearchByEdge.java | 40 +- .../graph/impl/SimpleSearchByEdgeType.java | 29 +- .../graph/impl/SimpleSearchByIdType.java | 8 + .../graph/impl/stage/EdgeDeleteListener.java | 2 +- .../impl/stage/EdgeDeleteListenerImpl.java | 31 +- .../graph/impl/stage/EdgeMetaRepair.java | 6 +- .../graph/impl/stage/EdgeMetaRepairImpl.java | 196 +++-- .../graph/impl/stage/NodeDeleteListener.java | 2 +- .../shard/impl/ShardGroupCompactionImpl.java | 90 ++- .../graph/CommittedGraphManagerIT.java | 135 ---- .../persistence/graph/GraphManagerIT.java | 699 ++++++++++++++---- .../graph/StorageGraphManagerIT.java | 240 ------- .../impl/shard/ShardGroupCompactionTest.java | 6 +- .../graph/test/util/EdgeTestUtils.java | 27 + 75 files changed, 3598 insertions(+), 4604 deletions(-) ----------------------------------------------------------------------
