You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/11/13 15:49:47 UTC
[2/2] usergrid git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/usergrid
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/bab89fe0
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/bab89fe0
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/bab89fe0
Branch: refs/heads/master
Commit: bab89fe0fb77bf5358a170150125891ba5756c41
Parents: 6827f08 c3c2818
Author: Dave Johnson <sn...@apache.org>
Authored: Fri Nov 13 09:49:38 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Fri Nov 13 09:49:38 2015 -0500
----------------------------------------------------------------------
.../usergrid/corepersistence/CoreModule.java | 132 +++-
.../asyncevents/AmazonAsyncEventService.java | 47 +-
.../asyncevents/AsyncEventsSchedulerFig.java | 94 +++
.../asyncevents/AsyncIndexProvider.java | 2 +-
.../asyncevents/EventExecutionScheduler.java | 37 ++
.../migration/DeDupConnectionDataMigration.java | 2 +-
.../read/traverse/AbstractReadGraphFilter.java | 8 +-
.../traverse/ReadGraphCollectionFilter.java | 3 +-
.../traverse/ReadGraphConnectionFilter.java | 3 +-
.../corepersistence/rx/impl/AsyncRepair.java | 38 ++
.../rx/impl/ResponseImportTasks.java | 38 ++
.../service/ServiceSchedulerFig.java | 66 ++
.../usergrid/corepersistence/index/RxTest.java | 1 +
.../collection/guice/CollectionModule.java | 32 +
.../guice/CollectionTaskExecutor.java | 35 --
.../EntityCollectionManagerFactoryImpl.java | 5 +-
.../impl/EntityCollectionManagerImpl.java | 20 +-
.../mvcc/stage/delete/UniqueCleanup.java | 12 +-
.../mvcc/stage/write/WriteCommit.java | 11 +-
.../collection/mvcc/stage/write/WriteStart.java | 2 -
.../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 +--
.../persistence/graph/guice/GraphModule.java | 7 -
.../impl/shard/DirectedEdgeMeta.java | 4 +-
.../impl/shard/EdgeShardStrategy.java | 10 +-
.../impl/shard/NodeShardApproximation.java | 66 --
.../impl/shard/ShardEntryGroup.java | 3 +-
.../impl/shard/ShardedEdgeSerialization.java | 2 +-
.../serialization/impl/shard/count/Counter.java | 131 ----
.../shard/count/NodeShardApproximationImpl.java | 272 --------
.../count/NodeShardCounterSerialization.java | 48 --
.../NodeShardCounterSerializationImpl.java | 186 ------
.../impl/shard/count/ShardKey.java | 75 ---
.../shard/impl/NodeShardAllocationImpl.java | 20 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 158 ++---
.../impl/ShardedEdgeSerializationImpl.java | 31 +-
.../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 13 +-
.../graph/GraphManagerShardConsistencyIT.java | 5 +
.../graph/GraphManagerShardingIT.java | 208 ------
.../graph/impl/NodeDeleteListenerTest.java | 1 -
.../impl/shard/NodeShardAllocationTest.java | 48 +-
.../impl/shard/ShardEntryGroupTest.java | 28 +
.../shard/count/NodeShardApproximationTest.java | 627 -------------------
.../NodeShardCounterSerializationTest.java | 124 ----
.../shard/impl/ShardGroupDeletionImplTest.java | 5 +
.../index/impl/DeIndexOperation.java | 4 +-
.../index/impl/EntityMappingParser.java | 4 +
.../index/impl/IndexOperationMessage.java | 4 +-
.../persistence/index/impl/IndexingUtils.java | 21 +
.../EsIndexMappingMigrationPlugin.java | 2 +-
.../index/impl/EntityToMapConverterTest.java | 48 ++
.../index/impl/IndexingUtilsTest.java | 36 ++
.../java-wns/1.2-USERGRID/_remote.repositories | 7 +
...a-wns-1.2-USERGRID-jar-with-dependencies.jar | Bin 0 -> 1836665 bytes
.../java-wns-1.2-USERGRID-javadoc.jar | Bin 0 -> 234289 bytes
.../java-wns-1.2-USERGRID-sources.jar | Bin 0 -> 21654 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.jar | Bin 0 -> 33164 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.pom | 128 ++++
stack/pom.xml | 4 -
stack/rest/pom.xml | 10 +
.../exceptions/AbstractExceptionMapper.java | 8 +-
stack/scripts/multitenant_migrate.py | 48 +-
stack/services/pom.xml | 23 +-
.../services/AbstractCollectionService.java | 10 +-
.../usergrid/services/AbstractService.java | 13 +-
.../services/notifications/wns/WNSAdapter.java | 5 +-
.../notifications/wns/WNSAdapterTest.java | 49 ++
75 files changed, 1257 insertions(+), 2293 deletions(-)
----------------------------------------------------------------------