feat: sql (#583)

traas-stack · Aug 3, 2023 · f928ead · f928ead
1 parent 0d17138
commit f928ead
Show file tree

Hide file tree

Showing 6 changed files with 465 additions and 201 deletions.
diff --git a/...mon/common-service/src/main/java/io/holoinsight/server/common/model/DataQueryRequest.java b/...mon/common-service/src/main/java/io/holoinsight/server/common/model/DataQueryRequest.java
@@ -54,6 +54,7 @@ public static class QueryDataSource {
     // whether the APM metrics is obtained by materializing them to the metric storage in advance
     // instead of post-calculation
     public boolean apmMaterialized;
+    public String ql;
   }
 
   @Data

diff --git a/...eresdbx/src/main/java/io/holoinsight/server/extension/ceresdbx/CeresdbxMetricStorage.java b/...eresdbx/src/main/java/io/holoinsight/server/extension/ceresdbx/CeresdbxMetricStorage.java
@@ -16,6 +16,8 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import io.ceresdb.common.parser.SqlParser;
+import io.ceresdb.common.parser.SqlParserFactoryProvider;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -104,16 +106,28 @@ public Mono<Void> write(WriteMetricsParam writeMetricsParam) {
 
   @Override
   public List<Result> queryData(QueryParam queryParam) {
-    String whereStatement = parseWhere(queryParam);
-    String fromStatement = parseFrom(queryParam);
-    if (StringUtils.isBlank(fromStatement)) {
-      LOGGER.warn("fromStatement is empty, queryParam:{}", queryParam);
-      return Lists.newArrayList();
+    String sql = queryParam.getQl();
+    String[] tableNames;
+    if (StringUtils.isNotBlank(sql)) {
+      SqlParser parser = SqlParserFactoryProvider.getSqlParserFactory().getParser(sql);
+      List<String> tables = parser.tableNames();
+      tableNames = tables.stream().map(this::fixName).collect(Collectors.toList())
+          .toArray(new String[tables.size()]);
+      sql = StringUtils.replaceEach(sql, tables.toArray(new String[tables.size()]), tableNames);
+    } else {
+      String whereStatement = parseWhere(queryParam);
+      String fromStatement = parseFrom(queryParam);
+      if (StringUtils.isBlank(fromStatement)) {
+        LOGGER.warn("fromStatement is empty, queryParam:{}", queryParam);
+        return Lists.newArrayList();
+      }
+      tableNames = new String[] {fixName(queryParam.getMetric())};
+      sql = genSqlWithGroupBy(queryParam, fromStatement, whereStatement);
+
     }
-    String sql = genSqlWithGroupBy(queryParam, fromStatement, whereStatement);
     LOGGER.info("queryData queryparam:{}, sql:{}", queryParam, sql);
     final SqlQueryRequest queryRequest =
-        SqlQueryRequest.newBuilder().forTables(fixName(queryParam.getMetric())).sql(sql).build();
+        SqlQueryRequest.newBuilder().forTables(tableNames).sql(sql).build();
     long begin = System.currentTimeMillis();
     try {
       CompletableFuture<io.ceresdb.models.Result<SqlQueryOk, Err>> qf = Context.ROOT.call(

diff --git a/...ion/extension-storage/src/main/java/io/holoinsight/server/extension/model/QueryParam.java b/...ion/extension-storage/src/main/java/io/holoinsight/server/extension/model/QueryParam.java
@@ -22,6 +22,7 @@ public class QueryParam {
   String downsample;
   SlidingWindow slidingWindow;
   List<String> groupBy;
+  String ql;
 
   @Data
   public static class SlidingWindow {