Remove Timechart AST object in favor of Chart

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

Author: yuancu

core/src/main/java/org/opensearch/sql/analysis/Analyzer.java

@@ -96,7 +96,6 @@
 import org.opensearch.sql.ast.tree.StreamWindow;
 import org.opensearch.sql.ast.tree.SubqueryAlias;
 import org.opensearch.sql.ast.tree.TableFunction;
-import org.opensearch.sql.ast.tree.Timechart;
 import org.opensearch.sql.ast.tree.Trendline;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.ast.tree.Values;
@@ -775,11 +774,6 @@ public LogicalPlan visitChart(Chart node, AnalysisContext context) {
     throw getOnlyForCalciteException("Chart");
   }
 
-  @Override
-  public LogicalPlan visitTimechart(Timechart node, AnalysisContext context) {
-    throw getOnlyForCalciteException("Timechart");
-  }
-
   @Override
   public LogicalPlan visitWindow(Window node, AnalysisContext context) {
     throw getOnlyForCalciteException("Window");

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

@@ -83,7 +83,6 @@
 import org.opensearch.sql.ast.tree.StreamWindow;
 import org.opensearch.sql.ast.tree.SubqueryAlias;
 import org.opensearch.sql.ast.tree.TableFunction;
-import org.opensearch.sql.ast.tree.Timechart;
 import org.opensearch.sql.ast.tree.Trendline;
 import org.opensearch.sql.ast.tree.Values;
 import org.opensearch.sql.ast.tree.Window;
@@ -280,10 +279,6 @@ public T visitChart(Chart node, C context) {
     return visitChildren(node, context);
   }
 
-  public T visitTimechart(Timechart node, C context) {
-    return visitChildren(node, context);
-  }
-
   public T visitRegex(Regex node, C context) {
     return visitChildren(node, context);
   }

core/src/main/java/org/opensearch/sql/ast/tree/Timechart.java

@@ -480,8 +480,8 @@ integTest {
 
     dependsOn ':opensearch-sql-plugin:bundlePlugin'
     if(!ignorePrometheus && getOSFamilyType() != "windows") {
-//        dependsOn startPrometheus
-//        finalizedBy stopPrometheus
+        dependsOn startPrometheus
+        finalizedBy stopPrometheus
     }
 
     // enable calcite codegen in IT

integ-test/build.gradle

@@ -89,7 +89,6 @@
 import org.opensearch.sql.ast.tree.StreamWindow;
 import org.opensearch.sql.ast.tree.SubqueryAlias;
 import org.opensearch.sql.ast.tree.TableFunction;
-import org.opensearch.sql.ast.tree.Timechart;
 import org.opensearch.sql.ast.tree.Trendline;
 import org.opensearch.sql.ast.tree.UnresolvedPlan;
 import org.opensearch.sql.ast.tree.Values;
@@ -500,38 +499,6 @@ public String visitReverse(Reverse node, String context) {
     return StringUtils.format("%s | reverse", child);
   }
 
-  @Override
-  public String visitTimechart(Timechart node, String context) {
-    String child = node.getChild().get(0).accept(this, context);
-    StringBuilder timechartCommand = new StringBuilder();
-    timechartCommand.append(" | timechart");
-
-    // Add span if present
-    if (node.getBinExpression() != null) {
-      timechartCommand.append(" span=").append(visitExpression(node.getBinExpression()));
-    }
-
-    // Add limit if present
-    if (node.getLimit() != null) {
-      timechartCommand.append(" limit=").append(node.getLimit());
-    }
-
-    // Add useother if present
-    if (node.getUseOther() != null) {
-      timechartCommand.append(" useother=").append(node.getUseOther());
-    }
-
-    // Add aggregation function
-    timechartCommand.append(" ").append(visitExpression(node.getAggregateFunction()));
-
-    // Add by clause if present
-    if (node.getByField() != null) {
-      timechartCommand.append(" by ").append(visitExpression(node.getByField()));
-    }
-
-    return StringUtils.format("%s%s", child, timechartCommand.toString());
-  }
-
   @Override
   public String visitChart(Chart node, String context) {
     String child = node.getChild().get(0).accept(this, context);