You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/11/18 17:28:11 UTC
[50/50] usergrid git commit: Merge branch 'master' into USERGRID-872
Merge branch 'master' into USERGRID-872
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/c8ff1022
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/c8ff1022
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/c8ff1022
Branch: refs/heads/USERGRID-872
Commit: c8ff1022d58599c2aa053905679b56e9f3b02bdd
Parents: d04f6e3 6f3541b
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Nov 18 11:26:48 2015 -0500
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Nov 18 11:26:48 2015 -0500
----------------------------------------------------------------------
.../installation/ug2-deploy-to-tomcat.txt | 2 +
.../docs/installation/ug2-deploy-to-tomcat.html | 2 +
docs/data-queries/operators-and-types.md | 25 +-
docs/installation/ug2-deploy-to-tomcat.md | 2 +
docs/push.tgz | Bin 1651449 -> 0 bytes
portal/Gruntfile.js | 5 +-
portal/bower.json | 2 +-
portal/getStatus.js | 37 +
portal/package.json | 2 +-
portal/status.html | 35 +
stack/Coverage.md | 2 +-
stack/build-tools/pom.xml | 11 +
stack/config/pom.xml | 10 +
.../usergrid/corepersistence/CoreModule.java | 132 +++-
.../corepersistence/CpEntityManager.java | 2 +-
.../corepersistence/CpEntityManagerFactory.java | 7 +-
.../corepersistence/CpRelationManager.java | 16 +-
.../asyncevents/AmazonAsyncEventService.java | 146 ++--
.../asyncevents/AsyncEventService.java | 5 +
.../asyncevents/AsyncEventsSchedulerFig.java | 76 +++
.../asyncevents/AsyncIndexProvider.java | 2 +-
.../asyncevents/EventBuilder.java | 25 +-
.../asyncevents/EventBuilderImpl.java | 60 +-
.../asyncevents/EventExecutionScheduler.java | 37 +
.../index/IndexProcessorFig.java | 15 +-
.../corepersistence/index/IndexServiceImpl.java | 5 +-
.../migration/DeDupConnectionDataMigration.java | 2 +-
.../pipeline/PipelineModule.java | 2 +-
.../pipeline/PipelineOperations.java | 30 -
.../pipeline/read/FilterResult.java | 7 +
.../read/search/CandidateEntityFilter.java | 6 +
.../read/search/SearchCollectionFilter.java | 2 -
.../read/traverse/AbstractReadGraphFilter.java | 136 +++-
.../read/traverse/EdgeCursorSerializer.java | 8 +-
.../read/traverse/EntityLoadVerifyFilter.java | 24 +-
.../traverse/ReadGraphCollectionFilter.java | 12 +-
.../ReadGraphConnectionByTypeFilter.java | 11 +-
.../traverse/ReadGraphConnectionFilter.java | 12 +-
.../results/ObservableQueryExecutor.java | 7 +
.../corepersistence/rx/impl/AsyncRepair.java | 38 ++
.../rx/impl/ResponseImportTasks.java | 38 ++
.../service/ServiceSchedulerFig.java | 66 ++
.../service/StatusServiceImpl.java | 3 +-
.../usergrid/persistence/CredentialsInfo.java | 46 ++
.../persistence/ObservableIterator.java | 83 ---
.../apache/usergrid/batch/BulkTestUtils.java | 1 -
.../usergrid/batch/job/CountdownLatchJob.java | 1 -
.../usergrid/batch/job/DelayExecution.java | 1 -
.../usergrid/batch/job/DelayHeartbeat.java | 1 -
.../usergrid/batch/job/FailureJobExecution.java | 1 -
.../usergrid/batch/job/OnlyOnceExceution.java | 123 ----
.../usergrid/batch/job/OnlyOnceExecution.java | 122 ++++
.../job/OnlyOnceUnlockOnFailExceution.java | 133 ----
.../job/OnlyOnceUnlockOnFailExecution.java | 132 ++++
.../usergrid/batch/job/SchedulerRuntime1IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime2IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime3IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime4IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime5IT.java | 3 +-
.../usergrid/batch/job/SchedulerRuntime6IT.java | 5 +-
.../usergrid/batch/job/SchedulerRuntime7IT.java | 7 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 3 +-
.../batch/job/SchedulerRuntimeIntervalIT.java | 3 +-
.../clustering/hazelcast/HazelcastTest.java | 5 +-
.../corepersistence/StaleIndexCleanupTest.java | 99 +--
.../index/AsyncIndexServiceTest.java | 3 +-
.../corepersistence/index/IndexServiceTest.java | 12 +-
.../usergrid/corepersistence/index/RxTest.java | 9 +-
.../pipeline/cursor/CursorTest.java | 24 +-
.../service/ConnectionServiceImplTest.java | 5 +-
.../count/BatchCountParallelismTest.java | 5 +-
.../java/org/apache/usergrid/mq/MessagesIT.java | 8 +-
.../persistence/ApplicationServiceIT.java | 4 +-
.../usergrid/persistence/CoreSchemaManager.java | 1 -
.../apache/usergrid/persistence/CounterIT.java | 30 +-
.../persistence/EntityConnectionsIT.java | 10 +-
.../usergrid/persistence/EntityManagerIT.java | 3 +-
.../apache/usergrid/persistence/EntityTest.java | 2 -
.../org/apache/usergrid/persistence/GeoIT.java | 71 ++
.../persistence/GeoQueryBooleanTest.java | 1 -
.../persistence/PerformanceEntityReadTest.java | 4 +-
.../persistence/PerformanceEntityWriteTest.java | 4 +-
.../usergrid/persistence/RebuildIndexTest.java | 118 +++-
.../apache/usergrid/utils/UUIDUtilsTest.java | 4 +-
.../collection/guice/CollectionModule.java | 32 +
.../guice/CollectionTaskExecutor.java | 35 -
.../EntityCollectionManagerFactoryImpl.java | 5 +-
.../impl/EntityCollectionManagerImpl.java | 20 +-
.../mvcc/stage/delete/UniqueCleanup.java | 12 +-
.../mvcc/stage/write/WriteCommit.java | 11 +-
.../collection/mvcc/stage/write/WriteStart.java | 9 +-
.../scheduler/CollectionExecutorScheduler.java | 52 ++
.../scheduler/CollectionSchedulerFig.java | 53 ++
.../collection/EntityCollectionManagerIT.java | 68 ++
.../EntityCollectionManagerStressTest.java | 6 +-
.../mvcc/stage/AbstractEntityStageTest.java | 1 -
.../mvcc/stage/delete/MarkCommitTest.java | 2 +-
.../mvcc/stage/delete/UniqueCleanupTest.java | 1 -
.../mvcc/stage/write/WriteCommitTest.java | 2 +-
.../impl/SerializationComparison.java | 5 +-
...niqueValueSerializationStrategyImplTest.java | 4 +-
stack/corepersistence/common/pom.xml | 1 +
.../persistence/core/astyanax/CassandraFig.java | 2 +-
.../core/astyanax/MultiRowColumnIterator.java | 46 +-
.../core/executor/TaskExecutorFactory.java | 108 ++-
.../persistence/core/guice/CommonModule.java | 25 +-
.../persistence/core/rx/ObservableIterator.java | 2 +-
.../persistence/core/rx/RxSchedulerFig.java | 71 --
.../core/rx/RxTaskSchedulerImpl.java | 81 +--
.../persistence/core/rx/OrderedMergeTest.java | 5 +-
stack/corepersistence/graph/pom.xml | 1 +
.../usergrid/persistence/graph/GraphFig.java | 4 +-
.../persistence/graph/GraphManager.java | 14 +-
.../usergrid/persistence/graph/MarkedEdge.java | 15 +-
.../persistence/graph/guice/GraphModule.java | 18 +-
.../graph/impl/GraphManagerImpl.java | 90 ++-
.../graph/impl/SimpleMarkedEdge.java | 62 +-
.../impl/stage/NodeDeleteListenerImpl.java | 27 +-
.../impl/EdgeSerializationImpl.java | 17 +-
.../impl/shard/AsyncTaskExecutor.java | 34 +
.../impl/shard/DirectedEdgeMeta.java | 4 +-
.../impl/shard/EdgeShardStrategy.java | 10 +-
.../impl/shard/NodeShardApproximation.java | 66 --
.../graph/serialization/impl/shard/Shard.java | 15 +
.../impl/shard/ShardEntryGroup.java | 16 +-
.../impl/shard/ShardGroupCompaction.java | 4 -
.../impl/shard/ShardGroupDeletion.java | 78 +++
.../impl/shard/ShardedEdgeSerialization.java | 2 +-
.../serialization/impl/shard/count/Counter.java | 131 ----
.../shard/count/NodeShardApproximationImpl.java | 272 --------
.../count/NodeShardCounterSerialization.java | 48 --
.../NodeShardCounterSerializationImpl.java | 186 -----
.../impl/shard/count/ShardKey.java | 75 --
.../impl/shard/impl/AsyncTaskExecutorImpl.java | 53 ++
.../shard/impl/NodeShardAllocationImpl.java | 97 ++-
.../shard/impl/ShardGroupColumnIterator.java | 72 +-
.../shard/impl/ShardGroupCompactionImpl.java | 10 +-
.../impl/shard/impl/ShardGroupDeletionImpl.java | 240 +++++++
.../impl/ShardedEdgeSerializationImpl.java | 31 +-
.../impl/shard/impl/ShardsColumnIterator.java | 10 +
.../shard/impl/SizebasedEdgeColumnFamilies.java | 4 +-
.../shard/impl/SizebasedEdgeShardStrategy.java | 13 +-
.../persistence/graph/GraphManagerIT.java | 76 +--
.../persistence/graph/GraphManagerLoadTest.java | 17 +-
.../graph/GraphManagerShardConsistencyIT.java | 388 ++++++++---
.../graph/GraphManagerShardingIT.java | 208 ------
.../graph/GraphManagerStressTest.java | 60 +-
.../graph/impl/NodeDeleteListenerTest.java | 3 +-
.../serialization/EdgeSerializationTest.java | 6 +-
.../impl/shard/NodeShardAllocationTest.java | 48 +-
.../impl/shard/ShardEntryGroupTest.java | 42 ++
.../impl/shard/ShardGroupCompactionTest.java | 30 +-
.../shard/count/NodeShardApproximationTest.java | 627 -----------------
.../NodeShardCounterSerializationTest.java | 124 ----
.../shard/impl/ShardGroupDeletionImplTest.java | 346 ++++++++++
stack/corepersistence/map/pom.xml | 1 +
.../org/apache/usergrid/ExperimentalTest.java | 22 +
.../java/org/apache/usergrid/StressTest.java | 22 +
.../model/entity/EntityToMapConverter.java | 9 +-
.../persistence/model/field/DistanceField.java | 42 ++
.../persistence/model/field/FieldTypeName.java | 3 +-
stack/corepersistence/pom.xml | 4 +-
stack/corepersistence/queryindex/pom.xml | 5 +-
.../persistence/index/CandidateResult.java | 11 +-
.../persistence/index/EntityIndexBatch.java | 2 +-
.../persistence/index/GeoCandidateResult.java | 40 ++
.../usergrid/persistence/index/IndexFig.java | 6 +
.../index/impl/DeIndexOperation.java | 9 +-
.../index/impl/EntityMappingParser.java | 4 +
.../index/impl/EsEntityIndexBatchImpl.java | 34 +-
.../index/impl/EsEntityIndexImpl.java | 196 ++++--
.../index/impl/IndexOperationMessage.java | 4 +-
.../persistence/index/impl/IndexingUtils.java | 62 +-
.../EsIndexMappingMigrationPlugin.java | 2 +-
.../persistence/index/query/ParsedQuery.java | 4 +
.../persistence/index/impl/EntityIndexTest.java | 14 +-
.../index/impl/EntityToMapConverterTest.java | 48 ++
.../index/impl/IndexLoadTestsIT.java | 3 +
.../index/impl/IndexingUtilsTest.java | 36 +
.../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 +-
.../java-wns/1.2-USERGRID/_remote.repositories | 7 +
...a-wns-1.2-USERGRID-jar-with-dependencies.jar | Bin 0 -> 1836665 bytes
.../java-wns-1.2-USERGRID-javadoc.jar | Bin 0 -> 234289 bytes
.../java-wns-1.2-USERGRID-sources.jar | Bin 0 -> 21654 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.jar | Bin 0 -> 33164 bytes
.../1.2-USERGRID/java-wns-1.2-USERGRID.pom | 128 ++++
stack/pom.xml | 16 +-
stack/rest/pom.xml | 12 +
.../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 +++-
.../exceptions/AbstractExceptionMapper.java | 8 +-
.../usergrid/rest/filters/MeteringFilter.java | 8 +-
.../usergrid/rest/filters/TracingFilter.java | 5 +-
.../organizations/OrganizationResource.java | 9 +
.../organizations/OrganizationsResource.java | 33 +
.../rest/security/CrossOriginRequestFilter.java | 4 +-
.../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 ++++
.../apache/usergrid/rest/IndexResourceIT.java | 4 +-
.../apache/usergrid/rest/NotificationsIT.java | 2 +
.../applications/ApplicationResourceIT.java | 82 +--
.../collection/CollectionsResourceIT.java | 18 -
.../collection/groups/GroupResourceIT.java | 2 +-
.../collection/paging/PagingResourceIT.java | 13 +-
.../collection/users/UserResourceIT.java | 117 ++++
.../users/extensions/TestResource.java | 1 -
.../applications/events/EventsResourceIT.java | 2 +-
.../applications/queries/MatrixQueryTests.java | 2 -
.../rest/applications/utils/TestUtils.java | 1 -
.../rest/filters/ContentTypeResourceIT.java | 4 -
.../usergrid/rest/management/AdminUsersIT.java | 23 +-
.../rest/management/ExportResourceIT.java | 22 +-
.../rest/management/ImportResourceIT.java | 11 +-
.../rest/management/OrganizationsIT.java | 10 +-
.../organizations/AdminEmailEncodingIT.java | 3 +-
.../usergrid/rest/test/resource/DumbClient.java | 58 --
stack/scripts/create_test_data.py | 222 ++++++
stack/scripts/migrate_entity_data.py | 18 +-
stack/scripts/multitenant_migrate.py | 677 +++++++++++++++++++
stack/services/pom.xml | 31 +-
.../management/AppInfoMigrationPlugin.java | 5 +-
.../usergrid/management/ManagementService.java | 14 +-
.../cassandra/ManagementServiceImpl.java | 43 +-
.../services/AbstractCollectionService.java | 10 +-
.../usergrid/services/AbstractService.java | 13 +-
.../services/notifications/wns/WNSAdapter.java | 5 +-
.../org/apache/usergrid/management/RoleIT.java | 2 +-
.../cassandra/ManagementServiceIT.java | 41 +-
.../management/export/ExportServiceIT.java | 84 +--
.../importer/ImportConnectionsTest.java | 2 +-
.../management/importer/ImportServiceIT.java | 13 +-
.../security/providers/FacebookProviderIT.java | 4 +-
.../providers/PingIdentityProviderIT.java | 4 +-
.../AbstractServiceNotificationIT.java | 1 +
.../notifications/NotifiersServiceIT.java | 8 +-
.../apns/NotificationsServiceIT.java | 7 +-
.../gcm/NotificationsServiceIT.java | 6 +-
.../notifications/wns/WNSAdapterTest.java | 49 ++
.../usergrid/cassandra/FakeSchemaManager.java | 4 -
262 files changed, 6767 insertions(+), 4618 deletions(-)
----------------------------------------------------------------------