Allow flexible parameter positions for chart and timechart

Signed-off-by: Yuanchun Shen <[email protected]>

Author: yuancu

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

@@ -169,8 +169,8 @@ public void testChartLimit0WithUseOther() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | chart limit=0 useother=true otherstr='max_among_other'"
-                    + " max(severityNumber) over flags by severityText",
+                "source=%s | chart max(severityNumber) over flags by severityText limit=0"
+                    + " useother=true otherstr='max_among_other'",
                 TEST_INDEX_OTEL_LOGS));
     verifySchema(
         result,
@@ -250,7 +250,8 @@ public void testChartLimitTopWithMinAgg() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | chart limit=top2 min(severityNumber) over flags by severityText",
+                "source=%s | chart limit=top2 min(severityNumber) over flags by severityText"
+                    + " useother=true otherstr='OTHER'",
                 TEST_INDEX_OTEL_LOGS));
     verifySchema(
         result,
@@ -306,8 +307,8 @@ public void testChartUseNullFalseWithNullStr() throws IOException {
     JSONObject result =
         executeQuery(
             String.format(
-                "source=%s | chart usenull=false nullstr='not_shown' count() over gender by age"
-                    + " span=10",
+                "source=%s | chart usenull=false count() over gender by age "
+                    + " span=10 nullstr='not_shown'",
                 TEST_INDEX_BANK_WITH_NULL_VALUES));
     verifySchema(
         result, schema("gender", "string"), schema("age", "string"), schema("count()", "bigint"));

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

@@ -361,7 +361,7 @@ public void testTimechartWithMissingHostValues() throws IOException {
   @Test
   public void testTimechartWithNullAndOther() throws IOException {
     JSONObject result =
-        executeQuery("source=events_null | timechart span=1d limit=2 count() by host");
+        executeQuery("source=events_null | timechart count() by host span=1d limit=2");
 
     verifySchema(
         result,
@@ -380,7 +380,7 @@ public void testTimechartWithNullAndOther() throws IOException {
   @Test
   public void testTimechartWithNullAndLimit() throws IOException {
     JSONObject result =
-        executeQuery("source=events_null | timechart span=1d limit=3 count() by host");
+        executeQuery("source=events_null | timechart span=1d count() by host limit=3");
 
     verifySchema(
         result,

ppl/src/main/antlr/OpenSearchPPLParser.g4

@@ -289,8 +289,8 @@ reverseCommand
    ;
 
 chartCommand
-  : CHART chartOptions* statsAggTerm (OVER rowSplit)? (BY columnSplit)?
-  | CHART chartOptions* statsAggTerm BY rowSplit (COMMA)? columnSplit
+  : CHART chartOptions* statsAggTerm (OVER rowSplit)? (BY columnSplit)? chartOptions*
+  | CHART chartOptions* statsAggTerm BY rowSplit (COMMA)? columnSplit chartOptions*
   ;
 
 chartOptions
@@ -311,7 +311,7 @@ columnSplit
   ;
 
 timechartCommand
-   : TIMECHART timechartParameter* statsAggTerm (BY fieldExpression)?
+   : TIMECHART timechartParameter* statsAggTerm (BY fieldExpression)? timechartParameter*
    ;
 
 timechartParameter