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 2014/03/12 19:21:00 UTC
[4/4] git commit: Merge 29a4966b4b4682f42e22dacfc9f55c69a5f61b78 into
5f6ca3164a36fb556ca2554ebaf9c408cc642bdf
Merge 29a4966b4b4682f42e22dacfc9f55c69a5f61b78 into 5f6ca3164a36fb556ca2554ebaf9c408cc642bdf
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a9233b49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a9233b49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a9233b49
Branch: refs/pull/52/merge
Commit: a9233b49825ec7e497d89a11efa6f4b837f3f3a7
Parents: 5f6ca31 29a4966
Author: Dave Johnson <da...@rollerweblogger.org>
Authored: Wed Mar 12 18:11:34 2014 +0000
Committer: Dave Johnson <da...@rollerweblogger.org>
Committed: Wed Mar 12 18:11:34 2014 +0000
----------------------------------------------------------------------
.../astyanax/IdRowCompositeSerializer.java | 4 +-
.../exception/WriteCommitException.java | 44 +++++
.../WriteOptimisticVerifyException.java | 44 +++++
.../exception/WriteStartException.java | 44 +++++
.../exception/WriteUniqueVerifyException.java | 58 ++++++
.../collection/guice/CollectionModule.java | 25 +--
.../impl/EntityCollectionManagerImpl.java | 15 +-
.../mvcc/changelog/ChangeLogGeneratorImpl.java | 3 +
.../mvcc/stage/write/WriteCommit.java | 13 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 181 +++++++++++++++++-
.../collection/mvcc/stage/write/WriteStart.java | 11 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 79 ++++----
.../serialization/impl/SerializationModule.java | 21 ++-
.../changelog/ChangeLogGeneratorImplTest.java | 44 +++--
.../mvcc/entity/impl/MvccEntityImplTest.java | 23 ++-
.../stage/write/WriteOptimisticVerifyTest.java | 182 +++++++++++++++++++
.../mvcc/stage/write/WriteUniqueVerifyIT.java | 97 ++++++++++
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 25 +--
.../collection/util/EntityBuilder.java | 177 ++++++++++++++++++
.../src/test/resources/log4j.properties | 4 +-
.../index/impl/EntityCollectionIndexTest.java | 2 +-
.../persistence/index/legacy/EntityBuilder.java | 177 ------------------
.../index/legacy/EntityManagerFacade.java | 1 +
23 files changed, 967 insertions(+), 307 deletions(-)
----------------------------------------------------------------------