Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-609
# By Todd Nine # Via Todd Nine * 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: Updates observable short circuit and fixes NPE on empty results Fixes graph cursor resume state. Fixes resume logic by loading then filtering first id Massive refactor. Paths for cursor generation are now part of our I/O results. This allows the collector to take until satisfied, then generate a serializable path. Updated mapping to fix missing doc_values and disable norms since we use external sorting Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/7b215250 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/7b215250 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/7b215250 Branch: refs/heads/USERGRID-614 Commit: 7b215250afce3303af6a26ecf4ec8918840e37e0 Parents: c6bbfba 9b939d1 Author: GERey <[email protected]> Authored: Mon May 4 10:32:43 2015 -0700 Committer: GERey <[email protected]> Committed: Mon May 4 10:32:43 2015 -0700 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 5 +- .../corepersistence/pipeline/Pipeline.java | 12 +- .../pipeline/PipelineContext.java | 16 +- .../pipeline/PipelineOperation.java | 39 ++++ .../pipeline/PipelineResult.java | 57 ----- .../pipeline/cursor/ResponseCursor.java | 81 ++++--- .../pipeline/read/AbstractFilter.java | 45 ++++ .../pipeline/read/AbstractPathFilter.java | 109 +++++++++ .../read/AbstractPipelineOperation.java | 44 ---- .../pipeline/read/AbstractSeekingFilter.java | 102 -------- .../pipeline/read/CandidateResultsFilter.java | 31 --- .../pipeline/read/Collector.java | 13 +- .../pipeline/read/CollectorFactory.java | 12 +- .../corepersistence/pipeline/read/EdgePath.java | 79 +++++++ .../corepersistence/pipeline/read/Filter.java | 9 +- .../pipeline/read/FilterFactory.java | 40 +++- .../pipeline/read/FilterResult.java | 56 +++++ .../pipeline/read/PipelineOperation.java | 38 --- .../pipeline/read/ReadPipelineBuilder.java | 5 +- .../pipeline/read/ReadPipelineBuilderImpl.java | 80 ++++--- .../pipeline/read/ResultsPage.java | 26 ++- .../read/collect/AbstractCollector.java | 46 ++++ .../pipeline/read/collect/EntityFilter.java | 68 ++++++ .../read/collect/IdCursorSerializer.java | 41 ++++ .../read/collect/ResultsPageCollector.java | 80 +++++++ .../AbstractElasticSearchFilter.java | 45 ++-- .../pipeline/read/elasticsearch/Candidate.java | 55 +++++ .../elasticsearch/CandidateEntityFilter.java | 234 +++++++++++++++++++ .../read/elasticsearch/CandidateIdFilter.java | 201 ++++++++++++++++ .../CandidateResultsEntityResultsCollector.java | 217 ----------------- .../CandidateResultsIdVerifyFilter.java | 193 --------------- .../impl/CollectionRefsVerifier.java | 44 ---- .../CollectionResultsLoaderFactoryImpl.java | 65 ------ .../impl/ConnectionRefsVerifier.java | 59 ----- .../ConnectionResultsLoaderFactoryImpl.java | 73 ------ .../impl/ElasticSearchQueryExecutor.java | 224 ------------------ .../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 | 53 ----- .../read/entity/EntityLoadCollector.java | 94 -------- .../graph/AbstractReadGraphEdgeByIdFilter.java | 12 +- .../read/graph/AbstractReadGraphFilter.java | 65 +++++- .../pipeline/read/graph/EntityIdFilter.java | 54 +++++ .../pipeline/read/graph/EntityLoadFilter.java | 155 ++++++++++++ .../graph/ReadGraphConnectionByTypeFilter.java | 20 +- .../results/ObservableQueryExecutor.java | 24 +- .../apache/usergrid/persistence/Results.java | 2 +- .../pipeline/cursor/CursorTest.java | 20 +- .../persistence/index/CandidateResults.java | 11 +- .../impl/EsApplicationEntityIndexImpl.java | 7 +- .../persistence/index/usergrid-mappings.json | 3 + 56 files changed, 1578 insertions(+), 2099 deletions(-) ----------------------------------------------------------------------
