Merge branch 'master' into asf-site
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cbe501af Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cbe501af Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cbe501af Branch: refs/heads/usergrid-1318-queue Commit: cbe501afabe7c3453595947ead1811dfb28ad2ea Parents: 0fd9939 c3299bc Author: Dave Johnson <snoopd...@apache.org> Authored: Fri Nov 6 15:37:26 2015 -0500 Committer: Dave Johnson <snoopd...@apache.org> Committed: Fri Nov 6 15:37:26 2015 -0500 ---------------------------------------------------------------------- .../installation/ug2-deploy-to-tomcat.txt | 2 + .../docs/installation/ug2-deploy-to-tomcat.html | 2 + docs/installation/ug2-deploy-to-tomcat.md | 2 + .../corepersistence/CpEntityManagerFactory.java | 7 +- .../corepersistence/CpRelationManager.java | 16 +- .../asyncevents/AmazonAsyncEventService.java | 99 +-- .../asyncevents/AsyncEventService.java | 5 + .../asyncevents/EventBuilder.java | 25 +- .../asyncevents/EventBuilderImpl.java | 60 +- .../index/IndexProcessorFig.java | 15 +- .../corepersistence/index/IndexServiceImpl.java | 5 +- .../pipeline/read/FilterResult.java | 7 + .../read/traverse/AbstractReadGraphFilter.java | 136 +++- .../read/traverse/EdgeCursorSerializer.java | 8 +- .../read/traverse/EntityLoadVerifyFilter.java | 24 +- .../traverse/ReadGraphCollectionFilter.java | 11 +- .../ReadGraphConnectionByTypeFilter.java | 11 +- .../traverse/ReadGraphConnectionFilter.java | 11 +- .../results/ObservableQueryExecutor.java | 7 + .../service/StatusServiceImpl.java | 3 +- .../usergrid/persistence/CredentialsInfo.java | 46 ++ .../persistence/ObservableIterator.java | 83 --- .../index/AsyncIndexServiceTest.java | 3 +- .../corepersistence/index/IndexServiceTest.java | 12 +- .../usergrid/corepersistence/index/RxTest.java | 4 +- .../pipeline/cursor/CursorTest.java | 24 +- .../service/ConnectionServiceImplTest.java | 5 +- .../persistence/ApplicationServiceIT.java | 4 +- .../usergrid/persistence/RebuildIndexTest.java | 118 +++- .../persistence/core/astyanax/CassandraFig.java | 2 +- .../core/astyanax/MultiRowColumnIterator.java | 46 +- .../persistence/core/rx/ObservableIterator.java | 2 +- .../usergrid/persistence/graph/GraphFig.java | 4 +- .../persistence/graph/GraphManager.java | 14 +- .../usergrid/persistence/graph/MarkedEdge.java | 15 +- .../persistence/graph/guice/GraphModule.java | 11 +- .../graph/impl/GraphManagerImpl.java | 90 ++- .../graph/impl/SimpleMarkedEdge.java | 62 +- .../impl/stage/NodeDeleteListenerImpl.java | 27 +- .../impl/EdgeSerializationImpl.java | 17 +- .../impl/shard/AsyncTaskExecutor.java | 34 + .../graph/serialization/impl/shard/Shard.java | 15 + .../impl/shard/ShardEntryGroup.java | 13 +- .../impl/shard/ShardGroupCompaction.java | 4 - .../impl/shard/ShardGroupDeletion.java | 78 +++ .../impl/shard/impl/AsyncTaskExecutorImpl.java | 53 ++ .../shard/impl/NodeShardAllocationImpl.java | 81 ++- .../shard/impl/ShardGroupColumnIterator.java | 72 +- .../shard/impl/ShardGroupCompactionImpl.java | 10 +- .../impl/shard/impl/ShardGroupDeletionImpl.java | 230 +++++++ .../impl/shard/impl/ShardsColumnIterator.java | 10 + .../persistence/graph/GraphManagerIT.java | 76 +-- .../persistence/graph/GraphManagerLoadTest.java | 10 +- .../graph/GraphManagerShardConsistencyIT.java | 382 ++++++++--- .../graph/GraphManagerStressTest.java | 16 +- .../impl/shard/ShardEntryGroupTest.java | 14 + .../impl/shard/ShardGroupCompactionTest.java | 30 +- .../shard/impl/ShardGroupDeletionImplTest.java | 341 +++++++++ stack/corepersistence/pom.xml | 2 +- .../persistence/index/CandidateResult.java | 11 +- .../persistence/index/EntityIndexBatch.java | 2 +- .../usergrid/persistence/index/IndexFig.java | 6 + .../index/impl/DeIndexOperation.java | 5 + .../index/impl/EsEntityIndexBatchImpl.java | 34 +- .../index/impl/EsEntityIndexImpl.java | 188 +++-- .../persistence/index/impl/IndexingUtils.java | 2 +- .../persistence/index/impl/EntityIndexTest.java | 14 +- .../usergrid/persistence/queue/QueueFig.java | 2 +- stack/loadtests/README.md | 14 +- stack/loadtests/runAuditDeleteEntities.sh | 65 ++ .../runAuditGetAllAppCollectionEntities.sh | 6 +- .../loadtests/runAuditGetCollectionEntities.sh | 6 +- .../runAuditVerifyCollectionEntities.sh | 2 +- stack/loadtests/runLoadEntitiesUnlimited.sh | 1 + stack/loadtests/runOrgAppSetup.sh | 17 +- .../datagenerators/FeederGenerator.scala | 16 +- .../usergrid/enums/ConfigProperties.scala | 8 +- .../apache/usergrid/enums/ScenarioType.scala | 3 +- .../apache/usergrid/helpers/Extractors.scala | 18 +- .../usergrid/scenarios/AuditScenarios.scala | 203 ++++-- .../scenarios/EntityCollectionScenarios.scala | 102 ++- .../org/apache/usergrid/settings/Settings.scala | 42 +- .../usergrid/simulations/AuditSimulation.scala | 15 +- .../simulations/ConfigurableSimulation.scala | 2 +- stack/loadtests/testConfig.sh | 4 +- .../org/apache/usergrid/rest/IndexResource.java | 350 ---------- .../apache/usergrid/rest/MigrateResource.java | 275 -------- .../apache/usergrid/rest/SystemResource.java | 111 --- .../rest/applications/ApplicationResource.java | 50 ++ .../rest/applications/users/UserResource.java | 134 +++- .../organizations/OrganizationsResource.java | 33 + .../rest/system/ConnectionResource.java | 216 ++++++ .../usergrid/rest/system/DatabaseResource.java | 2 + .../usergrid/rest/system/IndexResource.java | 353 ++++++++++ .../usergrid/rest/system/MigrateResource.java | 277 ++++++++ .../usergrid/rest/system/SystemResource.java | 121 ++++ .../collection/users/UserResourceIT.java | 117 ++++ stack/scripts/create_test_data.py | 222 ++++++ stack/scripts/migrate_entity_data.py | 18 +- stack/scripts/multitenant_migrate.py | 683 +++++++++++++++++++ .../management/AppInfoMigrationPlugin.java | 5 +- .../usergrid/management/ManagementService.java | 14 +- .../cassandra/ManagementServiceImpl.java | 43 +- 103 files changed, 4737 insertions(+), 1591 deletions(-) ----------------------------------------------------------------------
