merge
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a0c2651e Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a0c2651e Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a0c2651e Branch: refs/heads/USERGRID-593 Commit: a0c2651e31956c7a38f39893a44a6d478d764277 Parents: f130b7c 3480a36 Author: Shawn Feldman <sfeld...@apache.org> Authored: Tue Apr 21 09:55:02 2015 -0600 Committer: Shawn Feldman <sfeld...@apache.org> Committed: Tue Apr 21 09:55:02 2015 -0600 ---------------------------------------------------------------------- .../main/resources/usergrid-default.properties | 3 +- stack/core/pom.xml | 8 + .../AllApplicationsObservable.java | 35 --- .../usergrid/corepersistence/CoreModule.java | 56 ++-- .../corepersistence/CpEntityManager.java | 273 ++++++----------- .../corepersistence/CpEntityManagerFactory.java | 141 +++------ .../corepersistence/CpManagerCache.java | 3 + .../corepersistence/CpRelationManager.java | 93 ++---- .../CpRelationManagerFactory.java | 46 --- .../usergrid/corepersistence/GuiceFactory.java | 75 ++--- .../events/EntityDeletedHandler.java | 5 +- .../events/EntityVersionCreatedHandler.java | 8 +- .../events/EntityVersionDeletedHandler.java | 23 +- .../index/AsyncIndexProvider.java | 122 ++++++++ .../index/AsyncReIndexService.java | 42 +++ .../index/InMemoryAsyncReIndexService.java | 89 ++++++ .../corepersistence/index/IndexEntityEvent.java | 75 +++++ .../corepersistence/index/IndexService.java | 52 ++++ .../corepersistence/index/IndexServiceImpl.java | 152 +++++++++ .../corepersistence/index/QueryFig.java | 103 +++++++ .../corepersistence/index/ReIndexAction.java | 33 ++ .../corepersistence/index/ReIndexService.java | 89 ++++++ .../index/ReIndexServiceImpl.java | 129 ++++++++ .../index/SQSAsyncReIndexService.java | 269 ++++++++++++++++ .../rx/impl/AbstractGraphVisitorImpl.java | 60 +--- .../rx/impl/AllApplicationsObservable.java | 43 +++ .../rx/impl/AllApplicationsObservableImpl.java | 5 +- .../rx/impl/AllEntitiesInSystemImpl.java | 14 +- .../rx/impl/AllEntityIdsObservable.java | 52 ++++ .../rx/impl/AllEntityIdsObservableImpl.java | 92 ++++++ .../rx/impl/AllNodesInGraphImpl.java | 11 +- .../corepersistence/rx/impl/EdgeScope.java | 51 ++++ .../corepersistence/util/CpNamingUtils.java | 25 +- .../util/SerializableMapper.java | 89 ++++++ .../usergrid/persistence/EntityManager.java | 7 - .../persistence/EntityManagerFactory.java | 11 +- .../persistence/GuiceAdapterBeanFactory.java | 114 +++++++ .../usergrid/persistence/PersistenceModule.java | 66 ++++ .../main/resources/usergrid-core-context.xml | 28 +- .../corepersistence/TestIndexModule.java | 35 +++ .../corepersistence/index/PublishRxtest.java | 61 ++++ .../index/SQSAsyncIndexServiceTest.java | 167 ++++++++++ .../rx/ApplicationObservableTestIT.java | 3 +- .../rx/EdgesToTargetObservableIT.java | 8 +- .../usergrid/persistence/EntityManagerIT.java | 8 +- .../PerformanceEntityRebuildIndexTest.java | 18 +- .../cassandra/EntityManagerFactoryImplIT.java | 15 +- .../resources/usergrid-custom-test.properties | 2 - .../EntityCollectionManagerFactoryImpl.java | 15 +- .../impl/EntityCollectionManagerImpl.java | 38 ++- .../mvcc/stage/write/RollbackAction.java | 2 - .../persistence/core/guice/CommonModule.java | 12 + .../persistence/core/rx/RxSchedulerFig.java | 60 ++++ .../persistence/core/rx/RxTaskScheduler.java | 40 +++ .../core/rx/RxTaskSchedulerImpl.java | 128 ++++++++ .../core/scope/ApplicationScope.java | 4 +- .../persistence/core/util/StringUtils.java | 34 +++ .../persistence/core/aws/NoAWSCredsRule.java | 98 ++++++ .../graph/serialization/EdgesObservable.java | 40 ++- .../serialization/impl/EdgesObservableImpl.java | 91 ++++-- .../impl/TargetIdObservableImpl.java | 2 +- .../impl/migration/EdgeDataMigrationImpl.java | 6 +- .../persistence/index/CandidateResults.java | 1 + .../persistence/index/EntityIndexBatch.java | 3 +- .../usergrid/persistence/index/IndexFig.java | 115 +++---- .../persistence/index/guice/IndexModule.java | 5 +- .../persistence/index/guice/QueueProvider.java | 116 ------- .../persistence/index/impl/BufferQueue.java | 66 ---- .../index/impl/BufferQueueInMemoryImpl.java | 115 ------- .../index/impl/BufferQueueSQSImpl.java | 306 ------------------- .../impl/EsApplicationEntityIndexImpl.java | 16 +- .../index/impl/EsEntityIndexBatchImpl.java | 16 +- .../index/impl/EsEntityIndexFactoryImpl.java | 8 +- .../index/impl/EsEntityIndexImpl.java | 52 +--- .../index/impl/EsIndexBufferConsumerImpl.java | 239 ++++++--------- .../index/impl/EsIndexBufferProducerImpl.java | 59 ---- .../index/impl/FailureMonitorImpl.java | 26 -- .../index/impl/FlushBufferQueue.java | 23 ++ .../index/impl/IndexBufferConsumer.java | 15 +- .../index/impl/IndexBufferProducer.java | 32 -- .../persistence/index/impl/IndexIdentifier.java | 46 +++ .../index/impl/IndexIdentifierImpl.java | 118 +------ .../index/impl/IndexOperationMessage.java | 139 +++++++++ .../index/impl/IndexRefreshCommandImpl.java | 30 +- .../persistence/index/impl/IndexingUtils.java | 6 +- .../index/migration/LegacyIndexIdentifier.java | 4 +- .../persistence/index/utils/StringUtils.java | 62 ---- .../persistence/index/usergrid-mappings.json | 4 +- .../index/guice/TestIndexModule.java | 22 +- .../index/impl/BufferQueueSQSImplTest.java | 175 ----------- .../persistence/queue/NoAWSCredsRule.java | 98 ------ .../persistence/queue/QueueManagerTest.java | 3 +- .../usergrid/rest/management/AdminUsersIT.java | 4 +- stack/services/pom.xml | 50 +-- .../notifications/NotifiersServiceIT.java | 19 +- 95 files changed, 3205 insertions(+), 2267 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a0c2651e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java ---------------------------------------------------------------------- diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java index 716c7d8,e4624a9..97ac813 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/CandidateResults.java @@@ -27,10 -27,14 +27,11 @@@ package org.apache.usergrid.persistence import java.util.Collection; import java.util.Iterator; import java.util.List; +import com.google.common.base.Optional; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.apache.usergrid.persistence.model.util.UUIDGenerator; - -import static org.apache.usergrid.persistence.core.util.StringUtils.sanitizeUUID; ++import static org.apache.usergrid.persistence.index.utils.StringUtils.sanitizeUUID; /** * Internal results class, should not be returned as results to a user. http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a0c2651e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java ---------------------------------------------------------------------- diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java index 672f090,43b55d0..89d6da7 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java @@@ -23,13 -23,8 +23,12 @@@ package org.apache.usergrid.persistence import java.io.Serializable; import java.util.ArrayList; import java.util.List; - import java.util.UUID; import java.util.concurrent.TimeUnit; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.dataformat.smile.SmileFactory; import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ListenableActionFuture; import org.elasticsearch.action.ShardOperationFailedException;
