Merge commit 'refs/pull/562/head' of github.com:apache/usergrid
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/fb626297 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/fb626297 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/fb626297 Branch: refs/heads/master Commit: fb626297195895aee9232584f60b01e6e347af52 Parents: 689c450 ab26fa5 Author: Michael Russo <[email protected]> Authored: Fri Nov 11 08:50:33 2016 -0800 Committer: Michael Russo <[email protected]> Committed: Fri Nov 11 08:50:33 2016 -0800 ---------------------------------------------------------------------- build.log | 15 + .../main/resources/usergrid-default.properties | 2 + stack/core/pom.xml | 10 +- .../corepersistence/CpEntityManagerFactory.java | 40 +- .../usergrid/corepersistence/GuiceFactory.java | 3 + .../asyncevents/AsyncEventService.java | 11 +- .../asyncevents/AsyncEventServiceImpl.java | 241 +++++--- .../asyncevents/AsyncEventsSchedulerFig.java | 9 +- .../asyncevents/AsyncIndexProvider.java | 68 ++- .../index/ReplicatedIndexLocationStrategy.java | 4 +- .../usergrid/persistence/entities/Receipt.java | 33 +- .../index/AsyncEventServiceImplTest.java | 8 +- .../usergrid/corepersistence/index/RxTest.java | 23 +- .../usergrid/mq/LegacyQueuePathsTest.java | 48 ++ .../org/apache/usergrid/mq/QueuePathsTest.java | 48 -- .../actorsystem/ActorSystemManagerImpl.java | 24 +- .../persistence/actorsystem/ClientActor.java | 2 +- .../actorsystem/GuiceActorProducer.java | 8 +- stack/corepersistence/cache/pom.xml | 1 + .../impl/ScopedCacheSerializationImpl.java | 11 +- .../UniqueValueSerializationStrategyImpl.java | 27 +- .../UniqueValueSerializationStrategyV1Impl.java | 47 +- .../UniqueValueSerializationStrategyV2Impl.java | 36 +- .../uniquevalues/UniqueValueActor.java | 11 +- .../uniquevalues/UniqueValuesRouter.java | 21 +- .../uniquevalues/UniqueValuesServiceImpl.java | 6 +- stack/corepersistence/common/pom.xml | 4 + .../persistence/core/CassandraConfig.java | 29 + .../persistence/core/CassandraConfigImpl.java | 98 +++- .../usergrid/persistence/core/CassandraFig.java | 12 + .../persistence/core/datastax/CQLUtils.java | 98 +--- .../core/datastax/DataStaxCluster.java | 4 + .../core/datastax/TableDefinition.java | 105 +--- .../core/datastax/impl/DataStaxClusterImpl.java | 96 +++- .../core/datastax/impl/TableDefinitionImpl.java | 216 +++++++ .../impl/TableDefinitionStringImpl.java | 55 ++ .../core/migration/schema/Migration.java | 5 +- .../migration/schema/MigrationManagerFig.java | 4 + .../migration/schema/MigrationManagerImpl.java | 44 +- .../core/astyanax/ColumnNameIteratorTest.java | 76 +++ .../MultiKeyColumnNameIteratorTest.java | 77 +++ .../astyanax/MultiRowColumnIteratorTest.java | 77 +++ .../persistence/core/datastax/CQLUtilsTest.java | 21 +- .../core/datastax/TableDefinitionTest.java | 9 +- .../core/guice/MigrationManagerRule.java | 11 +- .../map/impl/MapSerializationImpl.java | 28 +- stack/corepersistence/pom.xml | 2 +- stack/corepersistence/queryindex/pom.xml | 2 + .../usergrid/persistence/index/IndexAlias.java | 4 +- .../persistence/index/guice/IndexModule.java | 1 - .../index/impl/EsIndexProducerImpl.java | 2 - .../index/guice/TestIndexModule.java | 2 + stack/corepersistence/queue/pom.xml | 169 ++++++ .../apache/usergrid/persistence/qakka/App.java | 106 ++++ .../persistence/qakka/MetricsService.java | 39 ++ .../usergrid/persistence/qakka/QakkaFig.java | 183 ++++++ .../usergrid/persistence/qakka/QakkaModule.java | 118 ++++ .../persistence/qakka/api/ApiResponse.java | 68 +++ .../persistence/qakka/api/QueueResource.java | 420 ++++++++++++++ .../persistence/qakka/api/StatusResource.java | 82 +++ .../persistence/qakka/api/URIStrategy.java | 31 + .../qakka/api/impl/BadRequestMapper.java | 43 ++ .../qakka/api/impl/GuiceFeature.java | 45 ++ .../qakka/api/impl/GuiceWebModule.java | 41 ++ .../qakka/api/impl/JacksonProvider.java | 44 ++ .../qakka/api/impl/JerseyResourceConfig.java | 31 + .../qakka/api/impl/NotFoundMapper.java | 43 ++ .../qakka/api/impl/StartupListener.java | 69 +++ .../qakka/api/impl/URIStrategyLocalhost.java | 49 ++ .../persistence/qakka/core/CassandraClient.java | 32 ++ .../qakka/core/CassandraClientImpl.java | 62 ++ .../persistence/qakka/core/QakkaUtils.java | 44 ++ .../usergrid/persistence/qakka/core/Queue.java | 147 +++++ .../persistence/qakka/core/QueueManager.java | 35 ++ .../persistence/qakka/core/QueueMessage.java | 186 ++++++ .../qakka/core/QueueMessageManager.java | 90 +++ .../persistence/qakka/core/QueueType.java | 26 + .../persistence/qakka/core/Regions.java | 84 +++ .../qakka/core/impl/InMemoryQueue.java | 101 ++++ .../qakka/core/impl/QueueManagerImpl.java | 135 +++++ .../core/impl/QueueMessageManagerImpl.java | 303 ++++++++++ .../distributed/DistributedQueueService.java | 58 ++ .../qakka/distributed/actors/QueueActor.java | 155 +++++ .../distributed/actors/QueueActorHelper.java | 349 ++++++++++++ .../distributed/actors/QueueActorRouter.java | 141 +++++ .../distributed/actors/QueueRefresher.java | 59 ++ .../qakka/distributed/actors/QueueSender.java | 223 ++++++++ .../distributed/actors/QueueSenderRouter.java | 58 ++ .../distributed/actors/QueueTimeouter.java | 122 ++++ .../qakka/distributed/actors/QueueWriter.java | 183 ++++++ .../distributed/actors/QueueWriterRouter.java | 58 ++ .../distributed/actors/ShardAllocator.java | 158 ++++++ .../impl/DistributedQueueServiceImpl.java | 363 ++++++++++++ .../impl/QueueActorRouterProducer.java | 142 +++++ .../impl/QueueSenderRouterProducer.java | 134 +++++ .../impl/QueueWriterRouterProducer.java | 141 +++++ .../distributed/messages/QakkaMessage.java | 28 + .../distributed/messages/QueueAckRequest.java | 52 ++ .../distributed/messages/QueueAckResponse.java | 59 ++ .../distributed/messages/QueueGetRequest.java | 49 ++ .../distributed/messages/QueueGetResponse.java | 71 +++ .../distributed/messages/QueueInitRequest.java | 43 ++ .../messages/QueueRefreshRequest.java | 49 ++ .../distributed/messages/QueueSendRequest.java | 84 +++ .../distributed/messages/QueueSendResponse.java | 50 ++ .../messages/QueueTimeoutRequest.java | 43 ++ .../distributed/messages/QueueWriteRequest.java | 84 +++ .../messages/QueueWriteResponse.java | 49 ++ .../distributed/messages/ShardCheckRequest.java | 43 ++ .../qakka/exceptions/BadRequestException.java | 32 ++ .../qakka/exceptions/NotFoundException.java | 32 ++ .../qakka/exceptions/QakkaException.java | 32 ++ .../qakka/exceptions/QakkaRuntimeException.java | 32 ++ .../MultiShardMessageIterator.java | 197 +++++++ .../persistence/qakka/serialization/Result.java | 34 ++ .../qakka/serialization/auditlog/AuditLog.java | 101 ++++ .../auditlog/AuditLogSerialization.java | 45 ++ .../impl/AuditLogSerializationImpl.java | 152 +++++ .../queuemessages/DatabaseQueueMessage.java | 156 +++++ .../queuemessages/DatabaseQueueMessageBody.java | 52 ++ .../MessageCounterSerialization.java | 33 ++ .../QueueMessageSerialization.java | 71 +++ .../impl/MessageCounterSerializationImpl.java | 358 ++++++++++++ .../impl/QueueMessageSerializationImpl.java | 566 +++++++++++++++++++ .../serialization/queues/DatabaseQueue.java | 114 ++++ .../queues/QueueSerialization.java | 36 ++ .../queues/impl/QueueSerializationImpl.java | 169 ++++++ .../qakka/serialization/sharding/Shard.java | 111 ++++ .../sharding/ShardCounterSerialization.java | 31 + .../serialization/sharding/ShardIterator.java | 149 +++++ .../sharding/ShardSerialization.java | 37 ++ .../serialization/sharding/ShardStrategy.java | 35 ++ .../sharding/impl/PlaceholderShardStrategy.java | 44 ++ .../impl/ShardCounterSerializationImpl.java | 272 +++++++++ .../sharding/impl/ShardSerializationImpl.java | 228 ++++++++ .../sharding/impl/ShardStrategyImpl.java | 71 +++ .../serialization/transferlog/TransferLog.java | 84 +++ .../transferlog/TransferLogSerialization.java | 62 ++ .../impl/TransferLogSerializationImpl.java | 171 ++++++ .../usergrid/persistence/queue/LegacyQueue.java | 35 ++ .../persistence/queue/LegacyQueueFig.java | 106 ++++ .../persistence/queue/LegacyQueueManager.java | 78 +++ .../queue/LegacyQueueManagerFactory.java | 23 + .../LegacyQueueManagerInternalFactory.java | 28 + .../persistence/queue/LegacyQueueMessage.java | 70 +++ .../persistence/queue/LegacyQueueScope.java | 45 ++ .../persistence/queue/LocalQueueManager.java | 24 +- .../usergrid/persistence/queue/Queue.java | 35 -- .../usergrid/persistence/queue/QueueFig.java | 106 ---- .../persistence/queue/QueueManager.java | 79 --- .../persistence/queue/QueueManagerFactory.java | 23 - .../queue/QueueManagerInternalFactory.java | 28 - .../persistence/queue/QueueMessage.java | 70 --- .../usergrid/persistence/queue/QueueScope.java | 45 -- .../persistence/queue/guice/QueueModule.java | 31 +- .../queue/impl/LegacyQueueScopeImpl.java | 67 +++ .../queue/impl/QakkaQueueManager.java | 192 +++++++ .../queue/impl/QueueManagerFactoryImpl.java | 28 +- .../persistence/queue/impl/QueueScopeImpl.java | 68 --- .../queue/impl/SNSQueueManagerImpl.java | 62 +- .../queue/util/AmazonNotificationUtils.java | 4 +- .../queue/src/main/webapp/WEB-INF/web.xml | 51 ++ .../persistence/qakka/AbstractTest.java | 83 +++ .../persistence/qakka/KeyspaceDropper.java | 78 +++ .../persistence/qakka/api/AbstractRestTest.java | 64 +++ .../persistence/qakka/api/PerformanceTest.java | 148 +++++ .../qakka/api/QueueResourceTest.java | 442 +++++++++++++++ .../qakka/core/CassandraClientTest.java | 46 ++ .../qakka/core/QueueMessageManagerTest.java | 384 +++++++++++++ .../distributed/QueueActorServiceTest.java | 254 +++++++++ .../actors/QueueActorHelperTest.java | 321 +++++++++++ .../distributed/actors/QueueReaderTest.java | 110 ++++ .../distributed/actors/QueueTimeouterTest.java | 157 +++++ .../distributed/actors/ShardAllocatorTest.java | 222 ++++++++ ...tiShardDatabaseQueueMessageIteratorTest.java | 131 +++++ .../auditlogs/AuditLogSerializationTest.java | 99 ++++ .../DatabaseQueueMessageSerializationTest.java | 274 +++++++++ .../impl/MessageCounterSerializationTest.java | 140 +++++ .../queues/DatabaseQueueSerializationTest.java | 85 +++ .../sharding/ShardCounterSerializationTest.java | 112 ++++ .../sharding/ShardIteratorTest.java | 147 +++++ .../sharding/ShardSerializationTest.java | 111 ++++ .../sharding/ShardStrategyTest.java | 70 +++ .../qakka/serialization/sharding/ShardTest.java | 53 ++ .../TransferLogSerializationTest.java | 131 +++++ .../queue/LegacyQueueManagerTest.java | 181 ++++++ .../persistence/queue/QueueManagerTest.java | 156 ----- .../usergrid/persistence/queue/TestModule.java | 42 ++ .../queue/guice/TestQueueModule.java | 32 -- .../queue/src/test/resources/cassandra.yaml | 53 ++ .../queue/src/test/resources/log4j.properties | 29 + .../queue/src/test/resources/qakka-duck.jpg | Bin 0 -> 11188 bytes .../queue/src/test/resources/qakka.properties | 65 +++ stack/pom.xml | 4 +- stack/rest/pom.xml | 10 + .../rest/system/QueueSystemResource.java | 151 +++++ .../notifications/ApplicationQueueManager.java | 4 +- .../ApplicationQueueManagerCache.java | 6 +- .../notifications/NotificationsService.java | 19 +- .../services/notifications/QueueJob.java | 1 - .../services/notifications/QueueListener.java | 79 +-- .../notifications/apns/APNsAdapter.java | 28 +- .../services/notifications/gcm/GCMAdapter.java | 11 +- .../impl/ApplicationQueueManagerImpl.java | 20 +- .../services/queues/ImportQueueListener.java | 8 +- .../services/queues/ImportQueueManager.java | 16 +- .../usergrid/services/queues/QueueListener.java | 18 +- tests/performance/results.txt | 1 + website/content/releases/index.html | 1 + 209 files changed, 15734 insertions(+), 1381 deletions(-) ----------------------------------------------------------------------
