Adding alternate multi_match parameter syntax.

Signed-off-by: forestmvey <forestv@bitquilltech.com>

Author: forestmvey

integ-test/src/test/java/org/opensearch/sql/sql/MultiMatchIT.java

@@ -32,7 +32,7 @@ public void init() throws IOException {
   public void test_mandatory_params() {
     String query = "SELECT Id FROM " + TEST_INDEX_BEER
         + " WHERE multi_match([\\\"Tags\\\" ^ 1.5, Title, `Body` 4.2], 'taste')";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(16, result.getInt("total"));
   }
 
@@ -44,39 +44,39 @@ public void test_all_params() {
         + "fuzziness = 'AUTO:1,5', fuzzy_transpositions = false, lenient = true, max_expansions = 25,"
         + "minimum_should_match = '2<-25% 9<-3', prefix_length = 7, tie_breaker = 0.3,"
         + "type = most_fields, slop = 2, zero_terms_query = 'ALL');";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(10, result.getInt("total"));
   }
 
   @Test
   public void verify_wildcard_test() {
     String query1 = "SELECT Id FROM " + TEST_INDEX_BEER
         + " WHERE multi_match(['Tags'], 'taste')";
-    var result1 = new JSONObject(executeQuery(query1, "jdbc"));
+    JSONObject result1 = executeJdbcRequest(query1);
     String query2 = "SELECT Id FROM " + TEST_INDEX_BEER
         + " WHERE multi_match(['T*'], 'taste')";
-    var result2 = new JSONObject(executeQuery(query2, "jdbc"));
+    JSONObject result2 = executeJdbcRequest(query2);
     assertNotEquals(result2.getInt("total"), result1.getInt("total"));
 
     String query = "SELECT Id FROM " + TEST_INDEX_BEER
         + " WHERE multi_match(['*Date'], '2014-01-22');";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(10, result.getInt("total"));
   }
 
   @Test
   public void test_multimatch_alternate_parameter_syntax() {
     String query = "SELECT Tags FROM " + TEST_INDEX_BEER
         + " WHERE multimatch('query'='taste', 'fields'='Tags')";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(8, result.getInt("total"));
   }
 
   @Test
   public void test_multimatchquery_alternate_parameter_syntax() {
     String query = "SELECT Tags FROM " + TEST_INDEX_BEER
         + " WHERE multimatchquery(query='cicerone', fields='Tags')";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
     verifyDataRows(result, rows("serving cicerone restaurants"),
         rows("taste cicerone"));
@@ -86,7 +86,7 @@ public void test_multimatchquery_alternate_parameter_syntax() {
   public void test_quoted_multi_match_alternate_parameter_syntax() {
     String query = "SELECT Tags FROM " + TEST_INDEX_BEER
         + " WHERE multi_match('query'='cicerone', 'fields'='Tags')";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
     verifyDataRows(result, rows("serving cicerone restaurants"),
         rows("taste cicerone"));
@@ -96,7 +96,7 @@ public void test_quoted_multi_match_alternate_parameter_syntax() {
   public void test_multi_match_alternate_parameter_syntax() {
     String query = "SELECT Tags FROM " + TEST_INDEX_BEER
         + " WHERE multi_match(query='cicerone', fields='Tags')";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
     verifyDataRows(result, rows("serving cicerone restaurants"),
         rows("taste cicerone"));
@@ -106,7 +106,7 @@ public void test_multi_match_alternate_parameter_syntax() {
   public void test_wildcard_multi_match_alternate_parameter_syntax() {
     String query = "SELECT Body FROM " + TEST_INDEX_BEER
         + " WHERE multi_match(query='IPA', fields='B*') LIMIT 1";
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     verifyDataRows(result, rows("<p>I know what makes an IPA an IPA, but what are the unique" +
         " characteristics of it's common variants? To be specific, the ones I'm interested in are Double IPA" +
         " and Black IPA, but general differences between any other styles would be welcome too. </p>\n"));
@@ -121,7 +121,7 @@ public void test_all_params_multimatchquery_alternate_parameter_syntax() {
         + "minimum_should_match = '2<-25% 9<-3', prefix_length = 7, tie_breaker = 0.3,"
         + "type = most_fields, slop = 2, zero_terms_query = 'ALL');";
 
-    var result = new JSONObject(executeQuery(query, "jdbc"));
+    JSONObject result = executeJdbcRequest(query);
     assertEquals(2, result.getInt("total"));
   }
 }

sql/src/main/antlr/OpenSearchSQLParser.g4

@@ -509,17 +509,12 @@ alternateMultiMatchArgName
     | stringLiteral
     ;
 
-alternateMultiMatchArgVal
-    : qualifiedName
-    | stringLiteral
-    ;
-
 alternateMultiMatchQuery
-    : argName=alternateMultiMatchArgName EQUAL_SYMBOL argVal=alternateMultiMatchArgVal
+    : argName=alternateMultiMatchArgName EQUAL_SYMBOL argVal=relevanceArgValue
     ;
 
 alternateMultiMatchField
-    : argName=alternateMultiMatchArgName EQUAL_SYMBOL argVal=alternateMultiMatchArgVal
+    : argName=alternateMultiMatchArgName EQUAL_SYMBOL argVal=relevanceArgValue
     | argName=alternateMultiMatchArgName EQUAL_SYMBOL
-    LT_SQR_PRTHS argVal=alternateMultiMatchArgVal RT_SQR_PRTHS
+    LT_SQR_PRTHS argVal=relevanceArgValue RT_SQR_PRTHS
     ;

sql/src/main/java/org/opensearch/sql/sql/parser/AstExpressionBuilder.java

@@ -81,9 +81,7 @@
 import org.opensearch.sql.ast.expression.When;
 import org.opensearch.sql.ast.expression.WindowFunction;
 import org.opensearch.sql.ast.tree.Sort.SortOption;
-import org.opensearch.sql.catalog.model.auth.AuthenticationType;
 import org.opensearch.sql.common.utils.StringUtils;
-import org.opensearch.sql.exception.SemanticCheckException;
 import org.opensearch.sql.expression.function.BuiltinFunctionName;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser;
 import org.opensearch.sql.sql.antlr.parser.OpenSearchSQLParser.AndExpressionContext;
@@ -458,7 +456,7 @@ private QualifiedName visitIdentifiers(List<IdentContext> identifiers) {
   private void fillRelevanceArgs(List<OpenSearchSQLParser.RelevanceArgContext> args,
                                  ImmutableList.Builder<UnresolvedExpression> builder) {
     // To support old syntax we must support argument keys as quoted strings.
-    args.forEach(v -> builder.add(v.relevanceArgName() != null
+    args.forEach(v -> builder.add(v.argName == null
         ? new UnresolvedArgument(v.relevanceArgName().getText().toLowerCase(),
             new Literal(StringUtils.unquoteText(v.relevanceArgValue().getText()),
             DataType.STRING))

sql/src/test/java/org/opensearch/sql/sql/antlr/SQLSyntaxParserTest.java

@@ -193,6 +193,10 @@ public void can_parse_now_like_functions(String name, Boolean hasFsp, Boolean ha
 
   @Test
   public void can_parse_multi_match_relevance_function() {
+    assertNotNull(parser.parse(
+        "SELECT id FROM test WHERE multimatch(\"fields\"=\"field\", query=\"query\")"));
+    assertNotNull(parser.parse(
+        "SELECT id FROM test WHERE multimatchquery(fields=\"field\", \"query\"=\"query\")"));
     assertNotNull(parser.parse(
         "SELECT id FROM test WHERE multi_match(\"fields\"=\"field\", \"query\"=\"query\")"));
     assertNotNull(parser.parse(