pushdown match when only one equal in search command

Signed-off-by: xinyual <xinyual@amazon.com>

Author: xinyual

core/src/main/java/org/opensearch/sql/ast/expression/SearchComparison.java

@@ -5,12 +5,15 @@
 
 package org.opensearch.sql.ast.expression;
 
+import static org.opensearch.sql.ast.expression.SearchComparison.Operator.EQUALS;
+
 import java.util.Arrays;
 import java.util.List;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.ToString;
+import org.opensearch.sql.ast.dsl.AstDSL;
 import org.opensearch.sql.utils.QueryStringUtils;
 
 /** Search expression for field comparisons. */
@@ -63,6 +66,23 @@ public String toQueryString() {
     }
   }
 
+  @Override
+  public Function toDSLFunction() {
+    String fieldName = QueryStringUtils.escapeFieldName(field.getField().toString());
+    String valueStr = value.toQueryString();
+    switch (operator) {
+      case EQUALS:
+        return AstDSL.function(
+            "match",
+            AstDSL.unresolvedArg("field_name", AstDSL.qualifiedName(fieldName)),
+            AstDSL.unresolvedArg("value", AstDSL.stringLiteral(valueStr)));
+      default:
+        return AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg("query", AstDSL.stringLiteral(this.toQueryString())));
+    }
+  }
+
   @Override
   public String toAnonymizedString() {
     return "identifier " + operator.symbol + " ***";

core/src/main/java/org/opensearch/sql/ast/expression/SearchExpression.java

@@ -6,6 +6,7 @@
 package org.opensearch.sql.ast.expression;
 
 import org.opensearch.sql.ast.AbstractNodeVisitor;
+import org.opensearch.sql.ast.dsl.AstDSL;
 
 /** Base class for search expressions that get converted to query_string syntax. */
 public abstract class SearchExpression extends UnresolvedExpression {
@@ -17,6 +18,14 @@ public abstract class SearchExpression extends UnresolvedExpression {
    */
   public abstract String toQueryString();
 
+  public Function toDSLFunction() {
+    Function queryStringFunc =
+        AstDSL.function(
+            "query_string",
+            AstDSL.unresolvedArg("query", AstDSL.stringLiteral(this.toQueryString())));
+    return queryStringFunc;
+  }
+
   /**
    * Convert the search expression to anonymized string
    *

core/src/main/java/org/opensearch/sql/calcite/CalciteRelNodeVisitor.java

@@ -210,10 +210,7 @@ public RelNode visitSearch(Search node, CalcitePlanContext context) {
     // Visit the Relation child to get the scan
     node.getChild().get(0).accept(this, context);
     // Create query_string function
-    Function queryStringFunc =
-        AstDSL.function(
-            "query_string",
-            AstDSL.unresolvedArg("query", AstDSL.stringLiteral(node.getQueryString())));
+    Function queryStringFunc = node.getOriginalExpression().toDSLFunction();
     RexNode queryStringRex = rexVisitor.analyze(queryStringFunc, context);
 
     context.relBuilder.filter(queryStringRex);

integ-test/src/test/java/org/opensearch/sql/calcite/remote/CalciteExplainIT.java

@@ -78,6 +78,15 @@ public void supportSearchSargPushDown_timeRange() throws IOException {
     assertYamlEqualsIgnoreId(expected, result);
   }
 
+  @Test
+  public void supportSearchMatchPushDown() throws IOException {
+    String query =
+        "source=opensearch-sql_test_index_bank birthdate = '2016-12-08 00:00:00.000000000'";
+    var result = explainQueryToString(query);
+    String expected = loadExpectedPlan("explain_search_with_match_pushdown.json");
+    assertJsonEqualsIgnoreId(expected, result);
+  }
+
   // Only for Calcite
   @Ignore("https://github.com/opensearch-project/OpenSearch/issues/3725")
   public void testJoinWithCriteriaAndMaxOption() throws IOException {

integ-test/src/test/java/org/opensearch/sql/calcite/standalone/CalcitePPLDateTimeBuiltinFunctionIT.java

@@ -49,15 +49,6 @@ public void init() throws IOException {
     initRelativeDocs();
   }
 
-  @Test
-  public void test() {
-    JSONObject actual =
-            executeQuery(
-                    String.format(
-                            "source=%s age=2",
-                            TEST_INDEX_BANK));
-  }
-
   private static String getFormattedLocalDate() {
     return LocalDateTime.now(ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
   }

integ-test/src/test/resources/expectedOutput/calcite/explain_search_with_match_pushdown.json

@@ -0,0 +1,6 @@
+{
+  "calcite":{
+    "logical":"LogicalSystemLimit(fetch=[10000], type=[QUERY_SIZE_LIMIT])\n  LogicalProject(account_number=[$0], firstname=[$1], address=[$2], birthdate=[$3], gender=[$4], city=[$5], lastname=[$6], balance=[$7], employer=[$8], state=[$9], age=[$10], email=[$11], male=[$12])\n    LogicalFilter(condition=[match(MAP('field_name', $3), MAP('value', '\"2016\\-12\\-08 00\\:00\\:00.000000000\"':VARCHAR))])\n      CalciteLogicalIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]])\n",
+    "physical":"CalciteEnumerableIndexScan(table=[[OpenSearch, opensearch-sql_test_index_bank]], PushDownContext=[[PROJECT->[account_number, firstname, address, birthdate, gender, city, lastname, balance, employer, state, age, email, male], FILTER->match(MAP('field_name', $3), MAP('value', '\"2016\\-12\\-08 00\\:00\\:00.000000000\"':VARCHAR)), LIMIT->10000], OpenSearchRequestBuilder(sourceBuilder={\"from\":0,\"size\":10000,\"timeout\":\"1m\",\"query\":{\"match\":{\"birthdate\":{\"query\":\"\\\"2016\\\\-12\\\\-08 00\\\\:00\\\\:00.000000000\\\"\",\"operator\":\"OR\",\"prefix_length\":0,\"max_expansions\":50,\"fuzzy_transpositions\":true,\"lenient\":false,\"zero_terms_query\":\"NONE\",\"auto_generate_synonyms_phrase_query\":true,\"boost\":1.0}}},\"_source\":{\"includes\":[\"account_number\",\"firstname\",\"address\",\"birthdate\",\"gender\",\"city\",\"lastname\",\"balance\",\"employer\",\"state\",\"age\",\"email\",\"male\"],\"excludes\":[]}}, requestedTotalSize=10000, pageSize=null, startFrom=0)])\n"
+  }
+}

ppl/src/main/java/org/opensearch/sql/ppl/utils/PPLQueryDataAnonymizer.java

@@ -41,7 +41,6 @@
 import org.opensearch.sql.ast.expression.Not;
 import org.opensearch.sql.ast.expression.Or;
 import org.opensearch.sql.ast.expression.ParseMethod;
-import org.opensearch.sql.ast.expression.SearchExpression;
 import org.opensearch.sql.ast.expression.Span;
 import org.opensearch.sql.ast.expression.UnresolvedExpression;
 import org.opensearch.sql.ast.expression.When;
@@ -251,10 +250,10 @@ public String visitTableFunction(TableFunction node, String context) {
   @Override
   public String visitSearch(Search node, String context) {
     String source = node.getChild().get(0).accept(this, context);
-    //SearchExpression expression = node.getOriginalExpression();
+    // SearchExpression expression = node.getOriginalExpression();
 
-    //String queryString = node.getQueryString();
-    //String anonymized = queryString.replaceAll(":\\S+", ":" + MASK_LITERAL);
+    // String queryString = node.getQueryString();
+    // String anonymized = queryString.replaceAll(":\\S+", ":" + MASK_LITERAL);
     return StringUtils.format("%s %s", source, node.getOriginalExpression().toAnonymizedString());
   }