Merge commit 'refs/pull/543/head' of github.com:apache/usergrid into release-2.1.1
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/4f8183ff Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/4f8183ff Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/4f8183ff Branch: refs/heads/datastax-cass-driver Commit: 4f8183ff1af70ca606f0ffb4ae7f7cde88b0647d Parents: f95bf96 5f39ee0 Author: Michael Russo <[email protected]> Authored: Mon Jul 11 08:35:01 2016 -0700 Committer: Michael Russo <[email protected]> Committed: Mon Jul 11 08:35:01 2016 -0700 ---------------------------------------------------------------------- docs/data-storage/collections.md | 144 ++++ .../main/resources/usergrid-default.properties | 44 +- .../src/test/resources/usergrid-test.properties | 20 +- stack/core/pom.xml | 817 ++++++++++--------- .../usergrid/corepersistence/CoreModule.java | 66 +- .../corepersistence/CpEntityManager.java | 319 ++++---- .../corepersistence/CpEntityManagerFactory.java | 68 +- .../corepersistence/CpRelationManager.java | 19 +- .../corepersistence/EntityManagerFig.java | 9 + .../index/CollectionSettingsCache.java | 47 ++ .../index/CollectionSettingsCacheFactory.java | 44 + .../index/CollectionSettingsCacheFig.java | 39 + .../index/CollectionSettingsCacheImpl.java | 122 +++ .../corepersistence/index/IndexSchemaCache.java | 50 -- .../index/IndexSchemaCacheFactory.java | 44 - .../index/IndexSchemaCacheFig.java | 39 - .../index/IndexSchemaCacheImpl.java | 120 --- .../corepersistence/index/IndexServiceImpl.java | 54 +- .../index/ReIndexServiceImpl.java | 44 +- .../service/ApplicationServiceImpl.java | 22 +- .../usergrid/persistence/EntityManager.java | 6 +- .../index/AsyncIndexServiceTest.java | 2 +- .../corepersistence/index/IndexServiceTest.java | 78 +- .../resources/usergrid-custom-test.properties | 13 + stack/corepersistence/actorsystem/pom.xml | 106 +++ .../persistence/actorsystem/ActorSystemFig.java | 83 ++ .../actorsystem/ActorSystemManager.java | 86 ++ .../actorsystem/ActorSystemManagerImpl.java | 459 +++++++++++ .../actorsystem/ActorSystemModule.java | 34 + .../persistence/actorsystem/ClientActor.java | 205 +++++ .../actorsystem/GuiceActorProducer.java | 46 ++ .../persistence/actorsystem/RouterProducer.java | 51 ++ .../src/main/resources/application.conf | 50 ++ .../actorsystem/ActorServiceServiceTest.java | 74 ++ stack/corepersistence/collection/pom.xml | 120 ++- .../collection/EntityCollectionManager.java | 8 +- .../EntityCollectionManagerFactory.java | 4 +- .../exception/WriteUniqueVerifyException.java | 2 +- .../collection/guice/CollectionModule.java | 9 + .../EntityCollectionManagerFactoryImpl.java | 167 ++-- .../impl/EntityCollectionManagerImpl.java | 141 ++-- .../mvcc/stage/CollectionIoEvent.java | 14 +- .../mvcc/stage/delete/MarkCommit.java | 36 +- .../mvcc/stage/write/WriteCommit.java | 82 +- .../mvcc/stage/write/WriteUniqueVerify.java | 105 ++- .../impl/UniqueFieldRowKeySerializer.java | 3 +- .../uniquevalues/ReservationCache.java | 87 ++ .../uniquevalues/ReservationCacheActor.java | 87 ++ .../uniquevalues/UniqueValueActor.java | 282 +++++++ .../uniquevalues/UniqueValueException.java | 33 + .../uniquevalues/UniqueValuesFig.java | 67 ++ .../uniquevalues/UniqueValuesRouter.java | 70 ++ .../uniquevalues/UniqueValuesService.java | 74 ++ .../uniquevalues/UniqueValuesServiceImpl.java | 372 +++++++++ .../uniquevalues/UniqueValuesTable.java | 42 + .../uniquevalues/UniqueValuesTableImpl.java | 94 +++ .../collection/AbstractUniqueValueTest.java | 50 ++ .../collection/EntityCollectionManagerIT.java | 171 ++-- .../EntityCollectionManagerStressTest.java | 21 +- .../collection/guice/TestCollectionModule.java | 17 + .../mvcc/stage/delete/MarkCommitTest.java | 10 +- .../mvcc/stage/write/WriteCommitTest.java | 8 +- .../mvcc/stage/write/WriteUniqueVerifyIT.java | 68 +- .../mvcc/stage/write/WriteUniqueVerifyTest.java | 55 +- .../UniqueValuesServiceDeleteTest.java | 149 ++++ .../uniquevalues/UniqueValuesServiceTest.java | 185 +++++ .../src/test/resources/usergrid-CHOP.properties | 18 + .../src/test/resources/usergrid-UNIT.properties | 19 + .../src/test/resources/usergrid.properties | 32 + stack/corepersistence/common/pom.xml | 23 +- .../core/guice/SettingsValidationCluster.java | 18 + .../core/guice/MigrationManagerRule.java | 18 + .../guice/SettingsValidationClusterTest.java | 19 + .../src/test/resources/usergrid-UNIT.properties | 19 + .../src/test/resources/usergrid.properties | 19 + stack/corepersistence/model/pom.xml | 16 + .../persistence/model/entity/EntityMap.java | 18 + .../persistence/model/field/ArrayField.java | 7 + .../persistence/model/field/ByteArrayField.java | 9 + .../persistence/model/field/DistanceField.java | 9 + .../model/field/EntityObjectField.java | 9 + .../persistence/model/field/FieldTypeName.java | 3 - .../persistence/model/field/ListField.java | 7 + .../persistence/model/field/LocationField.java | 7 + .../persistence/model/field/NullField.java | 7 + .../persistence/model/field/SetField.java | 7 + .../model/field/value/EntityObject.java | 2 +- .../persistence/model/util/EntityUtils.java | 18 + .../persistence/model/util/UUIDGenerator.java | 18 + .../persistence/model/field/EntityTest.java | 18 + .../model/util/UUIDGeneratorTest.java | 18 + stack/corepersistence/pom.xml | 72 ++ stack/corepersistence/queryindex/pom.xml | 18 +- stack/pom.xml | 6 - .../usergrid/rest/AbstractContextResource.java | 1 + .../apache/usergrid/rest/ShutdownListener.java | 11 + .../rest/applications/CollectionResource.java | 97 +-- .../rest/applications/ServiceResource.java | 8 +- ...ApplicationAlreadyExistsExceptionMapper.java | 32 + .../apache/usergrid/rest/NotificationsIT.java | 6 +- .../org/apache/usergrid/rest/UniqueCatsIT.java | 233 ++++++ .../apache/usergrid/rest/UniqueValuesIT.java | 224 +++++ .../rest/UniqueValuesPerformanceIT.java | 165 ++++ .../rest/applications/ApplicationDeleteIT.java | 115 ++- .../applications/ApplicationResourceIT.java | 2 +- .../collection/CollectionsResourceIT.java | 251 +++--- .../resources/corepersistence-UNIT.properties | 2 + .../resources/usergrid-custom-test.properties | 19 +- .../resources/usergrid-rest-deploy-context.xml | 33 +- stack/services/pom.xml | 6 + .../services/AbstractCollectionService.java | 12 +- .../services/AbstractConnectionsService.java | 4 +- .../usergrid/services/AbstractService.java | 53 +- .../applications/ApplicationsService.java | 4 +- .../resources/usergrid-services-context.xml | 2 +- 115 files changed, 6158 insertions(+), 1633 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/4f8183ff/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/IndexServiceImpl.java ----------------------------------------------------------------------
