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/10/07 21:34:41 UTC
[4/4] git commit: Merge branch 'collection_multiget' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-events
Merge branch 'collection_multiget' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/f87c33a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/f87c33a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/f87c33a1
Branch: refs/heads/two-dot-o-events
Commit: f87c33a1e0b63be24db4c95e8a10821300cf0e15
Parents: 406f32d fd84175
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Oct 7 13:34:09 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Oct 7 13:34:09 2014 -0600
----------------------------------------------------------------------
.../collection/EntityCollectionManager.java | 5 +
.../collection/guice/CollectionModule.java | 5 +-
.../impl/EntityCollectionManagerImpl.java | 37 ++--
.../mvcc/event/PostProcessObserver.java | 39 ----
.../mvcc/stage/delete/MarkCommit.java | 153 +++++++------
.../mvcc/stage/write/EntityVersion.java | 64 ------
.../stage/write/EntityVersionSerializer.java | 71 ------
.../mvcc/stage/write/FieldSerializer.java | 107 ---------
.../mvcc/stage/write/RollbackAction.java | 3 +
.../mvcc/stage/write/UniqueValue.java | 39 ----
.../mvcc/stage/write/UniqueValueImpl.java | 124 -----------
.../write/UniqueValueSerializationStrategy.java | 66 ------
.../UniqueValueSerializationStrategyImpl.java | 194 ----------------
.../mvcc/stage/write/WriteCommit.java | 5 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 10 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 206 ++++++++---------
.../collection/serialization/UniqueValue.java | 55 +++++
.../UniqueValueSerializationStrategy.java | 68 ++++++
.../serialization/UniqueValueSet.java | 32 +++
.../serialization/impl/EntityVersion.java | 64 ++++++
.../impl/EntityVersionSerializer.java | 71 ++++++
.../serialization/impl/FieldSerializer.java | 107 +++++++++
.../serialization/impl/SerializationModule.java | 3 +-
.../serialization/impl/UniqueValueImpl.java | 125 +++++++++++
.../UniqueValueSerializationStrategyImpl.java | 219 +++++++++++++++++++
.../serialization/impl/UniqueValueSetImpl.java | 85 +++++++
.../mvcc/stage/delete/MarkCommitTest.java | 10 +-
.../write/EntityVersionSerializerTest.java | 2 +
.../mvcc/stage/write/FieldSerializerTest.java | 1 +
...niqueValueSerializationStrategyImplTest.java | 50 +++--
.../mvcc/stage/write/WriteCommitTest.java | 1 +
.../stage/write/WriteOptimisticVerifyTest.java | 17 +-
.../stage/write/WriteUniqueVerifyStageTest.java | 48 ----
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 48 +---
.../persistence/index/EntityIndexBatch.java | 3 +
35 files changed, 1109 insertions(+), 1028 deletions(-)
----------------------------------------------------------------------