You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/02 09:31:49 UTC
[4/9] git commit: Merge branch 'two-dot-o' of
github.com:apache/incubator-usergrid into 2.0
Merge branch 'two-dot-o' of github.com:apache/incubator-usergrid into 2.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7bb9c647
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7bb9c647
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7bb9c647
Branch: refs/heads/esbatching
Commit: 7bb9c6475004e7eab36275cdf68394344208b1af
Parents: 76b3421 1e7da5c
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 1 15:33:20 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 1 15:33:20 2014 -0700
----------------------------------------------------------------------
.../mq/cassandra/io/AbstractSearch.java | 60 +-
.../mq/cassandra/io/ConsumerTransaction.java | 2 +-
.../collection/EntityCollectionManager.java | 12 +-
.../collection/event/EntityDeleted.java | 25 +
.../collection/event/EntityVersionCreated.java | 25 +
.../collection/event/EntityVersionDeleted.java | 29 +
.../collection/guice/CollectionModule.java | 18 +-
.../guice/CollectionTaskExecutor.java | 35 +
.../impl/EntityCollectionManagerImpl.java | 14 +
.../impl/EntityVersionCleanupTask.java | 198 ++++++
.../serialization/SerializationFig.java | 32 +-
.../serialization/impl/LogEntryIterator.java | 114 +++
.../EntityCollectionManagerStressTest.java | 2 +
.../impl/EntityVersionCleanupTaskTest.java | 690 +++++++++++++++++++
.../impl/LogEntryIteratorTest.java | 131 ++++
.../collection/util/LogEntryMock.java | 152 ++++
.../core/astyanax/AstyanaxKeyspaceProvider.java | 2 +
.../persistence/core/guice/CommonModule.java | 2 +
.../core/task/NamedTaskExecutorImpl.java | 167 +++++
.../usergrid/persistence/core/task/Task.java | 31 +
.../persistence/core/task/TaskExecutor.java | 23 +
.../core/task/NamedTaskExecutorImplTest.java | 227 ++++++
.../usergrid/persistence/graph/GraphFig.java | 2 +
.../persistence/graph/event/EdgeDeleted.java | 8 +
.../persistence/graph/guice/GraphModule.java | 16 +
.../graph/guice/GraphTaskExecutor.java | 33 +
.../impl/shard/impl/NodeShardCacheImpl.java | 5 -
.../shard/impl/ShardGroupCompactionImpl.java | 175 +++--
.../graph/GraphManagerStressTest.java | 1 +
.../impl/shard/ShardGroupCompactionTest.java | 5 +-
.../notifications/ApplicationQueueManager.java | 42 +-
.../notifications/SingleQueueTaskManager.java | 177 -----
.../services/notifications/TaskManager.java | 180 +++++
.../services/notifications/TaskTracker.java | 4 +-
.../apns/NotificationsServiceIT.java | 13 +-
.../gcm/NotificationsServiceIT.java | 8 +-
36 files changed, 2355 insertions(+), 305 deletions(-)
----------------------------------------------------------------------