Merge commit 'refs/pull/582/head' of github.com:apache/usergrid into 3.0.0_experimental
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/697b291e Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/697b291e Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/697b291e Branch: refs/heads/3.0.0_experimental Commit: 697b291ec738ea2e19b8841c6164ce987ffe9727 Parents: 8b945c6 bb593d4 Author: Mike Dunker <mdun...@google.com> Authored: Wed Nov 15 08:45:57 2017 -0800 Committer: Mike Dunker <mdun...@google.com> Committed: Wed Nov 15 08:45:57 2017 -0800 ---------------------------------------------------------------------- stack/corepersistence/pom.xml | 2 +- stack/corepersistence/queryindex/pom.xml | 6 ++ .../index/impl/EsEntityIndexImpl.java | 66 ++++++------ .../index/impl/EsIndexProducerImpl.java | 23 ++++- .../persistence/index/impl/EsProvider.java | 18 ++-- .../persistence/index/impl/EsQueryVistor.java | 100 ++++++++----------- .../index/impl/NoOpFilterBuilder.java | 13 +-- .../index/impl/NoOpQueryBuilder.java | 33 +++++- .../impl/SearchRequestBuilderStrategy.java | 36 ++++--- .../persistence/index/impl/SortBuilder.java | 8 +- .../index/query/tree/QueryVisitor.java | 10 +- .../persistence/index/usergrid-mappings.json | 2 - 12 files changed, 174 insertions(+), 143 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/697b291e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java ----------------------------------------------------------------------
