yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-11-08 15:30:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(search filter): termQuery is optimal (#12322)

Browse Source
This commit is contained in:
david-leifker 2025-01-22 10:12:46 -06:00 committed by GitHub
parent b75d3ed5dc
commit d3ff189dd0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
View File

@ -874,7 +874,7 @@ public class ESUtils {
|| criterion.getField().equals(REMOVED + KEYWORD_SUFFIX))); || criterion.getField().equals(REMOVED + KEYWORD_SUFFIX)));
} }
if (!removedInOrFilter) { if (!removedInOrFilter) {
filterQuery.mustNot(QueryBuilders.matchQuery(REMOVED, true)); filterQuery.mustNot(QueryBuilders.termQuery(REMOVED, true));
} }
} }
} }

4
metadata-io/src/test/java/com/linkedin/metadata/search/query/request/AutocompleteRequestHandlerTest.java
View File

@ -158,7 +158,7 @@ public class AutocompleteRequestHandlerTest {
assertEquals("keyPart1.delimited", prefixQuery.fieldName()); assertEquals("keyPart1.delimited", prefixQuery.fieldName());
assertEquals(wrapper.mustNot().size(), 1); assertEquals(wrapper.mustNot().size(), 1);
MatchQueryBuilder removedFilter = (MatchQueryBuilder) wrapper.mustNot().get(0); TermQueryBuilder removedFilter = (TermQueryBuilder) wrapper.mustNot().get(0);
assertEquals(removedFilter.fieldName(), "removed"); assertEquals(removedFilter.fieldName(), "removed");
assertEquals(removedFilter.value(), true); assertEquals(removedFilter.value(), true);
HighlightBuilder highlightBuilder = sourceBuilder.highlighter(); HighlightBuilder highlightBuilder = sourceBuilder.highlighter();
@ -203,7 +203,7 @@ public class AutocompleteRequestHandlerTest {
(MatchPhrasePrefixQueryBuilder) query.should().get(1); (MatchPhrasePrefixQueryBuilder) query.should().get(1);
assertEquals("field.delimited", prefixQuery.fieldName()); assertEquals("field.delimited", prefixQuery.fieldName());
MatchQueryBuilder removedFilter = (MatchQueryBuilder) wrapper.mustNot().get(0); TermQueryBuilder removedFilter = (TermQueryBuilder) wrapper.mustNot().get(0);
assertEquals(removedFilter.fieldName(), "removed"); assertEquals(removedFilter.fieldName(), "removed");
assertEquals(removedFilter.value(), true); assertEquals(removedFilter.value(), true);
HighlightBuilder highlightBuilder = sourceBuilder.highlighter(); HighlightBuilder highlightBuilder = sourceBuilder.highlighter();

6
metadata-io/src/test/java/com/linkedin/metadata/search/query/request/SearchRequestHandlerTest.java
View File

@ -436,7 +436,7 @@ public class SearchRequestHandlerTest extends AbstractTestNGSpringContextTests {
} }
private void testFilterQuery(BoolQueryBuilder testQuery) { private void testFilterQuery(BoolQueryBuilder testQuery) {
Optional<MatchQueryBuilder> mustNotHaveRemovedCondition = Optional<TermQueryBuilder> mustNotHaveRemovedCondition =
testQuery.filter().stream() testQuery.filter().stream()
.filter(or -> or instanceof BoolQueryBuilder) .filter(or -> or instanceof BoolQueryBuilder)
.map(or -> (BoolQueryBuilder) or) .map(or -> (BoolQueryBuilder) or)
@ -445,8 +445,8 @@ public class SearchRequestHandlerTest extends AbstractTestNGSpringContextTests {
System.out.println("processing: " + or.mustNot()); System.out.println("processing: " + or.mustNot());
return or.mustNot().stream(); return or.mustNot().stream();
}) })
.filter(and -> and instanceof MatchQueryBuilder) .filter(and -> and instanceof TermQueryBuilder)
.map(and -> (MatchQueryBuilder) and) .map(and -> (TermQueryBuilder) and)
.filter(match -> match.fieldName().equals("removed")) .filter(match -> match.fieldName().equals("removed"))
.findAny(); .findAny();