Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid 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/efc0ec37 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/efc0ec37 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/efc0ec37 Branch: refs/heads/two-dot-o Commit: efc0ec37a775fdc6b955e0e7b4e5542f513a56b1 Parents: 02c9f42 19179bc Author: Dave Johnson <[email protected]> Authored: Fri Nov 7 08:33:24 2014 -0500 Committer: Dave Johnson <[email protected]> Committed: Fri Nov 7 08:33:24 2014 -0500 ---------------------------------------------------------------------- portal/config.js | 3 +- stack/awscluster/assembly.xml | 8 +- stack/awscluster/pom.xml | 379 ++++++----- .../main/dist/init_instance/create_keyspaces.sh | 2 + .../src/main/dist/init_instance/create_raid0.sh | 9 +- .../main/dist/init_instance/init_db_server.sh | 15 +- .../main/dist/init_instance/init_es_server.sh | 8 +- .../dist/init_instance/init_graphite_server.sh | 2 + .../dist/init_instance/init_opscenter_server.sh | 287 +++++++++ .../main/dist/init_instance/init_rest_server.sh | 66 +- .../dist/init_instance/install_cassandra.sh | 22 +- .../dist/init_instance/install_elasticsearch.sh | 57 +- .../init_instance/install_opscenter_agent.sh | 12 +- stack/awscluster/src/main/dist/update.sh | 16 +- .../main/groovy/configure_elasticsearch.groovy | 84 ++- .../groovy/configure_opscenter_agent.groovy | 4 +- .../groovy/configure_opscenter_cassandra.groovy | 120 ++++ .../groovy/configure_opscenter_usergrid.groovy | 58 ++ .../src/main/groovy/configure_usergrid.groovy | 19 +- stack/awscluster/ugcluster-cf.json | 321 +++++++++- .../main/resources/usergrid-default.properties | 5 +- stack/core/pom.xml | 15 +- .../corepersistence/CpEntityManagerFactory.java | 22 + .../corepersistence/CpManagerCache.java | 12 +- .../usergrid/corepersistence/CpSetup.java | 5 +- .../usergrid/corepersistence/GuiceModule.java | 8 + .../HybridEntityManagerFactory.java | 19 + .../migration/GraphShardVersionMigration.java | 43 ++ .../corepersistence/migration/Versions.java | 37 ++ .../persistence/EntityManagerFactory.java | 18 + .../cassandra/EntityManagerFactoryImpl.java | 19 + .../usergrid/ConcurrentCoreIteratorITSuite.java | 3 +- .../usergrid/ConcurrentCoreTestSuite.java | 4 +- .../org/apache/usergrid/CoreITSetupImpl.java | 4 +- .../java/org/apache/usergrid/CoreITSuite.java | 5 +- .../java/org/apache/usergrid/CoreTestSuite.java | 4 +- .../batch/job/AbstractSchedulerRuntimeIT.java | 9 +- .../CpEntityDeleteListenerTest.java | 3 +- .../CpEntityIndexDeleteListenerTest.java | 3 - .../SimpleIndexBucketLocatorImplTest.java | 177 ------ .../SimpleIndexShardLocatorImplTest.java | 177 ++++++ stack/corepersistence/collection/pom.xml | 7 +- .../impl/CollectionPrefixedKey.java | 100 +++ .../impl/CollectionScopedRowKeySerializer.java | 25 +- .../MvccEntitySerializationStrategyImpl.java | 88 ++- .../MvccLogEntrySerializationStrategyImpl.java | 66 +- .../serialization/impl/SerializationModule.java | 2 +- .../UniqueValueSerializationStrategyImpl.java | 31 +- .../collection/CollectionContextImplTest.java | 3 - .../EntityCollectionManagerFactoryTest.java | 6 +- .../collection/EntityCollectionManagerIT.java | 4 +- .../EntityCollectionManagerStressTest.java | 6 +- .../EntityCollectionManagerSyncIT.java | 4 +- .../collection/guice/MigrationManagerRule.java | 4 +- .../collection/guice/TestCollectionModule.java | 3 +- .../collection/guice/TestModule.java | 48 -- ...niqueValueSerializationStrategyImplTest.java | 4 +- .../stage/write/WriteOptimisticVerifyTest.java | 2 +- .../mvcc/stage/write/WriteUniqueVerifyIT.java | 4 +- .../mvcc/stage/write/WriteUniqueVerifyTest.java | 4 +- ...MvccEntitySerializationStrategyImplTest.java | 14 +- .../impl/MvccLESSTransientTest.java | 78 ++- ...ccLogEntrySerializationStrategyImplTest.java | 4 +- .../impl/ScopedRowKeySerializerTest.java | 18 +- stack/corepersistence/common/pom.xml | 15 +- .../core/astyanax/BucketScopedRowKey.java | 114 ++++ .../astyanax/BucketScopedRowKeySerializer.java | 91 +++ .../core/astyanax/CassandraConfig.java | 6 + .../core/astyanax/CassandraConfigImpl.java | 23 + .../persistence/core/astyanax/CassandraFig.java | 14 + .../persistence/core/astyanax/ColumnSearch.java | 13 +- .../core/astyanax/CompositeFieldSerializer.java | 1 + .../core/astyanax/IdRowCompositeSerializer.java | 1 + .../core/astyanax/MultiRowColumnIterator.java | 236 +++++-- .../core/astyanax/MultiTennantColumnFamily.java | 8 +- .../OrganizationScopedRowKeySerializer.java | 85 --- .../persistence/core/astyanax/ScopedRowKey.java | 13 +- .../core/astyanax/ScopedRowKeySerializer.java | 83 +++ .../astyanax/StringRowCompositeSerializer.java | 68 ++ .../persistence/core/guice/CommonModule.java | 43 +- .../persistence/core/guice/CurrentImpl.java | 42 ++ .../persistence/core/guice/PreviousImpl.java | 42 ++ .../persistence/core/guice/ProxyImpl.java | 42 ++ .../persistence/core/migration/Migration.java | 36 -- .../core/migration/MigrationException.java | 37 -- .../core/migration/MigrationManager.java | 34 - .../core/migration/MigrationManagerFig.java | 22 - .../core/migration/MigrationManagerImpl.java | 196 ------ .../core/migration/data/DataMigration.java | 84 +++ .../migration/data/DataMigrationException.java | 39 ++ .../migration/data/DataMigrationManager.java | 55 ++ .../data/DataMigrationManagerImpl.java | 258 ++++++++ .../data/MigrationInfoSerialization.java | 66 ++ .../data/MigrationInfoSerializationImpl.java | 178 ++++++ .../core/migration/schema/Migration.java | 36 ++ .../migration/schema/MigrationException.java | 37 ++ .../core/migration/schema/MigrationManager.java | 34 + .../migration/schema/MigrationManagerFig.java | 22 + .../migration/schema/MigrationManagerImpl.java | 196 ++++++ .../core/shard/ExpandingShardLocator.java | 95 +++ .../persistence/core/shard/ShardLocator.java | 77 +++ .../persistence/core/shard/StringHashUtils.java | 54 ++ .../core/astyanax/ColumnNameIteratorTest.java | 6 + .../MultiKeyColumnNameIteratorTest.java | 6 + .../astyanax/MultiRowColumnIteratorTest.java | 42 ++ .../core/cassandra/CassandraRule.java | 2 +- .../persistence/core/cassandra/ITRunner.java | 60 -- .../core/guice/MigrationManagerRule.java | 4 +- .../core/guice/TestCommonModule.java | 34 + .../persistence/core/guice/TestModule.java | 48 ++ .../data/DataMigrationManagerImplTest.java | 220 +++++++ .../data/MigrationInfoSerializationTest.java | 105 ++++ .../core/shard/ExpandingShardLocatorTest.java | 65 ++ .../core/shard/ShardLocatorTest.java | 64 ++ .../persistence/core/test/ITRunner.java | 119 ++++ .../persistence/core/test/UseModules.java | 69 ++ stack/corepersistence/graph/pom.xml | 15 +- .../persistence/graph/guice/GraphModule.java | 34 +- .../graph/impl/GraphManagerImpl.java | 13 +- .../graph/impl/stage/EdgeMetaRepairImpl.java | 3 +- .../impl/stage/NodeDeleteListenerImpl.java | 3 +- .../EdgeMetadataSerialization.java | 2 +- .../graph/serialization/NodeSerialization.java | 2 +- .../impl/EdgeMetadataSerializationImpl.java | 476 -------------- .../EdgeMetadataSerializationProxyImpl.java | 276 ++++++++ .../impl/EdgeMetadataSerializationV1Impl.java | 478 ++++++++++++++ .../impl/EdgeMetadataSerializationV2Impl.java | 627 +++++++++++++++++++ .../impl/NodeSerializationImpl.java | 36 +- .../impl/shard/EdgeColumnFamilies.java | 14 +- .../impl/shard/EdgeShardSerialization.java | 2 +- .../count/NodeShardCounterSerialization.java | 2 +- .../NodeShardCounterSerializationImpl.java | 10 +- .../impl/shard/impl/EdgeSearcher.java | 18 +- .../shard/impl/EdgeShardSerializationImpl.java | 14 +- .../impl/ShardedEdgeSerializationImpl.java | 76 +-- .../impl/shard/impl/ShardsColumnIterator.java | 21 +- .../shard/impl/SizebasedEdgeColumnFamilies.java | 34 +- .../impl/shard/impl/SourceEdgeSearcher.java | 22 - .../serialize/EdgeShardRowKeySerializer.java | 2 + .../shard/impl/serialize/RowSerializer.java | 2 +- .../shard/impl/serialize/RowTypeSerializer.java | 3 +- .../graph/CommittedGraphManagerIT.java | 4 +- .../persistence/graph/GraphManagerIT.java | 9 +- .../persistence/graph/GraphManagerLoadTest.java | 4 +- .../graph/GraphManagerShardConsistencyIT.java | 5 +- .../graph/GraphManagerShardingIT.java | 4 +- .../graph/GraphManagerStressTest.java | 4 +- .../usergrid/persistence/graph/SimpleTest.java | 4 +- .../graph/StorageGraphManagerIT.java | 4 +- .../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 +- .../EdgeMetaDataSerializationProxyV1Test.java | 85 +++ .../EdgeMetaDataSerializationProxyV2Test.java | 83 +++ .../EdgeMetaDataSerializationV1Test.java | 69 ++ .../EdgeMetaDataSerializationV2Test.java | 52 ++ .../EdgeMetadataSerializationTest.java | 33 +- .../EdgeSerializationChopTest.java | 4 +- .../serialization/EdgeSerializationTest.java | 50 +- .../serialization/NodeSerializationTest.java | 10 +- .../PermanentSerializationTest.java | 9 +- .../graph/serialization/TestCount.java | 52 +- .../impl/shard/EdgeShardSerializationTest.java | 35 +- .../impl/shard/NodeShardAllocationTest.java | 15 +- .../impl/shard/NodeShardCacheTest.java | 118 ++-- .../impl/shard/ShardEntryGroupTest.java | 57 +- .../impl/shard/ShardGroupCompactionTest.java | 181 +++--- .../shard/count/NodeShardApproximationTest.java | 18 +- .../NodeShardCounterSerializationTest.java | 10 +- .../shard/impl/ShardEntryGroupIteratorTest.java | 9 +- ...rceDirectedEdgeDescendingComparatorTest.java | 4 +- .../1.4-UG/_maven.repositories | 4 - .../1.4-UG/jukito-build-tools-1.4-UG.jar | Bin 4603 -> 0 bytes .../1.4-UG/jukito-build-tools-1.4-UG.pom | 13 - .../jukito-build-tools/maven-metadata-local.xml | 12 - .../jukito-parent/1.4-UG/_maven.repositories | 3 - .../1.4-UG/jukito-parent-1.4-UG.pom | 313 --------- .../jukito-parent/maven-metadata-local.xml | 12 - .../jukito-samples/1.4-UG/_maven.repositories | 4 - .../1.4-UG/jukito-samples-1.4-UG.jar | Bin 5103 -> 0 bytes .../1.4-UG/jukito-samples-1.4-UG.pom | 33 - .../jukito-samples/maven-metadata-local.xml | 12 - .../jukito/jukito/1.4-UG/_maven.repositories | 5 - .../jukito/1.4-UG/jukito-1.4-UG-sources.jar | Bin 30660 -> 0 bytes .../org/jukito/jukito/1.4-UG/jukito-1.4-UG.jar | Bin 42832 -> 0 bytes .../org/jukito/jukito/1.4-UG/jukito-1.4-UG.pom | 93 --- .../org/jukito/jukito/maven-metadata-local.xml | 12 - stack/corepersistence/map/pom.xml | 6 - .../persistence/map/guice/MapModule.java | 2 +- .../persistence/map/impl/MapSerialization.java | 2 +- .../map/impl/MapSerializationImpl.java | 97 ++- .../persistence/map/MapManagerTest.java | 4 +- .../persistence/map/guice/TestMapModule.java | 2 +- stack/corepersistence/pom.xml | 4 +- stack/corepersistence/queryindex/pom.xml | 11 - .../usergrid/persistence/index/IndexFig.java | 14 +- .../index/impl/EsEntityIndexBatchImpl.java | 23 +- .../index/impl/EsEntityIndexImpl.java | 109 ++-- .../persistence/index/impl/EsProvider.java | 235 +++---- .../persistence/index/impl/FailureMonitor.java | 41 ++ .../index/impl/FailureMonitorImpl.java | 101 +++ .../index/guice/TestIndexModule.java | 2 +- .../index/impl/CorePerformanceIT.java | 2 +- .../index/impl/ElasticSearchResource.java | 171 +++++ .../index/impl/ElasticSearchRule.java | 50 -- .../impl/EntityConnectionIndexImplTest.java | 7 +- .../persistence/index/impl/EntityIndexTest.java | 10 +- .../persistence/index/impl/EsRunner.java | 51 ++ .../src/test/resources/usergrid-UNIT.properties | 2 +- stack/corepersistence/queue/pom.xml | 9 - .../usergrid/persistence/queue/QueueFig.java | 4 +- .../persistence/queue/QueueManagerTest.java | 6 +- .../queue/guice/TestQueueModule.java | 2 +- stack/loadtests/README.md | 27 + stack/loadtests/pom.xml | 18 +- .../datagenerators/EntityDataGenerator.scala | 26 +- .../datagenerators/FeederGenerator.scala | 15 +- .../org/apache/usergrid/helpers/Setup.scala | 168 +++++ .../scenarios/ApplicationScenarios.scala | 10 +- .../scenarios/ConnectionScenarios.scala | 29 +- .../usergrid/scenarios/DeviceScenarios.scala | 8 +- .../usergrid/scenarios/EntityScenarios.scala | 65 ++ .../usergrid/scenarios/GeoScenarios.scala | 6 +- .../scenarios/NotificationScenarios.scala | 25 +- .../usergrid/scenarios/NotifierScenarios.scala | 20 +- .../scenarios/OrganizationScenarios.scala | 27 +- .../usergrid/scenarios/TokenScenarios.scala | 29 +- .../usergrid/scenarios/UserScenarios.scala | 28 +- .../org/apache/usergrid/settings/Settings.scala | 32 +- .../usergrid/simulations/AppSimulation.scala | 52 ++ .../simulations/ConnectionsSimulation.scala | 53 ++ .../PostCustomEntitySimulation.scala | 61 ++ .../simulations/PostDevicesSimulation.scala | 45 -- ...PushNotificationTargetDeviceSimulation.scala | 57 -- .../PushNotificationTargetUserSimulation.scala | 59 +- .../src/test/resources/logback-test.xml | 1 - stack/loadtests/src/test/scala/Engine.scala | 4 +- stack/pom.xml | 25 +- .../apache/usergrid/rest/SystemResource.java | 94 ++- .../java/org/apache/usergrid/rest/ITSetup.java | 8 +- .../org/apache/usergrid/rest/RestITSuite.java | 4 +- .../org/apache/usergrid/ServiceITSetupImpl.java | 1 + .../org/apache/usergrid/ServiceITSuite.java | 3 +- stack/test-utils/pom.xml | 7 + .../org/apache/usergrid/ElasticSearchMain.java | 107 ---- .../apache/usergrid/ElasticSearchResource.java | 178 ------ 248 files changed, 8298 insertions(+), 3567 deletions(-) ----------------------------------------------------------------------
