Merge branch 'main' into sort-expression-pushdown

Author: songkant-aws

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/analysis/Analyzer.java

@@ -61,6 +61,7 @@
 import org.opensearch.sql.ast.tree.Append;
 import org.opensearch.sql.ast.tree.AppendCol;
 import org.opensearch.sql.ast.tree.Bin;
+import org.opensearch.sql.ast.tree.Chart;
 import org.opensearch.sql.ast.tree.CloseCursor;
 import org.opensearch.sql.ast.tree.Dedupe;
 import org.opensearch.sql.ast.tree.Eval;
@@ -769,6 +770,11 @@ public LogicalPlan visitSpath(SPath node, AnalysisContext context) {
     throw getOnlyForCalciteException("Spath");
   }
 
+  @Override
+  public LogicalPlan visitChart(Chart node, AnalysisContext context) {
+    throw getOnlyForCalciteException("Chart");
+  }
+
   @Override
   public LogicalPlan visitTimechart(Timechart node, AnalysisContext context) {
     throw getOnlyForCalciteException("Timechart");

core/src/main/java/org/opensearch/sql/ast/AbstractNodeVisitor.java

@@ -49,6 +49,7 @@
 import org.opensearch.sql.ast.tree.Append;
 import org.opensearch.sql.ast.tree.AppendCol;
 import org.opensearch.sql.ast.tree.Bin;
+import org.opensearch.sql.ast.tree.Chart;
 import org.opensearch.sql.ast.tree.CloseCursor;
 import org.opensearch.sql.ast.tree.Dedupe;
 import org.opensearch.sql.ast.tree.Eval;
@@ -275,6 +276,10 @@ public T visitReverse(Reverse node, C context) {
     return visitChildren(node, context);
   }
 
+  public T visitChart(Chart node, C context) {
+    return visitChildren(node, context);
+  }
+
   public T visitTimechart(Timechart node, C context) {
     return visitChildren(node, context);
   }