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/14 23:00:34 UTC
[10/23] 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/43acfad8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/43acfad8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/43acfad8
Branch: refs/heads/cloudformation-update
Commit: 43acfad8438b873ecf52384775f97e6052139150
Parents: c56c12c 389e766
Author: amuramoto <am...@apigee.com>
Authored: Fri Oct 10 11:26:01 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Fri Oct 10 11:26:01 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityDeleteListener.java | 2 +-
.../corepersistence/CpEntityManager.java | 394 ++++++++-----------
.../corepersistence/CpEntityManagerFactory.java | 217 +++++++---
.../corepersistence/CpEntityMapUtils.java | 323 ---------------
.../corepersistence/CpManagerCache.java | 2 +-
.../usergrid/corepersistence/CpNamingUtils.java | 106 -----
.../corepersistence/CpRelationManager.java | 153 ++-----
.../usergrid/corepersistence/CpVisitor.java | 32 ++
.../usergrid/corepersistence/CpWalker.java | 238 +++++++++++
.../HybridEntityManagerFactory.java | 10 +
.../corepersistence/results/EntityVerifier.java | 126 ++++++
.../results/FilteringLoader.java | 245 ++++++++++++
.../corepersistence/results/IdsVerifier.java | 46 +++
.../corepersistence/results/RefsVerifier.java | 42 ++
.../corepersistence/results/ResultsLoader.java | 43 ++
.../results/ResultsLoaderFactory.java | 39 ++
.../results/ResultsLoaderFactoryImpl.java | 67 ++++
.../results/ResultsVerifier.java | 54 +++
.../results/VersionVerifier.java | 82 ++++
.../corepersistence/util/CpEntityMapUtils.java | 323 +++++++++++++++
.../corepersistence/util/CpNamingUtils.java | 106 +++++
.../usergrid/persistence/EntityManager.java | 10 +
.../persistence/EntityManagerFactory.java | 4 +
.../apache/usergrid/persistence/Results.java | 6 +-
.../cassandra/EntityManagerFactoryImpl.java | 10 +
.../cassandra/EntityManagerImpl.java | 17 +
.../org/apache/usergrid/CoreApplication.java | 1 +
.../CpEntityDeleteListenerTest.java | 2 +-
.../CpEntityIndexDeleteListenerTest.java | 3 +-
.../corepersistence/CpEntityMapUtilsTest.java | 2 +
.../corepersistence/StaleIndexCleanupTest.java | 100 ++++-
.../PerformanceEntityRepersistTest.java | 236 +++++++++++
.../collection/EntityCollectionManager.java | 22 +-
.../persistence/collection/EntitySet.java | 47 +++
.../persistence/collection/MvccEntity.java | 68 ++++
.../persistence/collection/MvccLogEntry.java | 94 +++++
.../persistence/collection/VersionSet.java | 67 ++++
.../exception/CollectionRuntimeException.java | 2 +-
.../exception/WriteCommitException.java | 4 +-
.../WriteOptimisticVerifyException.java | 4 +-
.../exception/WriteStartException.java | 4 +-
.../exception/WriteUniqueVerifyException.java | 3 +-
.../collection/guice/CollectionModule.java | 14 +-
.../impl/EntityCollectionManagerImpl.java | 245 ++++++++----
.../impl/EntityVersionCleanupTask.java | 2 +-
.../mvcc/MvccEntitySerializationStrategy.java | 20 +-
.../mvcc/MvccLogEntrySerializationStrategy.java | 17 +-
.../collection/mvcc/changelog/ChangeLog.java | 68 ++++
.../mvcc/changelog/ChangeLogEntry.java | 104 -----
.../mvcc/changelog/ChangeLogGenerator.java | 16 +-
.../mvcc/changelog/ChangeLogGeneratorImpl.java | 138 +++----
.../mvcc/changelog/ChangeLogImpl.java | 135 +++++++
.../collection/mvcc/entity/MvccEntity.java | 68 ----
.../collection/mvcc/entity/MvccLogEntry.java | 93 -----
.../mvcc/entity/MvccValidationUtils.java | 1 +
.../mvcc/entity/impl/MvccEntityDeleteEvent.java | 2 +-
.../mvcc/entity/impl/MvccEntityEvent.java | 2 +-
.../mvcc/entity/impl/MvccEntityImpl.java | 2 +-
.../mvcc/entity/impl/MvccEntityWriteEvent.java | 3 +-
.../mvcc/entity/impl/MvccLogEntryImpl.java | 2 +-
.../mvcc/stage/EntityUpdateEvent.java | 1 -
.../mvcc/stage/delete/MarkCommit.java | 4 +-
.../collection/mvcc/stage/delete/MarkStart.java | 4 +-
.../collection/mvcc/stage/load/Load.java | 98 -----
.../mvcc/stage/write/RollbackAction.java | 2 +-
.../mvcc/stage/write/WriteCommit.java | 4 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 44 +--
.../collection/mvcc/stage/write/WriteStart.java | 5 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 2 +-
.../collection/serialization/EntityRepair.java | 38 ++
.../serialization/OptimisticUpdate.java | 2 +-
.../serialization/SerializationFig.java | 19 +
.../serialization/impl/EntityRepairImpl.java | 149 +++++++
.../serialization/impl/EntitySetImpl.java | 62 +++
.../serialization/impl/LogEntryIterator.java | 2 +-
.../MvccEntitySerializationStrategyImpl.java | 174 +++++---
.../MvccLogEntrySerializationStrategyImpl.java | 129 ++++--
.../serialization/impl/VersionSetImpl.java | 80 ++++
.../persistence/collection/util/RepairUtil.java | 139 -------
.../collection/EntityCollectionManagerIT.java | 307 ++++++++++++---
.../changelog/ChangeLogGeneratorImplTest.java | 375 ++++++++++--------
.../mvcc/entity/impl/MvccEntityImplTest.java | 2 +-
.../mvcc/entity/impl/MvccLogEntryImplTest.java | 2 +-
.../mvcc/stage/AbstractMvccEntityStageTest.java | 2 +-
.../mvcc/stage/TestEntityGenerator.java | 2 +-
.../mvcc/stage/delete/MarkCommitTest.java | 6 +-
.../mvcc/stage/delete/MarkStartTest.java | 4 +-
.../collection/mvcc/stage/load/LoadTest.java | 361 -----------------
.../mvcc/stage/write/WriteCommitTest.java | 4 +-
.../stage/write/WriteOptimisticVerifyTest.java | 4 +-
.../mvcc/stage/write/WriteStartTest.java | 4 +-
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 2 +-
.../serialization/EntityRepairImplTest.java | 147 +++++++
.../impl/LogEntryIteratorTest.java | 2 +-
...MvccEntitySerializationStrategyImplTest.java | 40 +-
.../impl/MvccLESSTransientTest.java | 7 +-
...ccLogEntrySerializationStrategyImplTest.java | 19 +-
.../util/InvalidMvccEntityGenerator.java | 2 +-
.../util/InvalidValueGeneratorTest.java | 2 +-
.../collection/util/LogEntryMock.java | 4 +-
.../usergrid/persistence/index/EntityIndex.java | 6 +
.../index/impl/EsEntityIndexBatchImpl.java | 119 ++----
.../index/impl/EsEntityIndexImpl.java | 280 ++++++-------
.../persistence/index/impl/IndexingUtils.java | 66 ++++
.../index/query/CandidateResult.java | 30 ++
.../persistence/index/impl/EntityIndexTest.java | 5 +
.../cassandra/ManagementServiceImpl.java | 38 +-
.../org/apache/usergrid/tools/RepersistAll.java | 98 +++++
108 files changed, 4611 insertions(+), 2575 deletions(-)
----------------------------------------------------------------------