From 69bc60516002e45d70efd434be694b8f019777e1 Mon Sep 17 00:00:00 2001
From: zhouyoulin12 <zhouyoulin12@163.com>
Date: Wed, 15 Mar 2023 21:47:02 +0800
Subject: [PATCH] support tdengine3.0 and fix issues714 (#735)

* add test unit case by zhouyoulin

* add test unit case

* fix bug: 714, see link(https://github.com/dromara/hertzbeat/issues/714)

* fix bug: 714, see link(https://github.com/dromara/hertzbeat/issues/714)
---
 warehouse/pom.xml                                              | 2 +-
 .../com/usthe/warehouse/store/HistoryTdEngineDataStorage.java  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/warehouse/pom.xml b/warehouse/pom.xml
index 97d8b9948e2..6cfb6d5ab21 100644
--- a/warehouse/pom.xml
+++ b/warehouse/pom.xml
@@ -28,7 +28,7 @@
         <iotdb-session.version>0.13.3</iotdb-session.version>
         <kafka-clients.version>3.4.0</kafka-clients.version>
         <spring-cloud-starter-openfeign.version>3.0.5</spring-cloud-starter-openfeign.version>
-        <taos-jdbcdriver.version>2.0.42</taos-jdbcdriver.version>
+        <taos-jdbcdriver.version>3.0.0</taos-jdbcdriver.version>
     </properties>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java b/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java
index dc4f7a82aad..00d0d78c376 100644
--- a/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java
+++ b/warehouse/src/main/java/com/usthe/warehouse/store/HistoryTdEngineDataStorage.java
@@ -127,7 +127,8 @@ public void saveData(CollectRep.MetricsData metricsData) {
         for (CollectRep.ValueRow valueRow : metricsData.getValuesList()) {
             StringBuilder sqlRowBuffer = new StringBuilder("(");
             sqlRowBuffer.append(metricsData.getTime() + i++).append(", ");
-            sqlRowBuffer.append("'").append(valueRow.getInstance()).append("', ");
+            String instance = formatStringValue(valueRow.getInstance());
+            sqlRowBuffer.append("'").append(instance).append("', ");
             for (int index = 0; index < fields.size(); index++) {
                 CollectRep.Field field = fields.get(index);
                 String value = valueRow.getColumns(index);