Remove backticks on by field in stats (#1728) (#1751)

Signed-off-by: Joshua Li <[email protected]> (cherry picked from commit 7525bb1) Co-authored-by: Joshua Li <[email protected]>
opensearch-project · Jun 26, 2023 · 6532a10 · 6532a10
1 parent 1583605
commit 6532a10
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 8 deletions.
diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/PrometheusDataSourceCommandsIT.java
@@ -113,8 +113,8 @@ public void testMetricAvgAggregationCommand() {
     verifySchema(response,
         schema("agg",  "double"),
         schema("span(@timestamp,15s)", "timestamp"),
-        schema("`handler`", "string"),
-        schema("`job`", "string"));
+        schema("handler", "string"),
+        schema("job", "string"));
     Assertions.assertTrue(response.getInt("size") > 0);
     Assertions.assertEquals(4, response.getJSONArray("datarows").getJSONArray(0).length());
     JSONArray firstRow = response.getJSONArray("datarows").getJSONArray(0);
@@ -132,7 +132,7 @@ public void testMetricAvgAggregationCommandWithAlias() {
     verifySchema(response,
         schema("agg",  "double"),
         schema("span(@timestamp,15s)", "timestamp"),
-        schema("`handler`", "string"),
+        schema("handler", "string"),
         schema("job", "string"));
     Assertions.assertTrue(response.getInt("size") > 0);
     Assertions.assertEquals(4, response.getJSONArray("datarows").getJSONArray(0).length());

diff --git a/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java b/ppl/src/main/java/org/opensearch/sql/ppl/parser/AstBuilder.java
@@ -201,7 +201,8 @@ public UnresolvedPlan visitStatsCommand(StatsCommandContext ctx) {
             .map(OpenSearchPPLParser.StatsByClauseContext::fieldList)
             .map(expr -> expr.fieldExpression().stream()
                 .map(groupCtx ->
-                    (UnresolvedExpression) new Alias(getTextInQuery(groupCtx),
+                    (UnresolvedExpression) new Alias(
+                        StringUtils.unquoteIdentifier(getTextInQuery(groupCtx)),
                         internalVisitExpression(groupCtx)))
                 .collect(Collectors.toList()))
             .orElse(Collections.emptyList());
@@ -429,10 +430,10 @@ public UnresolvedPlan visitAdCommand(AdCommandContext ctx) {
   public UnresolvedPlan visitMlCommand(OpenSearchPPLParser.MlCommandContext ctx) {
     ImmutableMap.Builder<String, Literal> builder = ImmutableMap.builder();
     ctx.mlArg()
-            .forEach(x -> {
-              builder.put(x.argName.getText(),
-                      (Literal) internalVisitExpression(x.argValue));
-            });
+        .forEach(x -> {
+          builder.put(x.argName.getText(),
+              (Literal) internalVisitExpression(x.argValue));
+        });
     return new ML(builder.build());
   }
 

diff --git a/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java b/ppl/src/test/java/org/opensearch/sql/ppl/parser/AstBuilderTest.java
@@ -282,6 +282,27 @@ public void testStatsCommandWithByClause() {
         ));
   }
 
+  @Test
+  public void testStatsCommandWithByClauseInBackticks() {
+    assertEqual("source=t | stats count(a) by `b` DEDUP_SPLITVALUES=false",
+        agg(
+            relation("t"),
+            exprList(
+                alias(
+                    "count(a)",
+                    aggregate("count", field("a"))
+                )
+            ),
+            emptyList(),
+            exprList(
+                alias(
+                    "b",
+                    field("b")
+                )),
+            defaultStatsArgs()
+        ));
+  }
+
   @Test
   public void testStatsCommandWithAlias() {
     assertEqual("source=t | stats count(a) as alias",