Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advance search - Added case sensitive flag for wildcard searches #11272

Merged
merged 13 commits into from
Sep 18, 2024
Merged

Advance search - Added case sensitive flag for wildcard searches #11272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8457b94
Advance search - Added case sensitive flag for CONTAINS
kanavnarula Aug 30, 2024
fe84c68
Merge branch 'master' into master
kanavnarula Aug 30, 2024
7d91099
Merge branch 'master' into master
kanavnarula Sep 10, 2024
c600aa5
Spotless fix
Sep 14, 2024
34a8348
Merge branch 'master' into master
kanavnarula Sep 14, 2024
8181eb8
Merge branch 'master' into master
kanavnarula Sep 17, 2024
59674e8
Merge branch 'master' into master
david-leifker Sep 17, 2024
86caccc
test cases
Sep 17, 2024
253b54b
Merge branch 'master' into master
kanavnarula Sep 17, 2024
21e47b2
Merge branch 'master' into master
kanavnarula Sep 17, 2024
78678a5
Merge branch 'master' into master
kanavnarula Sep 17, 2024
77a0372
Merge branch 'master' into master
kanavnarula Sep 18, 2024
5cf0d60
Merge branch 'master' into master
kanavnarula Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions metadata-io/src/main/java/com/linkedin/metadata/search/utils/ESUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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(
Expand Down
9 changes: 9 additions & 0 deletions metadata-io/src/test/java/com/linkedin/metadata/search/utils/ESUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
Loading