diff --git a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java index f9ca0760aaf665..78bb8cb1e41ae9 100644 --- a/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java +++ b/metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java @@ -637,7 +637,8 @@ private static QueryBuilder buildWildcardQueryWithMultipleValues( QueryBuilders.wildcardQuery( toKeywordField(criterion.getField(), isTimeseries, aspectRetriever), String.format(wildcardPattern, ESUtils.escapeReservedCharacters(value.trim()))) - .queryName(queryName != null ? queryName : fieldName)); + .queryName(queryName != null ? queryName : fieldName) + .caseInsensitive(true)); } return boolQuery; } @@ -653,7 +654,8 @@ private static QueryBuilder buildWildcardQueryWithSingleValue( toKeywordField(criterion.getField(), isTimeseries, aspectRetriever), String.format( wildcardPattern, ESUtils.escapeReservedCharacters(criterion.getValue().trim()))) - .queryName(queryName != null ? queryName : fieldName); + .queryName(queryName != null ? queryName : fieldName) + .caseInsensitive(true); } private static QueryBuilder buildContainsConditionFromCriterion( diff --git a/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java b/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java index 94241ec5e89b01..d171ef3cc7b2e3 100644 --- a/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java +++ b/metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java @@ -177,6 +177,7 @@ public void testGetQueryBuilderFromCriterionContain() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"*value1*\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -207,6 +208,7 @@ public void testGetQueryBuilderFromCriterionContain() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"*value1*\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -216,6 +218,7 @@ public void testGetQueryBuilderFromCriterionContain() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"*value2*\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -251,6 +254,7 @@ public void testWildcardQueryBuilderFromCriterionWhenStartsWith() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"value1*\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -281,6 +285,7 @@ public void testWildcardQueryBuilderFromCriterionWhenStartsWith() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"value1*\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -290,6 +295,7 @@ public void testWildcardQueryBuilderFromCriterionWhenStartsWith() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"value2*\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -322,6 +328,7 @@ public void testWildcardQueryBuilderFromCriterionWhenEndsWith() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"*value1\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -351,6 +358,7 @@ public void testWildcardQueryBuilderFromCriterionWhenEndsWith() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"*value1\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n" @@ -360,6 +368,7 @@ public void testWildcardQueryBuilderFromCriterionWhenEndsWith() { + " \"wildcard\" : {\n" + " \"myTestField.keyword\" : {\n" + " \"wildcard\" : \"*value2\",\n" + + " \"case_insensitive\" : true,\n" + " \"boost\" : 1.0,\n" + " \"_name\" : \"myTestField\"\n" + " }\n"