mirror of
				https://github.com/datahub-project/datahub.git
				synced 2025-11-04 12:51:23 +00:00 
			
		
		
		
	fix(search filter): termQuery is optimal (#12322)
This commit is contained in:
		
							parent
							
								
									b75d3ed5dc
								
							
						
					
					
						commit
						d3ff189dd0
					
				@ -874,7 +874,7 @@ public class ESUtils {
 | 
			
		||||
                                        || criterion.getField().equals(REMOVED + KEYWORD_SUFFIX)));
 | 
			
		||||
      }
 | 
			
		||||
      if (!removedInOrFilter) {
 | 
			
		||||
        filterQuery.mustNot(QueryBuilders.matchQuery(REMOVED, true));
 | 
			
		||||
        filterQuery.mustNot(QueryBuilders.termQuery(REMOVED, true));
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
@ -158,7 +158,7 @@ public class AutocompleteRequestHandlerTest {
 | 
			
		||||
    assertEquals("keyPart1.delimited", prefixQuery.fieldName());
 | 
			
		||||
 | 
			
		||||
    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.value(), true);
 | 
			
		||||
    HighlightBuilder highlightBuilder = sourceBuilder.highlighter();
 | 
			
		||||
@ -203,7 +203,7 @@ public class AutocompleteRequestHandlerTest {
 | 
			
		||||
        (MatchPhrasePrefixQueryBuilder) query.should().get(1);
 | 
			
		||||
    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.value(), true);
 | 
			
		||||
    HighlightBuilder highlightBuilder = sourceBuilder.highlighter();
 | 
			
		||||
 | 
			
		||||
@ -436,7 +436,7 @@ public class SearchRequestHandlerTest extends AbstractTestNGSpringContextTests {
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
  private void testFilterQuery(BoolQueryBuilder testQuery) {
 | 
			
		||||
    Optional<MatchQueryBuilder> mustNotHaveRemovedCondition =
 | 
			
		||||
    Optional<TermQueryBuilder> mustNotHaveRemovedCondition =
 | 
			
		||||
        testQuery.filter().stream()
 | 
			
		||||
            .filter(or -> or instanceof BoolQueryBuilder)
 | 
			
		||||
            .map(or -> (BoolQueryBuilder) or)
 | 
			
		||||
@ -445,8 +445,8 @@ public class SearchRequestHandlerTest extends AbstractTestNGSpringContextTests {
 | 
			
		||||
                  System.out.println("processing: " + or.mustNot());
 | 
			
		||||
                  return or.mustNot().stream();
 | 
			
		||||
                })
 | 
			
		||||
            .filter(and -> and instanceof MatchQueryBuilder)
 | 
			
		||||
            .map(and -> (MatchQueryBuilder) and)
 | 
			
		||||
            .filter(and -> and instanceof TermQueryBuilder)
 | 
			
		||||
            .map(and -> (TermQueryBuilder) and)
 | 
			
		||||
            .filter(match -> match.fieldName().equals("removed"))
 | 
			
		||||
            .findAny();
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user