Support param useother and otherstr

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

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

@@ -1987,6 +1987,10 @@ public RelNode visitChart(Chart node, CalcitePlanContext context) {
         Optional.ofNullable(argMap.get("limit")).map(l -> (Integer) l.getValue()).orElse(10);
     Boolean top =
         Optional.ofNullable(argMap.get("top")).map(t -> (Boolean) t.getValue()).orElse(true);
+    Boolean useOther =
+        Optional.ofNullable(argMap.get("useother")).map(u -> (Boolean) u.getValue()).orElse(true);
+    String otherStr =
+        Optional.ofNullable(argMap.get("otherstr")).map(o -> (String) o.getValue()).orElse("OTHER");
     if (node.getRowSplit() == null || node.getColumnSplit() == null || Objects.equals(limit, 0)) {
       return aggregated.getLeft();
     }
@@ -2022,18 +2026,29 @@ public RelNode visitChart(Chart node, CalcitePlanContext context) {
     // on column-split = group key
     relBuilder.join(
         JoinRelType.INNER, relBuilder.equals(relBuilder.field(2, 0, 2), relBuilder.field(2, 1, 0)));
-    RexNode caseExpr =
-        relBuilder.alias(
-            relBuilder.call(
-                SqlStdOperatorTable.CASE,
-                relBuilder.call(
-                    SqlStdOperatorTable.LESS_THAN_OR_EQUAL,
-                    relBuilder.field("__row_number__"),
-                    relBuilder.literal(limit)),
-                relBuilder.field(2),
-                relBuilder.literal("OTHER")),
-            columSplitName);
-    relBuilder.project(relBuilder.field(0), relBuilder.field(1), caseExpr);
+
+    RexNode condition =
+        relBuilder.call(
+            SqlStdOperatorTable.LESS_THAN_OR_EQUAL,
+            relBuilder.field("__row_number__"),
+            relBuilder.literal(limit));
+    RexNode columnSplitExpr;
+    if (useOther) {
+      columnSplitExpr =
+          relBuilder.call(
+              SqlStdOperatorTable.CASE,
+              condition,
+              relBuilder.field(2),
+              relBuilder.literal(otherStr));
+    } else {
+      relBuilder.filter(condition);
+      columnSplitExpr = relBuilder.field(2);
+    }
+
+    relBuilder.project(
+        relBuilder.field(0),
+        relBuilder.field(1),
+        relBuilder.alias(columnSplitExpr, columSplitName));
     return relBuilder.peek();
   }
 

ppl/src/main/antlr/OpenSearchPPLLexer.g4

@@ -134,6 +134,7 @@ COUNTFIELD:                         'COUNTFIELD';
 SHOWCOUNT:                          'SHOWCOUNT';
 LIMIT:                              'LIMIT';
 USEOTHER:                           'USEOTHER';
+OTHERSTR:                           'OTHERSTR';
 INPUT:                              'INPUT';
 OUTPUT:                             'OUTPUT';
 PATH:                               'PATH';

ppl/src/main/antlr/OpenSearchPPLParser.g4

@@ -257,6 +257,7 @@ chartCommand
 chartOptions
   : LIMIT EQUAL (TOP | BOTTOM)? integerLiteral
   | USEOTHER EQUAL booleanLiteral
+  | OTHERSTR EQUAL stringLiteral
   ;
 
 rowSplit

ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java

@@ -492,7 +492,7 @@ public UnresolvedPlan visitBinCommand(BinCommandContext ctx) {
       }
       // BINS parameter
       if (option.bins != null) {
-        checkParamDuplication(seenParams, option.SPAN(), errorFormat);
+        checkParamDuplication(seenParams, option.BINS(), errorFormat);
         bins = (Integer) ((Literal) resolvedOption).getValue();
       }
       // MINSPAN parameter

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

@@ -157,6 +157,8 @@ public static List<Argument> getArgumentList(ChartCommandContext ctx) {
         arguments.add(new Argument("top", AstDSL.booleanLiteral(optionCtx.BOTTOM() == null)));
       } else if (optionCtx.USEOTHER() != null) {
         arguments.add(new Argument("useother", getArgumentValue(optionCtx.booleanLiteral())));
+      } else if (optionCtx.OTHERSTR() != null) {
+        arguments.add(new Argument("otherstr", getArgumentValue(optionCtx.stringLiteral())));
       }
     }
     return arguments;