Merge pull request #51 from Bit-Quill/dev-match_phrase-#185-matchphra…

…se_revB Add support for `matchphrase` as long as `match_phrase` (rev. B)
Bit-Quill · May 12, 2022 · ff6ae57 · ff6ae57
2 parents 0006dd3 + 9dd6663
commit ff6ae57
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 5 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java b/core/src/main/java/org/opensearch/sql/expression/function/BuiltinFunctionName.java
@@ -188,6 +188,7 @@ public enum BuiltinFunctionName {
    */
   MATCH(FunctionName.of("match")),
   MATCH_PHRASE(FunctionName.of("match_phrase")),
+  MATCHPHRASE(FunctionName.of("matchphrase")),
 
   /**
    * Legacy Relevance Function.

diff --git a/core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java b/core/src/main/java/org/opensearch/sql/expression/function/OpenSearchFunctions.java
@@ -28,18 +28,24 @@ public class OpenSearchFunctions {
   public static final int MATCH_PHRASE_MAX_NUM_PARAMETERS = 3;
   public static final int MIN_NUM_PARAMETERS = 2;
 
+  /**
+   * Add functions specific to OpenSearch to repository.
+   */
   public void register(BuiltinFunctionRepository repository) {
     repository.register(match());
-    repository.register(match_phrase());
+    // Register MATCHPHRASE as MATCH_PHRASE as well for backwards
+    // compatibility.
+    repository.register(match_phrase(BuiltinFunctionName.MATCH_PHRASE));
+    repository.register(match_phrase(BuiltinFunctionName.MATCHPHRASE));
   }
 
   private static FunctionResolver match() {
     FunctionName funcName = BuiltinFunctionName.MATCH.getName();
     return getRelevanceFunctionResolver(funcName, MATCH_MAX_NUM_PARAMETERS);
   }
 
-  private static FunctionResolver match_phrase() {
-    FunctionName funcName = BuiltinFunctionName.MATCH_PHRASE.getName();
+  private static FunctionResolver match_phrase(BuiltinFunctionName matchPhrase) {
+    FunctionName funcName = matchPhrase.getName();
     return getRelevanceFunctionResolver(funcName, MATCH_PHRASE_MAX_NUM_PARAMETERS);
   }
 

diff --git a/docs/user/dql/functions.rst b/docs/user/dql/functions.rst
@@ -2209,6 +2209,8 @@ The match_phrase function maps to the match_phrase query used in search engine,
 - slop
 - zero_terms_query
 
+For backward compatibility, matchphrase is also supported and mapped to match_phrase query as well.
+
 Example with only ``field`` and ``query`` expressions, and all other parameters are set default values::
 
     os> SELECT author, title FROM books WHERE match_phrase(author, 'Alexander Milne');

diff --git a/docs/user/ppl/functions/relevance.rst b/docs/user/ppl/functions/relevance.rst
@@ -70,6 +70,8 @@ The match_phrase function maps to the match_phrase query used in search engine,
 - slop
 - zero_terms_query
 
+For backward compatibility, matchphrase is also supported and mapped to match_phrase query as well.
+
 Example with only ``field`` and ``query`` expressions, and all other parameters are set default values::
 
     os> source=books | where match_phrase(author, 'Alexander Milne') | fields author, title

diff --git a/...src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java b/...src/main/java/org/opensearch/sql/opensearch/storage/script/filter/FilterQueryBuilder.java
@@ -54,6 +54,7 @@ public class FilterQueryBuilder extends ExpressionNodeVisitor<QueryBuilder, Obje
           .put(BuiltinFunctionName.LIKE.getName(), new WildcardQuery())
           .put(BuiltinFunctionName.MATCH.getName(), new MatchQuery())
           .put(BuiltinFunctionName.MATCH_PHRASE.getName(), new MatchPhraseQuery())
+          .put(BuiltinFunctionName.MATCHPHRASE.getName(), new MatchPhraseQuery())
           .put(BuiltinFunctionName.QUERY.getName(), new MatchQuery())
           .put(BuiltinFunctionName.MATCH_QUERY.getName(), new MatchQuery())
           .put(BuiltinFunctionName.MATCHQUERY.getName(), new MatchQuery())

diff --git a/ppl/src/main/antlr/OpenSearchPPLParser.g4 b/ppl/src/main/antlr/OpenSearchPPLParser.g4
@@ -171,7 +171,7 @@ statsFunctionName
     ;
 
 percentileAggFunction
-    : PERCENTILE '<' value=integerLiteral '>' LT_PRTHS aggField=fieldExpression RT_PRTHS
+    : PERCENTILE LESS value=integerLiteral GREATER LT_PRTHS aggField=fieldExpression RT_PRTHS
     ;
 
 /** expressions */

diff --git a/sql/src/main/antlr/OpenSearchSQLParser.g4 b/sql/src/main/antlr/OpenSearchSQLParser.g4
@@ -383,7 +383,7 @@ flowControlFunctionName
     ;
 
 relevanceFunctionName
-    : MATCH | MATCH_PHRASE
+    : MATCH | MATCH_PHRASE | MATCHPHRASE
     ;
 
 legacyRelevanceFunctionName