Merge branch 'opensearch-project:main' into main

Author: srikanthpadakanti

async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_cv1_index.json

@@ -30,7 +30,7 @@
         "number_of_replicas": 0,
         "max_result_window": 100,
         "version": {
-          "created": "6050399"
+          "created": "137217827"
         }
       }
     },

async-query/src/test/resources/flint-index-mappings/flint_mys3_default_http_logs_skipping_index.json

@@ -39,7 +39,7 @@
         "number_of_replicas": 0,
         "max_result_window": 100,
         "version": {
-          "created": "6050399"
+          "created": "137217827"
         }
       }
     },

async-query/src/test/resources/flint-index-mappings/npe_mapping.json

@@ -24,7 +24,7 @@
         "number_of_replicas": 0,
         "max_result_window": 100,
         "version": {
-          "created": "6050399"
+          "created": "137217827"
         }
       }
     },

common/src/main/java/org/opensearch/sql/common/grok/GrokCompiler.java

@@ -185,7 +185,6 @@ public Grok compile(final String pattern, ZoneId defaultTimeZone, boolean namedO
               (group.get("subname") != null ? group.get("subname") : group.get("name")));
           namedRegex =
               StringUtils.replace(namedRegex, "%{" + group.get("name") + "}", replacement, 1);
-          // System.out.println(_expanded_pattern);
           index++;
         }
       }

common/src/test/java/org/opensearch/sql/common/grok/ApacheDataTypeTest.java

@@ -49,7 +49,6 @@ public void test002_httpd_access_semi() throws GrokException {
                 + " HTTP/%{NUMBER:httpversion;float})?|%{DATA:rawrequest})\" %{NUMBER:response;int}"
                 + " (?:%{NUMBER:bytes;long}|-)");
 
-    System.out.println(line);
     Match gm = grok.match(line);
     Map<String, Object> map = gm.capture();
 

common/src/test/java/org/opensearch/sql/common/grok/ApacheTest.java

@@ -38,7 +38,6 @@ public void test001_httpd_access() throws GrokException, IOException {
 
     BufferedReader br = new BufferedReader(new FileReader(LOG_FILE));
     String line;
-    System.out.println("Starting test with httpd log");
     while ((line = br.readLine()) != null) {
       Match gm = grok.match(line);
       final Map<String, Object> capture = gm.capture();
@@ -50,7 +49,6 @@ public void test001_httpd_access() throws GrokException, IOException {
   @Test
   public void test002_nasa_httpd_access() throws GrokException, IOException {
     Grok grok = compiler.compile("%{COMMONAPACHELOG}");
-    System.out.println("Starting test with nasa log -- may take a while");
     BufferedReader br;
     String line;
     File dir = new File(LOG_DIR_NASA);

common/src/test/java/org/opensearch/sql/common/grok/GrokTest.java

@@ -317,7 +317,6 @@ public void test013_IpSet() throws Throwable {
     try (FileReader fr = new FileReader(Resources.getResource(ResourceManager.IP).getFile());
         BufferedReader br = new BufferedReader(fr)) {
       String line;
-      System.out.println("Starting test with ip");
       while ((line = br.readLine()) != null) {
         Match gm = grok.match(line);
         final Map<String, Object> map = gm.capture();

common/src/test/java/org/opensearch/sql/common/grok/MessagesTest.java

@@ -29,7 +29,6 @@ public void test001_linux_messages() throws GrokException, IOException {
         new BufferedReader(
             new FileReader(Resources.getResource(ResourceManager.MESSAGES).getFile()));
     String line;
-    System.out.println("Starting test with linux messages log -- may take a while");
     while ((line = br.readLine()) != null) {
       Match gm = grok.match(line);
       Map<String, Object> map = gm.capture();

core/src/main/java/org/opensearch/sql/calcite/utils/PPLOperandTypes.java

@@ -112,6 +112,12 @@ private PPLOperandTypes() {}
               SqlTypeFamily.INTEGER,
               SqlTypeFamily.INTEGER));
 
+  public static final UDFOperandMetadata NUMERIC_STRING_OR_STRING_STRING =
+      UDFOperandMetadata.wrap(
+          (CompositeOperandTypeChecker)
+              (OperandTypes.family(SqlTypeFamily.NUMERIC, SqlTypeFamily.STRING))
+                  .or(OperandTypes.family(SqlTypeFamily.STRING, SqlTypeFamily.STRING)));
+
   public static final UDFOperandMetadata NUMERIC_NUMERIC_OPTIONAL_NUMERIC =
       UDFOperandMetadata.wrap(
           (CompositeOperandTypeChecker)

core/src/main/java/org/opensearch/sql/expression/function/PPLBuiltinOperators.java

@@ -67,6 +67,7 @@
 import org.opensearch.sql.expression.function.udf.RexExtractMultiFunction;
 import org.opensearch.sql.expression.function.udf.RexOffsetFunction;
 import org.opensearch.sql.expression.function.udf.SpanFunction;
+import org.opensearch.sql.expression.function.udf.ToStringFunction;
 import org.opensearch.sql.expression.function.udf.condition.EarliestFunction;
 import org.opensearch.sql.expression.function.udf.condition.EnhancedCoalesceFunction;
 import org.opensearch.sql.expression.function.udf.condition.LatestFunction;
@@ -411,6 +412,7 @@ public class PPLBuiltinOperators extends ReflectiveSqlOperatorTable {
       RELEVANCE_QUERY_FUNCTION_INSTANCE.toUDF("multi_match", false);
   public static final SqlOperator NUMBER_TO_STRING =
       new NumberToStringFunction().toUDF("NUMBER_TO_STRING");
+  public static final SqlOperator TOSTRING = new ToStringFunction().toUDF("TOSTRING");
   public static final SqlOperator WIDTH_BUCKET =
       new org.opensearch.sql.expression.function.udf.binning.WidthBucketFunction()
           .toUDF("WIDTH_BUCKET");