Advance search - Added case sensitive flag for wildcard searches (dat…

…ahub-project#11272) Co-authored-by: mac <[email protected]> Co-authored-by: david-leifker <[email protected]> Co-authored-by: Kanav Narula <[email protected]>
acryldata · Sep 18, 2024 · 4693ab0 · 4693ab0
1 parent 8ea2117
commit 4693ab0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
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
@@ -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
@@ -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"