Merge branch 'two-dot-o-dev' into pr/239
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4cc29719 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4cc29719 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4cc29719 Branch: refs/heads/two-dot-o-dev Commit: 4cc297191f96d982538a7b0c9d7eb22ae5cc2809 Parents: ca697d9 7f2a4bb Author: Shawn Feldman <[email protected]> Authored: Tue Apr 28 09:34:49 2015 -0600 Committer: Shawn Feldman <[email protected]> Committed: Tue Apr 28 09:34:49 2015 -0600 ---------------------------------------------------------------------- stack/core/pom.xml | 6 - .../usergrid/corepersistence/CoreModule.java | 10 +- .../corepersistence/CpEntityManager.java | 18 +- .../corepersistence/CpEntityManagerFactory.java | 24 +- .../corepersistence/CpRelationManager.java | 181 +++++----- .../usergrid/corepersistence/CpWalker.java | 4 +- .../asyncevents/AsyncEventService.java | 71 ++++ .../asyncevents/AsyncIndexProvider.java | 122 +++++++ .../asyncevents/InMemoryAsyncEventService.java | 139 ++++++++ .../asyncevents/SQSAsyncEventService.java | 349 +++++++++++++++++++ .../index/AsyncIndexProvider.java | 119 ------- .../index/AsyncIndexService.java | 42 --- .../index/InMemoryAsyncIndexService.java | 88 ----- .../index/IndexProcessorFig.java | 3 + .../corepersistence/index/IndexService.java | 33 ++ .../corepersistence/index/IndexServiceImpl.java | 22 +- .../index/ReIndexServiceImpl.java | 5 +- .../index/SQSAsyncIndexService.java | 325 ----------------- .../migration/AppInfoMigrationPlugin.java | 6 +- .../corepersistence/pipeline/DataPipeline.java | 136 ++++++++ .../pipeline/PipelineBuilderFactory.java | 39 +++ .../pipeline/PipelineModule.java | 55 +++ .../cursor/AbstractCursorSerializer.java | 62 ++++ .../pipeline/cursor/CursorParseException.java | 30 ++ .../pipeline/cursor/CursorSerializer.java | 42 +++ .../pipeline/cursor/CursorSerializerUtil.java | 49 +++ .../pipeline/cursor/NoCursorSerializer.java | 55 +++ .../pipeline/cursor/RequestCursor.java | 106 ++++++ .../pipeline/cursor/ResponseCursor.java | 104 ++++++ .../pipeline/read/AbstractFilter.java | 110 ++++++ .../pipeline/read/CollectorFilter.java | 36 ++ .../corepersistence/pipeline/read/Filter.java | 57 +++ .../pipeline/read/ReadFilterFactory.java | 102 ++++++ .../pipeline/read/ReadFilterFactoryImpl.java | 152 ++++++++ .../pipeline/read/ReadPipelineBuilder.java | 110 ++++++ .../pipeline/read/ReadPipelineBuilderImpl.java | 202 +++++++++++ .../pipeline/read/TraverseFilter.java | 30 ++ ...stractQueryElasticSearchCollectorFilter.java | 132 +++++++ .../ElasticsearchCursorSerializer.java | 42 +++ ...yCollectionElasticSearchCollectorFilter.java | 87 +++++ ...yConnectionElasticSearchCollectorFilter.java | 91 +++++ .../impl/CollectionRefsVerifier.java | 44 +++ .../CollectionResultsLoaderFactoryImpl.java | 65 ++++ .../impl/ConnectionRefsVerifier.java | 59 ++++ .../ConnectionResultsLoaderFactoryImpl.java | 73 ++++ .../impl/ElasticSearchQueryExecutor.java | 237 +++++++++++++ .../read/elasticsearch/impl/EntityVerifier.java | 127 +++++++ .../elasticsearch/impl/FilteringLoader.java | 219 ++++++++++++ .../read/elasticsearch/impl/IdsVerifier.java | 46 +++ .../read/elasticsearch/impl/ResultsLoader.java | 43 +++ .../impl/ResultsLoaderFactory.java | 41 +++ .../elasticsearch/impl/ResultsVerifier.java | 52 +++ .../elasticsearch/impl/VersionVerifier.java | 85 +++++ .../pipeline/read/entity/EntityIdFilter.java | 62 ++++ .../read/entity/EntityLoadCollectorFilter.java | 137 ++++++++ .../graph/AbstractReadGraphEdgeByIdFilter.java | 87 +++++ .../read/graph/AbstractReadGraphFilter.java | 95 +++++ .../read/graph/EdgeCursorSerializer.java | 42 +++ .../graph/ReadGraphCollectionByIdFilter.java | 49 +++ .../read/graph/ReadGraphCollectionFilter.java | 53 +++ .../graph/ReadGraphConnectionByIdFilter.java | 50 +++ .../graph/ReadGraphConnectionByTypeFilter.java | 96 +++++ .../read/graph/ReadGraphConnectionFilter.java | 53 +++ .../results/CollectionRefsVerifier.java | 44 --- .../CollectionResultsLoaderFactoryImpl.java | 60 ---- .../results/ConnectionRefsVerifier.java | 61 ---- .../ConnectionResultsLoaderFactoryImpl.java | 65 ---- .../results/ElasticSearchQueryExecutor.java | 240 ------------- .../corepersistence/results/EntityVerifier.java | 127 ------- .../results/FilteringLoader.java | 226 ------------ .../corepersistence/results/IdsVerifier.java | 46 --- .../results/ObservableQueryExecutor.java | 77 ++++ .../corepersistence/results/ResultsLoader.java | 43 --- .../results/ResultsLoaderFactory.java | 41 --- .../results/ResultsVerifier.java | 52 --- .../results/VersionVerifier.java | 85 ----- .../rx/impl/AllApplicationsObservableImpl.java | 7 +- .../corepersistence/util/CpNamingUtils.java | 36 +- .../org/apache/usergrid/persistence/Query.java | 28 +- .../org/apache/usergrid/CoreApplication.java | 3 + .../index/AsyncIndexServiceTest.java | 14 +- .../index/InMemoryAsycIndexServiceTest.java | 8 +- .../index/SQSAsyncEventServiceTest.java | 84 +++++ .../index/SQSAsyncIndexServiceTest.java | 108 ------ .../pipeline/cursor/CursorTest.java | 101 ++++++ .../persistence/query/IteratingQueryIT.java | 47 ++- .../resources/usergrid-custom-test.properties | 1 + .../persistence/collection/EntitySet.java | 14 +- .../serialization/impl/EntitySetImpl.java | 10 +- .../persistence/core/future/BetterFuture.java | 68 ---- .../core/future/FutureObservable.java | 46 +++ .../persistence/core/rx/OrderedMerge.java | 1 - .../persistence/core/astyanax/TestUtils.java | 2 +- .../apache/usergrid/persistence/graph/Edge.java | 4 + .../persistence/graph/SearchByEdgeType.java | 2 +- .../persistence/graph/impl/SimpleEdge.java | 16 +- .../graph/impl/SimpleSearchByEdge.java | 4 +- .../graph/impl/SimpleSearchByEdgeType.java | 26 +- .../graph/impl/SimpleSearchByIdType.java | 4 +- .../graph/impl/stage/EdgeDeleteRepairImpl.java | 3 +- .../graph/impl/stage/EdgeMetaRepairImpl.java | 6 +- .../impl/stage/NodeDeleteListenerImpl.java | 5 +- .../serialization/impl/EdgesObservableImpl.java | 6 +- .../impl/shard/DirectedEdgeMeta.java | 9 +- .../persistence/graph/GraphManagerLoadTest.java | 6 +- .../graph/GraphManagerShardConsistencyIT.java | 3 +- .../graph/GraphManagerStressTest.java | 8 +- .../graph/impl/stage/EdgeDeleteRepairTest.java | 6 +- .../graph/test/util/EdgeTestUtils.java | 7 +- .../persistence/index/EntityIndexBatch.java | 5 +- .../usergrid/persistence/index/IndexFig.java | 1 + .../index/impl/EsEntityIndexBatchImpl.java | 7 +- .../index/impl/EsEntityIndexImpl.java | 18 +- .../index/impl/EsIndexBufferConsumerImpl.java | 8 +- .../index/impl/IndexBufferConsumer.java | 4 +- .../index/impl/IndexOperationMessage.java | 19 +- .../index/impl/IndexRefreshCommandImpl.java | 2 +- .../persistence/index/usergrid-mappings.json | 171 ++++----- .../persistence/index/impl/EntityIndexTest.java | 73 ++-- .../persistence/index/impl/GeoPagingTest.java | 2 +- .../scenarios/ConnectionScenarios.scala | 2 +- stack/pom.xml | 2 - 122 files changed, 5137 insertions(+), 2248 deletions(-) ----------------------------------------------------------------------
