Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o_exception_verification
# By Todd Nine (3) and ryan bridges (1) # Via ryan bridges * 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: [USERGRID-342] Added unimplemented remove method to ElasticSearchQueryExecutor. Fixed merge artifact in AdminEmailEncodingIT Fixes issue with throwable not being caught in onSubscribe function Updates iteration logic in the management service for iterating apps Refactored search to encapsulate repair and load logic Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/9108aa77 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/9108aa77 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/9108aa77 Branch: refs/heads/two-dot-o_exception_verification Commit: 9108aa7774dcd9ff38b6baa9815b150edc430251 Parents: 3b3ec54 d20267b Author: GERey <[email protected]> Authored: Wed Apr 1 11:27:54 2015 -0700 Committer: GERey <[email protected]> Committed: Wed Apr 1 11:27:54 2015 -0700 ---------------------------------------------------------------------- .../corepersistence/CpRelationManager.java | 303 ++++++------------- .../results/CollectionRefsVerifier.java | 44 +++ .../CollectionResultsLoaderFactoryImpl.java | 60 ++++ .../results/ConnectionRefsVerifier.java | 61 ++++ .../ConnectionResultsLoaderFactoryImpl.java | 65 ++++ .../results/ElasticSearchQueryExecutor.java | 216 +++++++++++++ .../corepersistence/results/QueryExecutor.java | 37 +++ .../corepersistence/results/RefsVerifier.java | 42 --- .../results/ResultsLoaderFactory.java | 3 +- .../results/ResultsLoaderFactoryImpl.java | 62 ---- .../persistence/MultiQueryIterator.java | 6 +- .../apache/usergrid/persistence/Results.java | 26 +- .../cassandra/QueryProcessorImpl.java | 12 +- .../usergrid/persistence/PathQueryIT.java | 46 ++- stack/core/src/test/resources/log4j.properties | 2 + .../persistence/graph/GraphManagerIT.java | 9 +- .../usergrid/persistence/index/IndexFig.java | 16 +- .../index/impl/BufferQueueInMemoryImpl.java | 10 +- .../index/impl/EsIndexBufferConsumerImpl.java | 66 ++-- .../usergrid/persistence/index/query/Query.java | 58 ++-- .../persistence/index/utils/ListUtils.java | 2 - stack/pom.xml | 2 +- .../organizations/AdminEmailEncodingIT.java | 6 +- .../cassandra/ManagementServiceImpl.java | 18 +- 24 files changed, 736 insertions(+), 436 deletions(-) ----------------------------------------------------------------------
