Merge branch 'USERGRID-405' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-347
# By Shawn Feldman (26) and others # Via Shawn Feldman (9) and Todd Nine (4) * 'USERGRID-405' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (38 commits) undo smaller queries smaller queries smaller queries move initialize index move initialize index Updated load tests to match new index structure Updated tests to also contain larger body for measuring performance with more accurate entity size changing tests to iterate fewer times add delete back add delete back add delay on refresh for tests add small sleep search change Updated surefire to be a single fork to avoid ClassNotFoundException merge issues Fixed logic issue in GeoIT test. adding refresh retry Fixes test that won't work when the system runs too quickly. Fixes rebuild bug Resolves class loader problems during test ... Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d263d36d Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d263d36d Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d263d36d Branch: refs/heads/USERGRID-347 Commit: d263d36d877492b52491f2a418a5f58c209826ec Parents: d7734af 8fe7267 Author: GERey <[email protected]> Authored: Mon Mar 23 11:28:57 2015 -0700 Committer: GERey <[email protected]> Committed: Mon Mar 23 11:28:57 2015 -0700 ---------------------------------------------------------------------- stack/core/pom.xml | 44 +- .../batch/service/SchedulerServiceImpl.java | 17 +- .../corepersistence/CpEntityManager.java | 43 +- .../corepersistence/CpEntityManagerFactory.java | 72 +-- .../corepersistence/CpManagerCache.java | 6 +- .../corepersistence/CpRelationManager.java | 43 +- .../usergrid/corepersistence/CpSetup.java | 16 +- .../usergrid/corepersistence/CpWalker.java | 81 ++- .../usergrid/corepersistence/ManagerCache.java | 3 +- .../events/EntityDeletedHandler.java | 3 +- .../events/EntityVersionDeletedHandler.java | 72 ++- .../migration/EntityTypeMappingMigration.java | 41 +- .../results/FilteringLoader.java | 3 +- .../usergrid/persistence/EntityManager.java | 19 +- .../persistence/EntityManagerFactory.java | 2 - .../persistence/ObservableIterator.java | 1 + .../cassandra/EntityManagerFactoryImpl.java | 5 - .../cassandra/EntityManagerImpl.java | 20 +- .../org/apache/usergrid/CoreApplication.java | 24 +- .../java/org/apache/usergrid/CoreITSetup.java | 6 + .../org/apache/usergrid/CoreITSetupImpl.java | 27 +- .../org/apache/usergrid/TestEntityIndex.java | 27 + .../corepersistence/StaleIndexCleanupTest.java | 87 ++-- .../migration/EntityTypeMappingMigrationIT.java | 2 +- .../usergrid/persistence/CollectionIT.java | 80 +-- .../usergrid/persistence/CountingMutatorIT.java | 4 +- .../persistence/EntityConnectionsIT.java | 14 +- .../usergrid/persistence/EntityManagerIT.java | 16 +- .../org/apache/usergrid/persistence/GeoIT.java | 28 +- .../persistence/GeoQueryBooleanTest.java | 4 +- .../apache/usergrid/persistence/IndexIT.java | 14 +- .../usergrid/persistence/PathQueryIT.java | 6 +- .../PerformanceEntityRebuildIndexTest.java | 39 +- .../usergrid/persistence/PermissionsIT.java | 4 +- .../cassandra/EntityManagerFactoryImplIT.java | 4 +- .../persistence/query/CollectionIoHelper.java | 2 +- .../persistence/query/ConnectionHelper.java | 2 +- .../query/IntersectionTransitivePagingIT.java | 2 +- .../query/IntersectionUnionPagingIT.java | 2 +- .../persistence/query/IteratingQueryIT.java | 16 +- .../resources/usergrid-custom-test.properties | 1 + stack/corepersistence/collection/pom.xml | 14 +- .../impl/EntityCollectionManagerImpl.java | 10 +- .../collection/impl/EntityDeletedTask.java | 20 +- .../impl/EntityVersionCleanupTask.java | 40 +- .../impl/EntityVersionCreatedTask.java | 26 +- .../mvcc/stage/write/WriteCommit.java | 2 +- .../mvcc/stage/write/WriteUniqueVerify.java | 8 +- .../MvccEntitySerializationStrategyImpl.java | 92 ++-- .../MvccEntitySerializationStrategyV3Impl.java | 94 ++-- .../UniqueValueSerializationStrategyImpl.java | 8 - .../migration/MvccEntityDataMigrationImpl.java | 171 +++---- .../collection/util/EntityUtils.java | 72 --- .../mvcc/stage/AbstractEntityStageTest.java | 2 +- .../mvcc/stage/AbstractMvccEntityStageTest.java | 2 +- .../mvcc/stage/TestEntityGenerator.java | 2 +- .../persistence/collection/rx/ParallelTest.java | 10 +- ...MvccEntitySerializationStrategyImplTest.java | 4 +- ...ccEntitySerializationStrategyV1ImplTest.java | 4 +- ...ccEntitySerializationStrategyV2ImplTest.java | 2 +- .../impl/SerializationComparison.java | 4 +- ...ctMvccEntityDataMigrationV1ToV3ImplTest.java | 2 +- .../collection/util/InvalidEntityGenerator.java | 1 + stack/corepersistence/common/pom.xml | 15 +- .../astyanax/MultiKeyColumnNameIterator.java | 4 +- .../MultiKeyColumnNameIteratorTest.java | 187 ++++--- .../astyanax/MultiRowColumnIteratorTest.java | 50 +- .../graph/impl/GraphManagerImpl.java | 6 +- .../graph/impl/stage/EdgeMetaRepairImpl.java | 2 + .../impl/stage/NodeDeleteListenerImpl.java | 2 +- .../impl/migration/EdgeDataMigrationImpl.java | 87 ++-- .../persistence/graph/GraphManagerIT.java | 17 +- .../graph/GraphManagerShardConsistencyIT.java | 2 +- .../usergrid/persistence/graph/SimpleTest.java | 12 +- .../migration/EdgeDataMigrationImplTest.java | 2 +- stack/corepersistence/model/pom.xml | 1 - .../persistence/model/util/EntityUtils.java | 72 +++ stack/corepersistence/pom.xml | 8 +- stack/corepersistence/queryindex/pom.xml | 63 +-- .../persistence/index/AliasedEntityIndex.java | 7 +- .../index/ApplicationEntityIndex.java | 55 ++ .../usergrid/persistence/index/EntityIndex.java | 50 +- .../persistence/index/EntityIndexBatch.java | 5 + .../persistence/index/EntityIndexFactory.java | 2 +- .../persistence/index/IndexIdentifier.java | 26 +- .../usergrid/persistence/index/SearchType.java | 49 ++ .../usergrid/persistence/index/SearchTypes.java | 14 +- .../persistence/index/guice/IndexModule.java | 5 +- .../impl/EsApplicationEntityIndexImpl.java | 383 ++++++++++++++ .../index/impl/EsEntityIndexBatchImpl.java | 80 ++- .../index/impl/EsEntityIndexFactoryImpl.java | 27 +- .../index/impl/EsEntityIndexImpl.java | 499 ++++--------------- .../persistence/index/impl/EsQueryVistor.java | 88 ++-- .../persistence/index/impl/IndexingUtils.java | 140 +++--- .../persistence/index/query/EntityResults.java | 108 ---- .../usergrid/persistence/index/query/Query.java | 6 +- .../persistence/index/query/Results.java | 148 ------ .../persistence/index/utils/ListUtils.java | 6 +- .../persistence/index/guice/IndexTestFig.java | 62 +++ .../index/guice/TestIndexModule.java | 8 +- .../index/impl/CorePerformanceIT.java | 339 ------------- .../impl/EntityConnectionIndexImplTest.java | 306 ------------ .../persistence/index/impl/EntityIndexTest.java | 195 +++----- .../index/impl/IndexLoadTestsIT.java | 394 +++++++++++++++ stack/pom.xml | 16 +- stack/rest/pom.xml | 1 + .../usergrid/rest/AbstractContextResource.java | 102 ++-- .../org/apache/usergrid/rest/IndexResource.java | 2 +- .../rest/test/RefreshIndexResource.java | 17 +- .../resources/usergrid-custom-test.properties | 2 + stack/services/pom.xml | 1 + .../management/importer/ImportServiceImpl.java | 34 +- .../impl/ApplicationQueueManagerImpl.java | 195 ++++---- .../org/apache/usergrid/ServiceApplication.java | 18 +- .../apache/usergrid/management/EmailFlowIT.java | 6 +- .../usergrid/management/OrganizationIT.java | 10 +- .../org/apache/usergrid/management/RoleIT.java | 4 +- .../cassandra/ManagementServiceIT.java | 22 +- .../management/export/ExportServiceIT.java | 12 +- .../management/importer/ImportCollectionIT.java | 15 +- .../usergrid/services/ConnectionsServiceIT.java | 10 +- .../usergrid/services/GroupServiceIT.java | 6 +- .../usergrid/services/RolesServiceIT.java | 2 +- .../usergrid/services/UsersServiceIT.java | 2 +- .../AbstractServiceNotificationIT.java | 2 +- .../apns/NotificationsServiceIT.java | 40 +- .../gcm/NotificationsServiceIT.java | 4 +- .../resources/usergrid-custom-test.properties | 2 + .../setup/ConcurrentProcessSingleton.java | 16 +- 129 files changed, 2544 insertions(+), 3021 deletions(-) ----------------------------------------------------------------------
