Skip to content

Commit

Permalink
fix(search): move filters to query instead of postFilter (datahub-pro…
Browse files Browse the repository at this point in the history
  • Loading branch information
Dexter Lee authored Aug 29, 2021
1 parent 1d56446 commit 1b738f8
Showing 1 changed file with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,11 @@ public SearchRequest getSearchRequest(@Nonnull String input, @Nullable Filter fi
searchSourceBuilder.from(from);
searchSourceBuilder.size(size);

searchSourceBuilder.query(getQuery(input));

BoolQueryBuilder filterQuery = ESUtils.buildFilterQuery(filter);
// Filter out entities that are marked "removed"
filterQuery.mustNot(QueryBuilders.matchQuery("removed", true));
searchSourceBuilder.postFilter(filterQuery);
searchSourceBuilder.query(QueryBuilders.boolQuery().should(getQuery(input)).must(filterQuery));

getAggregations(filter).forEach(searchSourceBuilder::aggregation);
searchSourceBuilder.highlighter(getHighlights());
ESUtils.buildSortOrder(searchSourceBuilder, sortCriterion);
Expand Down

0 comments on commit 1b738f8

Please sign in to comment.