Merge branch 'es-type-updates-ryan-external' into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d2d1fe74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d2d1fe74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d2d1fe74 Branch: refs/heads/two-dot-o Commit: d2d1fe74fef4c02c14d8149355620957aa453ab7 Parents: 84b8365 28eb2cd Author: Todd Nine <[email protected]> Authored: Wed Nov 12 12:11:31 2014 -0700 Committer: Todd Nine <[email protected]> Committed: Wed Nov 12 12:11:31 2014 -0700 ---------------------------------------------------------------------- stack/awscluster/src/main/cql/create_locks.cql | 26 - .../awscluster/src/main/cql/create_usergrid.cql | 28 - .../main/cql/create_usergrid_applications.cql | 47 -- stack/awscluster/src/main/cql/update_locks.cql | 23 + .../awscluster/src/main/cql/update_usergrid.cql | 27 + .../main/cql/update_usergrid_applications.cql | 46 ++ .../main/dist/init_instance/create_keyspaces.sh | 61 -- .../main/dist/init_instance/init_db_server.sh | 4 - .../main/dist/init_instance/init_rest_server.sh | 28 +- .../main/dist/init_instance/install_yourkit.sh | 6 +- .../main/dist/init_instance/update_keyspaces.sh | 66 ++ .../src/main/groovy/NodeRegistry.groovy | 8 +- .../src/main/groovy/configure_usergrid.groovy | 2 +- stack/awscluster/ugcluster-cf.json | 246 +++++-- .../main/resources/usergrid-default.properties | 2 +- .../src/test/resources/usergrid-test.properties | 6 +- .../CpEntityIndexDeleteListener.java | 2 +- .../corepersistence/CpEntityManager.java | 40 +- .../corepersistence/CpRelationManager.java | 533 +++++++-------- .../usergrid/corepersistence/CpSetup.java | 4 +- .../results/FilteringLoader.java | 26 +- .../results/ResultsLoaderFactory.java | 9 +- .../results/ResultsLoaderFactoryImpl.java | 6 +- .../corepersistence/util/CpNamingUtils.java | 16 +- .../persistence/cassandra/CassandraService.java | 3 + .../cassandra/RelationManagerImpl.java | 18 +- .../apache/usergrid/ConcurrentCoreITSuite.java | 2 +- .../usergrid/ConcurrentCoreIteratorITSuite.java | 4 +- .../org/apache/usergrid/CoreApplication.java | 3 +- .../org/apache/usergrid/CoreITSetupImpl.java | 1 - .../java/org/apache/usergrid/CoreITSuite.java | 4 +- .../batch/job/AbstractSchedulerRuntimeIT.java | 7 +- .../usergrid/batch/job/SchedulerRuntime1IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime2IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime3IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime4IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime5IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime6IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime7IT.java | 2 + .../usergrid/batch/job/SchedulerRuntime8IT.java | 2 +- .../corepersistence/StaleIndexCleanupTest.java | 166 ++--- .../org/apache/usergrid/persistence/GeoIT.java | 34 +- .../apache/usergrid/persistence/QueryTest.java | 15 + .../resources/usergrid-custom-test.properties | 4 +- .../data/MigrationInfoSerializationImpl.java | 2 +- .../core/astyanax/ColumnNameIteratorTest.java | 21 +- .../MultiKeyColumnNameIteratorTest.java | 20 +- .../astyanax/MultiRowColumnIteratorTest.java | 20 +- .../core/cassandra/CassandraRule.java | 114 ---- .../data/MigrationInfoSerializationTest.java | 13 +- .../persistence/core/test/ITRunner.java | 20 +- .../graph/CommittedGraphManagerIT.java | 2 +- .../persistence/graph/GraphManagerLoadTest.java | 4 +- .../graph/GraphManagerShardConsistencyIT.java | 6 - .../graph/GraphManagerShardingIT.java | 4 +- .../graph/GraphManagerStressTest.java | 4 +- .../graph/StorageGraphManagerIT.java | 2 +- .../graph/guice/TestGraphModule.java | 2 +- .../graph/impl/EdgeDeleteListenerTest.java | 6 +- .../graph/impl/NodeDeleteListenerTest.java | 6 +- .../graph/impl/stage/EdgeDeleteRepairTest.java | 4 +- .../graph/impl/stage/EdgeMetaRepairTest.java | 6 +- .../EdgeMetaDataSerializationProxyV2Test.java | 7 +- .../EdgeMetaDataSerializationV1Test.java | 4 +- .../EdgeMetaDataSerializationV2Test.java | 4 +- .../EdgeSerializationChopTest.java | 4 +- .../serialization/EdgeSerializationTest.java | 7 +- .../serialization/NodeSerializationTest.java | 4 +- .../PermanentSerializationTest.java | 2 +- .../impl/shard/EdgeShardSerializationTest.java | 9 +- .../NodeShardCounterSerializationTest.java | 8 +- stack/corepersistence/pom.xml | 2 +- .../usergrid/persistence/index/EntityIndex.java | 4 +- .../usergrid/persistence/index/SearchTypes.java | 130 ++++ .../index/impl/EsEntityIndexBatchImpl.java | 112 ++-- .../index/impl/EsEntityIndexImpl.java | 179 +++-- .../persistence/index/impl/EsQueryVistor.java | 3 +- .../persistence/index/impl/IndexScopeImpl.java | 14 +- .../persistence/index/impl/IndexingUtils.java | 107 ++- .../usergrid/persistence/index/query/Query.java | 76 ++- .../index/impl/CorePerformanceIT.java | 40 +- .../index/impl/ElasticSearchResource.java | 115 +--- .../impl/EntityConnectionIndexImplTest.java | 239 ++++++- .../persistence/index/impl/EntityIndexTest.java | 115 ++-- .../persistence/query/tree/GrammarTreeTest.java | 2 +- .../src/test/resources/dynamic-test.properties | 2 +- .../src/test/resources/usergrid-UNIT.properties | 2 +- .../usergrid/launcher/EmbeddedServerHelper.java | 4 +- stack/loadtests/README.md | 2 +- stack/pom.xml | 7 - .../apache/usergrid/rest/AbstractRestIT.java | 22 +- .../java/org/apache/usergrid/rest/ITSetup.java | 16 +- .../org/apache/usergrid/rest/RestITSuite.java | 2 +- .../apache/usergrid/rest/TestContextSetup.java | 10 +- .../rest/management/OrganizationsIT.java | 328 +++++----- .../rest/management/RegistrationIT.java | 61 +- .../usergrid/rest/test/security/TestUser.java | 3 + .../resources/usergrid-custom-test.properties | 4 +- .../org/apache/usergrid/ServiceITSuite.java | 2 +- .../resources/usergrid-custom-test.properties | 4 +- stack/test-utils/pom.xml | 5 - .../usergrid/cassandra/CassandraResource.java | 648 ++++--------------- .../cassandra/CassandraResourceTest.java | 7 +- .../resources/usergrid-custom-test.properties | 2 +- 104 files changed, 2041 insertions(+), 2072 deletions(-) ----------------------------------------------------------------------
