[warehouse] bugfix monitoring metric instances are displayed as NULL …

…when no instance (#615)
apache · Feb 3, 2023 · 1bfd670 · 1bfd670
1 parent 68872ee
commit 1bfd670
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java b/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java
@@ -264,7 +264,7 @@ public Map<String, List<Value>> getHistoryMetricData(Long monitorId, String app,
                 Timestamp ts = resultSet.getTimestamp(1);
                 String instanceValue = resultSet.getString(2);
                 if (instanceValue == null || "".equals(instanceValue)) {
-                    instanceValue = "NULL";
+                    instanceValue = "";
                 }
                 double value = resultSet.getDouble(3);
                 String strValue = new BigDecimal(value).setScale(4, RoundingMode.HALF_UP).stripTrailingZeros().toPlainString();
@@ -338,7 +338,7 @@ public Map<String, List<Value>> getHistoryIntervalMetricData(Long monitorId, Str
                             metric, metric, metric, metric, table, instanceValue, history);
             log.debug(selectSql);
             if ("''".equals(instanceValue)) {
-                instanceValue = "NULL";
+                instanceValue = "";
             }
             List<Value> values = instanceValuesMap.computeIfAbsent(instanceValue, k -> new LinkedList<>());
             Connection connection = null;