ql facade

traas-stack · Aug 10, 2023 · a54e336 · a54e336
1 parent 77704b0
commit a54e336
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
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
@@ -289,7 +289,7 @@ private Map<Map<String, String>, Result> getTagsWithResults(QueryParam queryPara
         if ("tsid".equals(name)) {
           continue;
         }
-        if ("timestamp".equals(name)) {
+        if ("timestamp".equals(name) || value.getDataType() == Value.DataType.Timestamp) {
           point.setTimestamp(value.getTimestamp());
           continue;
         }

diff --git a/...ome/home-web/src/main/java/io/holoinsight/server/home/web/controller/QueryFacadeImpl.java b/...ome/home-web/src/main/java/io/holoinsight/server/home/web/controller/QueryFacadeImpl.java
@@ -485,7 +485,9 @@ public QueryProto.QueryRequest convertRequest(DataQueryRequest request) {
       }
 
       QueryProto.Datasource.Builder datasourceBuilder = QueryProto.Datasource.newBuilder();
-      toProtoBean(datasourceBuilder, d);
+      Map<String, Object> objMap = J.toMap(J.toJson(d));
+      objMap.remove("select");
+      toProtoBean(datasourceBuilder, objMap);
       Boolean aBoolean = tenantInitService.checkConditions(ms.getTenant(), ms.getWorkspace(),
           datasourceBuilder.getMetric(), datasourceBuilder.getFiltersList());
       if (!aBoolean) {
@@ -515,10 +517,11 @@ protected void parseQl(QueryDataSource d, MetricInfo metricInfo) {
         if (StringUtils.isEmpty(expression)) {
           selects.add("`" + columnName + "`");
         } else {
-          selects.add(expression + " as " + "`" + columnName + "`");
+          selects.add(expression + " as " + columnName);
         }
       }
     }
+    selects.add("`period`");
     select.append(String.join(" , ", selects));
     select.append(" from ").append(d.metric);
     select.append(" where `period` <= ") //
@@ -562,22 +565,20 @@ protected void parseQl(QueryDataSource d, MetricInfo metricInfo) {
         }
       }
     }
+    List<String> gbList = new ArrayList<>();
+    gbList.add("period");
     if (!CollectionUtils.isEmpty(d.groupBy)) {
-      List<String> gbList = new ArrayList<>();
       for (String gb : d.groupBy) {
         if (!tags.contains(gb)) {
           continue;
         }
         gbList.add(gb);
       }
-      if (!CollectionUtils.isEmpty(gbList)) {
-        select.append(" group by `")//
-            .append(String.join("` , `", gbList)) //
-            .append("`");
-      }
-
     }
-    select.append(" order by `period` acs");
+    select.append(" group by `")//
+        .append(String.join("` , `", gbList)) //
+        .append("`");
+    select.append(" order by `period` asc");
     log.info("parse sql {}", select);
     d.setQl(select.toString());
   }