You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/12/22 16:36:49 UTC
[50/50] incubator-usergrid git commit: merge
merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/81edb677
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/81edb677
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/81edb677
Branch: refs/heads/UG-rest-test-framework-overhaul
Commit: 81edb677fde8d096fea2262a05a3b0136ce65923
Parents: 615ac49 37940e3
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Dec 22 08:22:43 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Dec 22 08:22:43 2014 -0700
----------------------------------------------------------------------
stack/core/.test-tdoe-5thread.log.swp | Bin 0 -> 28672 bytes
.../corepersistence/CpEntityDeleteListener.java | 101 -----
.../CpEntityIndexDeleteListener.java | 98 ----
.../corepersistence/CpEntityManager.java | 124 ++---
.../corepersistence/CpRelationManager.java | 35 +-
.../usergrid/corepersistence/CpSetup.java | 16 +-
.../usergrid/corepersistence/GuiceModule.java | 43 +-
.../HybridEntityManagerFactory.java | 4 +
.../events/EntityDeletedHandler.java | 68 +++
.../events/EntityVersionCreatedHandler.java | 69 +++
.../events/EntityVersionDeletedHandler.java | 102 +++++
.../results/FilteringLoader.java | 7 +-
.../CpEntityDeleteListenerTest.java | 91 ----
.../CpEntityIndexDeleteListenerTest.java | 111 -----
.../corepersistence/StaleIndexCleanupTest.java | 219 ++++++++-
.../corepersistence/TestGuiceModule.java | 9 +-
.../migration/GraphShardVersionMigrationIT.java | 5 +-
.../usergrid/persistence/CollectionIT.java | 15 +-
.../query/AbstractIteratingQueryIT.java | 2 +-
.../resources/usergrid-custom-test.properties | 3 +
.../collection/EntityCollectionManager.java | 13 +-
.../collection/EntityDeletedFactory.java | 34 ++
.../persistence/collection/EntitySet.java | 4 +-
.../collection/EntityVersionCleanupFactory.java | 35 ++
.../collection/EntityVersionCreatedFactory.java | 31 ++
.../persistence/collection/VersionSet.java | 22 +-
.../collection/event/EntityDeleted.java | 5 +-
.../collection/event/EntityVersionCreated.java | 14 +-
.../collection/event/EntityVersionDeleted.java | 11 +-
.../collection/guice/CollectionModule.java | 24 +-
.../collection/impl/CollectionScopeImpl.java | 4 +-
.../impl/EntityCollectionManagerImpl.java | 86 +++-
.../collection/impl/EntityDeletedTask.java | 148 ++++++
.../impl/EntityVersionCleanupTask.java | 224 +++++----
.../impl/EntityVersionCreatedTask.java | 122 +++++
.../mvcc/stage/delete/MarkCommit.java | 137 +++---
.../impl/EntityVersionSerializer.java | 3 -
.../collection/guice/TestCollectionModule.java | 4 -
.../impl/EntityVersionCleanupTaskTest.java | 450 ++++++++++++-------
.../impl/EntityVersionCreatedTaskTest.java | 244 ++++++++++
.../core/task/NamedTaskExecutorImpl.java | 141 +++++-
.../core/task/NamedTaskExecutorImplTest.java | 56 ++-
.../usergrid/persistence/index/EntityIndex.java | 20 +-
.../persistence/index/EntityIndexBatch.java | 7 +-
.../index/impl/EsEntityIndexBatchImpl.java | 9 +-
.../index/impl/EsEntityIndexImpl.java | 142 ++++--
.../persistence/index/impl/IndexingUtils.java | 105 +++--
.../apache/usergrid/rest/TestContextSetup.java | 6 +-
.../collection/DuplicateNameIT.java | 2 +-
.../rest/test/resource/TestContext.java | 3 +-
50 files changed, 2161 insertions(+), 1067 deletions(-)
----------------------------------------------------------------------