Convert delete ES queries to filters instead of queries.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/30ba1305 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/30ba1305 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/30ba1305 Branch: refs/heads/apigee-sso-provider Commit: 30ba1305c065e4f731b1f4dc9d2a8aa004fb8e13 Parents: 9a45c49 Author: Michael Russo <[email protected]> Authored: Wed Jul 20 11:52:41 2016 +0100 Committer: Michael Russo <[email protected]> Committed: Wed Jul 20 11:52:41 2016 +0100 ---------------------------------------------------------------------- .../index/impl/EsEntityIndexImpl.java | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/30ba1305/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java index 6e04bed..f379e80 100644 --- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java +++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java @@ -469,11 +469,11 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData { // never let this fetch more than 100 to save memory final int searchLimit = Math.min(100, indexFig.getVersionQueryLimit()); - final QueryBuilder nodeIdQuery = QueryBuilders - .termQuery(IndexingUtils.EDGE_NODE_ID_FIELDNAME, IndexingUtils.nodeId(edge.getNodeId())); + final FilterBuilder nodeIdQuery = FilterBuilders + .termFilter(IndexingUtils.EDGE_NODE_ID_FIELDNAME, IndexingUtils.nodeId(edge.getNodeId())); - final QueryBuilder entityIdQuery = QueryBuilders - .termQuery(IndexingUtils.ENTITY_ID_FIELDNAME, IndexingUtils.entityId(entityId)); + final FilterBuilder entityIdQuery = FilterBuilders + .termFilter(IndexingUtils.ENTITY_ID_FIELDNAME, IndexingUtils.entityId(entityId)); final SearchRequestBuilder srb = searchRequestBuilderStrategyV2.getBuilder() .addSort(IndexingUtils.EDGE_TIMESTAMP_FIELDNAME, SortOrder.ASC); @@ -489,13 +489,13 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData { long queryTimestamp = 0L; - QueryBuilder timestampQuery = QueryBuilders - .rangeQuery(IndexingUtils.EDGE_TIMESTAMP_FIELDNAME) + FilterBuilder timestampQuery = FilterBuilders + .rangeFilter(IndexingUtils.EDGE_TIMESTAMP_FIELDNAME) .gte(queryTimestamp); QueryBuilder finalQuery = QueryBuilders.constantScoreQuery( - QueryBuilders - .boolQuery() + FilterBuilders + .boolFilter() .must(entityIdQuery) .must(nodeIdQuery) .must(timestampQuery) @@ -539,8 +539,8 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData { final int searchLimit = Math.min(100, indexFig.getVersionQueryLimit()); // this query will find all the documents where this entity is a source/target node - final QueryBuilder nodeQuery = QueryBuilders - .termQuery(IndexingUtils.EDGE_NODE_ID_FIELDNAME, IndexingUtils.nodeId(entityId)); + final FilterBuilder nodeQuery = FilterBuilders + .termFilter(IndexingUtils.EDGE_NODE_ID_FIELDNAME, IndexingUtils.nodeId(entityId)); final SearchRequestBuilder srb = searchRequestBuilderStrategyV2.getBuilder() .addSort(IndexingUtils.EDGE_TIMESTAMP_FIELDNAME, SortOrder.ASC); @@ -549,14 +549,14 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData { long queryTimestamp = 0L; - QueryBuilder timestampQuery = QueryBuilders - .rangeQuery(IndexingUtils.EDGE_TIMESTAMP_FIELDNAME) + FilterBuilder timestampQuery = FilterBuilders + .rangeFilter(IndexingUtils.EDGE_TIMESTAMP_FIELDNAME) .gte(queryTimestamp) .lt(markedTimestamp); QueryBuilder finalQuery = QueryBuilders.constantScoreQuery( - QueryBuilders - .boolQuery() + FilterBuilders + .boolFilter() .must(timestampQuery) .must(nodeQuery) );
