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/17 18:34:55 UTC
[08/49] 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/275f10a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/275f10a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/275f10a3
Branch: refs/heads/two-dot-o
Commit: 275f10a38d6604be3c321ddce0f8d6f627cc56f0
Parents: 7fc56f7 185ecef
Author: amuramoto <am...@apigee.com>
Authored: Wed Oct 8 19:58:56 2014 -0700
Committer: amuramoto <am...@apigee.com>
Committed: Wed Oct 8 19:58:56 2014 -0700
----------------------------------------------------------------------
.../persistence/entities/Notification.java | 13 ++
.../corepersistence/StaleIndexCleanupTest.java | 181 ++++++++++++++
.../collection/EntityCollectionManager.java | 5 +
.../collection/guice/CollectionModule.java | 5 +-
.../impl/EntityCollectionManagerImpl.java | 44 ++--
.../mvcc/entity/MvccValidationUtils.java | 3 +
.../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 | 7 +-
.../mvcc/stage/write/UniqueValue.java | 39 ----
.../mvcc/stage/write/UniqueValueImpl.java | 124 ----------
.../write/UniqueValueSerializationStrategy.java | 66 ------
.../UniqueValueSerializationStrategyImpl.java | 194 ---------------
.../mvcc/stage/write/WriteCommit.java | 12 +-
.../mvcc/stage/write/WriteOptimisticVerify.java | 10 +-
.../collection/mvcc/stage/write/WriteStart.java | 9 +-
.../mvcc/stage/write/WriteUniqueVerify.java | 207 ++++++++--------
.../collection/serialization/UniqueValue.java | 49 ++++
.../UniqueValueSerializationStrategy.java | 68 ++++++
.../serialization/UniqueValueSet.java | 32 +++
.../serialization/impl/EntityVersion.java | 64 +++++
.../impl/EntityVersionSerializer.java | 81 +++++++
.../serialization/impl/FieldSerializer.java | 117 ++++++++++
.../MvccEntitySerializationStrategyImpl.java | 9 +-
.../serialization/impl/SerializationModule.java | 3 +-
.../serialization/impl/UniqueValueImpl.java | 114 +++++++++
.../UniqueValueSerializationStrategyImpl.java | 233 +++++++++++++++++++
.../serialization/impl/UniqueValueSetImpl.java | 85 +++++++
.../persistence/collection/util/RepairUtil.java | 33 +--
.../collection/EntityCollectionManagerIT.java | 61 ++++-
.../mvcc/stage/delete/MarkCommitTest.java | 10 +-
.../write/EntityVersionSerializerTest.java | 2 +
.../mvcc/stage/write/FieldSerializerTest.java | 1 +
...niqueValueSerializationStrategyImplTest.java | 64 +++--
.../mvcc/stage/write/WriteCommitTest.java | 1 +
.../stage/write/WriteOptimisticVerifyTest.java | 31 +--
.../stage/write/WriteUniqueVerifyStageTest.java | 48 ----
.../mvcc/stage/write/WriteUniqueVerifyTest.java | 56 ++---
.../persistence/model/field/AbstractField.java | 4 +
.../persistence/model/field/ArrayField.java | 3 +
.../persistence/model/field/BooleanField.java | 6 +
.../persistence/model/field/ByteArrayField.java | 6 +
.../persistence/model/field/DoubleField.java | 6 +
.../model/field/EntityObjectField.java | 6 +
.../usergrid/persistence/model/field/Field.java | 8 +
.../persistence/model/field/FieldTypeName.java | 42 ++++
.../persistence/model/field/FloatField.java | 6 +
.../persistence/model/field/IntegerField.java | 6 +
.../persistence/model/field/ListField.java | 7 +
.../persistence/model/field/LocationField.java | 6 +
.../persistence/model/field/LongField.java | 6 +
.../persistence/model/field/SetField.java | 6 +
.../persistence/model/field/StringField.java | 6 +
.../persistence/model/field/UUIDField.java | 6 +
stack/corepersistence/pom.xml | 4 +-
.../persistence/index/EntityIndexBatch.java | 3 +
.../queue/impl/SQSQueueManagerImpl.java | 2 +-
.../notifications/ApplicationQueueManager.java | 12 +-
.../services/notifications/TaskManager.java | 102 ++++----
.../apns/NotificationsServiceIT.java | 12 +
.../gcm/NotificationsServiceIT.java | 10 +
64 files changed, 1643 insertions(+), 1147 deletions(-)
----------------------------------------------------------------------