Merge commit 'refs/pull/433/head' of github.com:apache/usergrid 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/63f49bac Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/63f49bac Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/63f49bac Branch: refs/heads/USERGRID-872 Commit: 63f49bac58395b8fc9b36fedd59dae297e63459f Parents: b895643 f840623 Author: Michael Russo <michaelaru...@gmail.com> Authored: Thu Nov 12 13:19:54 2015 -0800 Committer: Michael Russo <michaelaru...@gmail.com> Committed: Thu Nov 12 13:19:54 2015 -0800 ---------------------------------------------------------------------- .../usergrid/corepersistence/CoreModule.java | 134 ++++++++++++++----- .../asyncevents/AmazonAsyncEventService.java | 1 + .../asyncevents/AsyncEventsSchedulerFig.java | 94 +++++++++++++ .../asyncevents/AsyncIndexProvider.java | 2 +- .../asyncevents/EventExecutionScheduler.java | 37 +++++ .../traverse/ReadGraphCollectionFilter.java | 3 +- .../traverse/ReadGraphConnectionFilter.java | 3 +- .../corepersistence/rx/impl/AsyncRepair.java | 38 ++++++ .../rx/impl/ResponseImportTasks.java | 38 ++++++ .../service/ServiceSchedulerFig.java | 66 +++++++++ .../collection/guice/CollectionModule.java | 32 +++++ .../guice/CollectionTaskExecutor.java | 35 ----- .../EntityCollectionManagerFactoryImpl.java | 5 +- .../impl/EntityCollectionManagerImpl.java | 17 ++- .../mvcc/stage/delete/UniqueCleanup.java | 12 +- .../mvcc/stage/write/WriteCommit.java | 10 +- .../scheduler/CollectionExecutorScheduler.java | 52 +++++++ .../scheduler/CollectionSchedulerFig.java | 53 ++++++++ .../collection/EntityCollectionManagerIT.java | 68 ++++++++++ .../mvcc/stage/delete/MarkCommitTest.java | 2 +- .../mvcc/stage/write/WriteCommitTest.java | 2 +- .../core/executor/TaskExecutorFactory.java | 108 +++++++++++---- .../persistence/core/guice/CommonModule.java | 25 ++-- .../persistence/core/rx/RxSchedulerFig.java | 71 ---------- .../core/rx/RxTaskSchedulerImpl.java | 81 +---------- .../usergrid/services/AbstractService.java | 13 +- 26 files changed, 724 insertions(+), 278 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/63f49bac/stack/core/src/main/java/org/apache/usergrid/corepersistence/asyncevents/AmazonAsyncEventService.java ----------------------------------------------------------------------
