From f72f3472cf93ec5d7de12bd572883eced9c7d55d Mon Sep 17 00:00:00 2001 From: Mitchell Gale Date: Mon, 8 Aug 2022 14:08:46 -0700 Subject: [PATCH 1/2] Added new functionality around argument names not case specific for relevancy based functions. Added unit tests to cover updates. Signed-off-by: MitchellGale-BitQuill --- .../relevance/MatchPhrasePrefixQuery.java | 2 +- .../lucene/relevance/MatchPhraseQuery.java | 2 +- .../filter/lucene/relevance/MatchQuery.java | 4 +-- .../lucene/relevance/MultiMatchQuery.java | 9 +++--- .../lucene/relevance/QueryStringQuery.java | 9 +++--- .../lucene/relevance/RelevanceQuery.java | 15 ++++++++-- .../relevance/SimpleQueryStringQuery.java | 9 +++--- .../lucene/MatchPhrasePrefixQueryTest.java | 9 ++++++ .../filter/lucene/MatchPhraseQueryTest.java | 10 +++++++ .../script/filter/lucene/MatchQueryTest.java | 5 ++++ .../script/filter/lucene/MultiMatchTest.java | 5 ++++ .../script/filter/lucene/QueryStringTest.java | 8 ++++- .../script/filter/lucene/RangeQueryTest.java | 2 +- .../filter/lucene/SimpleQueryStringTest.java | 29 +++++++++++++++++++ 14 files changed, 97 insertions(+), 21 deletions(-) diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java index 83ccf25686..b8d0d4f18d 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhrasePrefixQuery.java @@ -23,7 +23,7 @@ public MatchPhrasePrefixQuery() { .put("slop", (b, v) -> b.slop(Integer.parseInt(v.stringValue()))) .put("max_expansions", (b, v) -> b.maxExpansions(Integer.parseInt(v.stringValue()))) .put("zero_terms_query", (b, v) -> b.zeroTermsQuery( - org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(v.stringValue()))) + org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(valueOfToUpper(v)))) .put("boost", (b, v) -> b.boost(Float.parseFloat(v.stringValue()))) .build()); } diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java index 9004fa78b4..333d8eff89 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchPhraseQuery.java @@ -34,7 +34,7 @@ public MatchPhraseQuery() { .put("analyzer", (b, v) -> b.analyzer(v.stringValue())) .put("slop", (b, v) -> b.slop(Integer.parseInt(v.stringValue()))) .put("zero_terms_query", (b, v) -> b.zeroTermsQuery( - org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(v.stringValue()))) + org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(valueOfToUpper(v)))) .build()); } diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java index c69b43cbcb..4095ffba4e 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MatchQuery.java @@ -24,7 +24,7 @@ public MatchQuery() { .put("analyzer", (b, v) -> b.analyzer(v.stringValue())) .put("auto_generate_synonyms_phrase_query", (b, v) -> b.autoGenerateSynonymsPhraseQuery(Boolean.parseBoolean(v.stringValue()))) - .put("fuzziness", (b, v) -> b.fuzziness(v.stringValue())) + .put("fuzziness", (b, v) -> b.fuzziness(valueOfToUpper(v))) .put("max_expansions", (b, v) -> b.maxExpansions(Integer.parseInt(v.stringValue()))) .put("prefix_length", (b, v) -> b.prefixLength(Integer.parseInt(v.stringValue()))) .put("fuzzy_transpositions", @@ -34,7 +34,7 @@ public MatchQuery() { .put("operator", (b, v) -> b.operator(Operator.fromString(v.stringValue()))) .put("minimum_should_match", (b, v) -> b.minimumShouldMatch(v.stringValue())) .put("zero_terms_query", (b, v) -> b.zeroTermsQuery( - org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(v.stringValue()))) + org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(valueOfToUpper(v)))) .put("boost", (b, v) -> b.boost(Float.parseFloat(v.stringValue()))) .build()); } diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java index b2865c1226..524d42f0b6 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/MultiMatchQuery.java @@ -41,7 +41,7 @@ public MultiMatchQuery() { .put("type", (b, v) -> b.type(v.stringValue())) .put("slop", (b, v) -> b.slop(Integer.parseInt(v.stringValue()))) .put("zero_terms_query", (b, v) -> b.zeroTermsQuery( - org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(v.stringValue()))) + org.opensearch.index.search.MatchQuery.ZeroTermsQuery.valueOf(valueOfToUpper(v)))) .build()); } @@ -67,14 +67,15 @@ public QueryBuilder build(FunctionExpression func) { .fields(fieldsAndWeights); while (iterator.hasNext()) { NamedArgumentExpression arg = (NamedArgumentExpression) iterator.next(); - if (!queryBuildActions.containsKey(arg.getArgName())) { + String argNormalized = arg.getArgName().toLowerCase(); + if (!queryBuildActions.containsKey(argNormalized)) { throw new SemanticCheckException( String.format("Parameter %s is invalid for %s function.", - arg.getArgName(), queryBuilder.getWriteableName())); + argNormalized, queryBuilder.getWriteableName())); } (Objects.requireNonNull( queryBuildActions - .get(arg.getArgName()))) + .get(argNormalized))) .apply(queryBuilder, arg.getValue().valueOf(null)); } return queryBuilder; diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java index 53f4c3008b..54ffea6158 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/QueryStringQuery.java @@ -59,7 +59,7 @@ public QueryStringQuery() { .put("phrase_slop", (b, v) -> b.phraseSlop(Integer.parseInt(v.stringValue()))) .put("quote_field_suffix", (b, v) -> b.quoteFieldSuffix(v.stringValue())) .put("rewrite", (b, v) -> b.rewrite(v.stringValue())) - .put("type", (b, v) -> b.type(MultiMatchQueryBuilder.Type.parse(v.stringValue(), + .put("type", (b, v) -> b.type(MultiMatchQueryBuilder.Type.parse(valueOfToLower(v), LoggingDeprecationHandler.INSTANCE))) .put("tie_breaker", (b, v) -> b.tieBreaker(Float.parseFloat(v.stringValue()))) .put("time_zone", (b, v) -> b.timeZone(v.stringValue())) @@ -93,14 +93,15 @@ public QueryBuilder build(FunctionExpression func) { .fields(fieldsAndWeights); while (iterator.hasNext()) { NamedArgumentExpression arg = (NamedArgumentExpression) iterator.next(); - if (!queryBuildActions.containsKey(arg.getArgName())) { + String argNormalized = arg.getArgName().toLowerCase(); + if (!queryBuildActions.containsKey(argNormalized)) { throw new SemanticCheckException( String.format("Parameter %s is invalid for %s function.", - arg.getArgName(), queryBuilder.getWriteableName())); + argNormalized, queryBuilder.getWriteableName())); } (Objects.requireNonNull( queryBuildActions - .get(arg.getArgName()))) + .get(argNormalized))) .apply(queryBuilder, arg.getValue().valueOf(null)); } return queryBuilder; diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java index fb0852c18b..fb997646f4 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQuery.java @@ -46,14 +46,15 @@ public QueryBuilder build(FunctionExpression func) { Iterator iterator = arguments.listIterator(2); while (iterator.hasNext()) { NamedArgumentExpression arg = (NamedArgumentExpression) iterator.next(); - if (!queryBuildActions.containsKey(arg.getArgName())) { + String argNormalized = arg.getArgName().toLowerCase(); + if (!queryBuildActions.containsKey(argNormalized)) { throw new SemanticCheckException( String.format("Parameter %s is invalid for %s function.", - arg.getArgName(), queryBuilder.getWriteableName())); + argNormalized, queryBuilder.getWriteableName())); } (Objects.requireNonNull( queryBuildActions - .get(arg.getArgName()))) + .get(argNormalized))) .apply(queryBuilder, arg.getValue().valueOf(null)); } return queryBuilder; @@ -70,4 +71,12 @@ public interface QueryBuilderStep extends BiFunction { } + + public static String valueOfToUpper(ExprValue v) { + return v.stringValue().toUpperCase(); + } + + public static String valueOfToLower(ExprValue v) { + return v.stringValue().toLowerCase(); + } } diff --git a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java index 539fc26382..45637e98a6 100644 --- a/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java +++ b/opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/SimpleQueryStringQuery.java @@ -32,7 +32,7 @@ public SimpleQueryStringQuery() { b.autoGenerateSynonymsPhraseQuery(Boolean.parseBoolean(v.stringValue()))) .put("boost", (b, v) -> b.boost(Float.parseFloat(v.stringValue()))) .put("default_operator", (b, v) -> b.defaultOperator(Operator.fromString(v.stringValue()))) - .put("flags", (b, v) -> b.flags(Arrays.stream(v.stringValue().split("\\|")) + .put("flags", (b, v) -> b.flags(Arrays.stream(valueOfToUpper(v).split("\\|")) .map(SimpleQueryStringFlag::valueOf) .toArray(SimpleQueryStringFlag[]::new))) .put("fuzzy_max_expansions", (b, v) -> @@ -69,14 +69,15 @@ public QueryBuilder build(FunctionExpression func) { .fields(fieldsAndWeights); while (iterator.hasNext()) { NamedArgumentExpression arg = (NamedArgumentExpression) iterator.next(); - if (!queryBuildActions.containsKey(arg.getArgName())) { + String argNormalized = arg.getArgName().toLowerCase(); + if (!queryBuildActions.containsKey(argNormalized)) { throw new SemanticCheckException( String.format("Parameter %s is invalid for %s function.", - arg.getArgName(), queryBuilder.getWriteableName())); + argNormalized, queryBuilder.getWriteableName())); } (Objects.requireNonNull( queryBuildActions - .get(arg.getArgName()))) + .get(argNormalized))) .apply(queryBuilder, arg.getValue().valueOf(null)); } return queryBuilder; diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java index 9a5eeb14b5..8e1a2fcdf0 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhrasePrefixQueryTest.java @@ -94,6 +94,15 @@ public void test_zero_terms_query_parameter() { Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments))); } + @Test + public void test_zero_terms_query_parameter_lower_case() { + List arguments = List.of( + dsl.namedArgument("field", "t1"), + dsl.namedArgument("query", "t2"), + dsl.namedArgument("zero_terms_query", "all") + ); + Assertions.assertNotNull(matchPhrasePrefixQuery.build(new MatchPhraseExpression(arguments))); + } @Test public void test_boost_parameter() { diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java index fef3d64f95..4e8895a12a 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchPhraseQueryTest.java @@ -99,6 +99,16 @@ public void test_zero_terms_query_parameter() { Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments))); } + @Test + public void test_zero_terms_query_parameter_lower_case() { + List arguments = List.of( + namedArgument("field", "t1"), + namedArgument("query", "t2"), + namedArgument("zero_terms_query", "all") + ); + Assertions.assertNotNull(matchPhraseQuery.build(new MatchPhraseExpression(arguments))); + } + private class MatchPhraseExpression extends FunctionExpression { public MatchPhraseExpression(List arguments) { super(MatchPhraseQueryTest.this.matchPhrase, arguments); diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java index 99cf132a3e..60dd938f78 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MatchQueryTest.java @@ -96,6 +96,11 @@ static Stream> generateValidData() { dsl.namedArgument("query", DSL.literal("query_value")), dsl.namedArgument("zero_terms_query", DSL.literal("NONE")) ), + List.of( + dsl.namedArgument("field", DSL.literal("field_value")), + dsl.namedArgument("query", DSL.literal("query_value")), + dsl.namedArgument("zero_terms_query", DSL.literal("none")) + ), List.of( dsl.namedArgument("field", DSL.literal("field_value")), dsl.namedArgument("query", DSL.literal("query_value")), diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java index 51499faf03..4a6e1d2ed9 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/MultiMatchTest.java @@ -120,6 +120,11 @@ static Stream> generateValidData() { dsl.namedArgument("fields", fields_value), dsl.namedArgument("query", query_value), dsl.namedArgument("zero_terms_query", DSL.literal("ALL")) + ), + List.of( + dsl.namedArgument("fields", fields_value), + dsl.namedArgument("query", query_value), + dsl.namedArgument("zero_terms_query", DSL.literal("all")) ) ); } diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java index 31c9f981a5..fce835bf43 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/QueryStringTest.java @@ -54,6 +54,7 @@ static Stream> generateValidData() { dsl.namedArgument("auto_generate_synonyms_phrase_query", DSL.literal("true")), dsl.namedArgument("boost", DSL.literal("1")), dsl.namedArgument("default_operator", DSL.literal("AND")), + dsl.namedArgument("default_operator", DSL.literal("and")), dsl.namedArgument("enable_position_increments", DSL.literal("true")), dsl.namedArgument("escape", DSL.literal("false")), dsl.namedArgument("fuzziness", DSL.literal("1")), @@ -70,7 +71,12 @@ static Stream> generateValidData() { dsl.namedArgument("rewrite", DSL.literal("constant_score")), dsl.namedArgument("type", DSL.literal("best_fields")), dsl.namedArgument("tie_breaker", DSL.literal("0.3")), - dsl.namedArgument("time_zone", DSL.literal("Canada/Pacific")) + dsl.namedArgument("time_zone", DSL.literal("Canada/Pacific")), + dsl.namedArgument("ANALYZER", DSL.literal("standard")), + dsl.namedArgument("ANALYZE_wildcard", DSL.literal("true")), + dsl.namedArgument("Allow_Leading_wildcard", DSL.literal("true")), + dsl.namedArgument("Auto_Generate_Synonyms_Phrase_Query", DSL.literal("true")), + dsl.namedArgument("Boost", DSL.literal("1")) ).stream().map(arg -> List.of(field, query, arg)); } diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java index 2d1f36a81d..208c782593 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/RangeQueryTest.java @@ -20,7 +20,7 @@ class RangeQueryTest { @Test void should_throw_exception_for_unsupported_comparison() { - // Note that since we do switch check on enum comparison, this should'be impossible + // Note that since we do switch check on enum comparison, this should be impossible assertThrows(IllegalStateException.class, () -> new RangeQuery(Comparison.BETWEEN) .doBuild("name", STRING, ExprValueUtils.stringValue("John"))); diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java index 954d82474d..048f6e1cb9 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/SimpleQueryStringTest.java @@ -81,6 +81,16 @@ static Stream> generateValidData() { dsl.namedArgument("query", query_value), dsl.namedArgument("flags", DSL.literal("NOT|AND")) ), + List.of( + dsl.namedArgument("fields", fields_value), + dsl.namedArgument("query", query_value), + dsl.namedArgument("flags", DSL.literal("PREFIX|not|AND")) + ), + List.of( + dsl.namedArgument("fields", fields_value), + dsl.namedArgument("query", query_value), + dsl.namedArgument("flags", DSL.literal("not|and")) + ), List.of( dsl.namedArgument("fields", fields_value), dsl.namedArgument("query", query_value), @@ -106,6 +116,11 @@ static Stream> generateValidData() { dsl.namedArgument("query", query_value), dsl.namedArgument("default_operator", DSL.literal("AND")) ), + List.of( + dsl.namedArgument("fields", fields_value), + dsl.namedArgument("query", query_value), + dsl.namedArgument("default_operator", DSL.literal("and")) + ), List.of( dsl.namedArgument("fields", fields_value), dsl.namedArgument("query", query_value), @@ -120,6 +135,20 @@ static Stream> generateValidData() { dsl.namedArgument("fields", fields_value), dsl.namedArgument("query", query_value), dsl.namedArgument("boost", DSL.literal("1")) + ), + List.of( + dsl.namedArgument("FIELDS", fields_value), + dsl.namedArgument("QUERY", query_value) + ), + List.of( + dsl.namedArgument("FIELDS", fields_value), + dsl.namedArgument("query", query_value), + dsl.namedArgument("ANALYZE_wildcard", DSL.literal("true")) + ), + List.of( + dsl.namedArgument("fields", fields_value), + dsl.namedArgument("query", query_value), + dsl.namedArgument("analyZER", DSL.literal("standard")) ) ); } From 8a24323919f8df53a26cb1c2622bb6234180e570 Mon Sep 17 00:00:00 2001 From: MitchellGale-BitQuill Date: Mon, 8 Aug 2022 15:50:08 -0700 Subject: [PATCH 2/2] Fixed test cases that used uppercase values in arguments. Signed-off-by: MitchellGale-BitQuill --- .../storage/script/filter/FilterQueryBuilderTest.java | 2 +- .../script/filter/lucene/relevance/RelevanceQueryBuildTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java index 11c9afe174..b1efe86d01 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilderTest.java @@ -851,7 +851,7 @@ void match_phrase_invalid_value_ztq() { dsl.namedArgument("query", literal("search query")), dsl.namedArgument("zero_terms_query", literal("meow"))); var msg = assertThrows(IllegalArgumentException.class, () -> buildQuery(expr)).getMessage(); - assertEquals("No enum constant org.opensearch.index.search.MatchQuery.ZeroTermsQuery.meow", + assertEquals("No enum constant org.opensearch.index.search.MatchQuery.ZeroTermsQuery.MEOW", msg); } diff --git a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java index 1186031f5f..a67f0f34a7 100644 --- a/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java +++ b/opensearch/src/test/java/org/opensearch/sql/opensearch/storage/script/filter/lucene/relevance/RelevanceQueryBuildTest.java @@ -72,7 +72,7 @@ void throws_SemanticCheckException_when_wrong_argument_name() { SemanticCheckException exception = assertThrows(SemanticCheckException.class, () -> query.build(expr)); - assertEquals("Parameter wrongArg is invalid for mock_query function.", exception.getMessage()); + assertEquals("Parameter wrongarg is invalid for mock_query function.", exception.getMessage()); } @Test