wyl/hertzbeat
1
0
Fork 0
mirror of https://github.com/dromara/hertzbeat.git synced 2026-09-17 09:40:58 +00:00
Code Issues Projects Releases Wiki Activity

[fix]fixed sql formatting error (#4008)

Browse Source 
Co-authored-by: Tomsun28 <tomsun28@outlook.com>
This commit is contained in:
Duansg
2026-01-30 00:00:31 +08:00
committed by GitHub
co-authored by Tomsun28
parent a83cb0f50f
commit 1b51c19c97
3 changed files with 168 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hertzbeat-common/src/main/java/org/apache/hertzbeat/common/util/StrBuffer.java
+4
View File
@@ -159,4 +159,8 @@ public class StrBuffer {
}
return Double.parseDouble(s);
}
public static String escapeForFormat(String value) {
return value.replace("%", "%%");
}
}
hertzbeat-warehouse/src/main/java/org/apache/hertzbeat/warehouse/store/history/tsdb/tdengine/TdEngineDataStorage.java
+8 -2
View File
@@ -47,6 +47,7 @@ import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
import org.apache.hertzbeat.common.entity.dto.Value;
import org.apache.hertzbeat.common.entity.message.CollectRep;
import org.apache.hertzbeat.common.util.JsonUtil;
import org.apache.hertzbeat.common.util.StrBuffer;
import org.apache.hertzbeat.warehouse.store.history.tsdb.AbstractHistoryDataStorage;
import org.jetbrains.annotations.NotNull;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -221,7 +222,12 @@ public class TdEngineDataStorage extends AbstractHistoryDataStorage {
} else {
try {
double number = Double.parseDouble(value);
sqlRowBuffer.append(number);
// TDengine doesn't support NaN or Infinity literals, convert to NULL
if (Double.isNaN(number) || Double.isInfinite(number)) {
sqlRowBuffer.append("NULL");
} else {
sqlRowBuffer.append(number);
}
} catch (Exception e) {
if (log.isWarnEnabled()) {
@@ -236,7 +242,7 @@ public class TdEngineDataStorage extends AbstractHistoryDataStorage {
if (CommonConstants.NULL_VALUE.equals(value)) {
sqlRowBuffer.append("NULL");
} else {
sqlRowBuffer.append("'").append(formatStringValue(value)).append("'");
sqlRowBuffer.append("'").append(StrBuffer.escapeForFormat(formatStringValue(value))).append("'");
}
}
hertzbeat-warehouse/src/test/java/org/apache/hertzbeat/warehouse/store/TdEngineDataStorageTest.java
+156 -2
View File
@@ -17,17 +17,67 @@
package org.apache.hertzbeat.warehouse.store;
import com.zaxxer.hikari.HikariDataSource;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.hertzbeat.common.constants.CommonConstants;
import org.apache.hertzbeat.common.constants.MetricDataConstants;
import org.apache.hertzbeat.common.entity.arrow.ArrowCell;
import org.apache.hertzbeat.common.entity.arrow.RowWrapper;
import org.apache.hertzbeat.common.entity.message.CollectRep;
import org.apache.hertzbeat.warehouse.store.history.tsdb.tdengine.TdEngineDataStorage;
import org.apache.hertzbeat.warehouse.store.history.tsdb.tdengine.TdEngineProperties;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.jupiter.MockitoExtension;
import org.mockito.junit.jupiter.MockitoSettings;
import org.mockito.quality.Strictness;
import java.sql.Connection;
import java.sql.Statement;
import java.util.List;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* Test case for {@link TdEngineDataStorage}
*/
@ExtendWith(MockitoExtension.class)
@MockitoSettings(strictness = Strictness.LENIENT)
class TdEngineDataStorageTest {
@Mock
private TdEngineProperties tdEngineProperties;
@Mock
private HikariDataSource mockHikariDataSource;
@Mock
private Connection mockConnection;
@Mock
private Statement mockStatement;
private TdEngineDataStorage tdEngineDataStorage;
@BeforeEach
void setUp() {
void setUp() throws Exception {
when(tdEngineProperties.enabled()).thenReturn(true);
when(tdEngineProperties.url()).thenReturn("jdbc:TAOS-RS://localhost:6041/demo");
when(tdEngineProperties.username()).thenReturn("root");
when(tdEngineProperties.password()).thenReturn("root");
when(tdEngineProperties.tableStrColumnDefineMaxLength()).thenReturn(200);
when(mockHikariDataSource.getConnection()).thenReturn(mockConnection);
when(mockConnection.createStatement()).thenReturn(mockStatement);
}
@Test
@@ -35,7 +85,34 @@ class TdEngineDataStorageTest {
}
@Test
void saveData() {
void testSaveData() throws Exception {
tdEngineDataStorage = new TdEngineDataStorage(tdEngineProperties);
setPrivateField(tdEngineDataStorage, "hikariDataSource", mockHikariDataSource);
setParentPrivateField(tdEngineDataStorage, "serverAvailable", true);
CollectRep.MetricsData metricsData = generateMockedMetricsData();
tdEngineDataStorage.saveData(metricsData);
ArgumentCaptor<String> sqlCaptor = ArgumentCaptor.forClass(String.class);
verify(mockStatement, atLeastOnce()).execute(sqlCaptor.capture());
String executedSql = sqlCaptor.getValue();
// Verify SQL structure
assertNotNull(executedSql);
assertTrue(executedSql.startsWith("INSERT INTO"), "SQL should start with INSERT INTO");
assertTrue(executedSql.contains("USING"), "SQL should contain USING clause");
assertTrue(executedSql.contains("TAGS"), "SQL should contain TAGS clause");
assertTrue(executedSql.contains("VALUES"), "SQL should contain VALUES clause");
// Verify table name format: app_metrics_instance_v2
assertTrue(executedSql.contains("app_cpu_test-%server-01_v2"), "Should contain correct table name");
// Verify super table name format: app_metrics_super_v2
assertTrue(executedSql.contains("app_cpu_super_v2"), "Should contain correct super table name");
// Verify tags format: test-%server-01
assertTrue(executedSql.contains("TAGS ('test-%server-01')"), "Should contain correct super table name");
// Verify VALUES clause structure (timestamp + data values)
assertTrue(executedSql.matches(".*VALUES\\s+\\(\\d+.*68\\.7\\)"), "Should contain timestamp and value 68.7");
}
@Test
@@ -49,4 +126,81 @@ class TdEngineDataStorageTest {
@Test
void getHistoryIntervalMetricData() {
}
/**
* Helper method to set private field using reflection
*/
private void setPrivateField(Object target, String fieldName, Object value) throws Exception {
java.lang.reflect.Field field = target.getClass().getDeclaredField(fieldName);
field.setAccessible(true);
field.set(target, value);
}
/**
* Helper method to set private field from parent class using reflection
*/
private void setParentPrivateField(Object target, String fieldName, Object value) throws Exception {
java.lang.reflect.Field field = target.getClass().getSuperclass().getDeclaredField(fieldName);
field.setAccessible(true);
field.set(target, value);
}
public static CollectRep.MetricsData generateMockedMetricsData() {
CollectRep.MetricsData mockMetricsData = Mockito.mock(CollectRep.MetricsData.class);
when(mockMetricsData.getId()).thenReturn(0L);
when(mockMetricsData.getMetrics()).thenReturn("cpu");
when(mockMetricsData.getTime()).thenReturn(System.currentTimeMillis());
when(mockMetricsData.getCode()).thenReturn(CollectRep.Code.SUCCESS);
when(mockMetricsData.getApp()).thenReturn("app");
when(mockMetricsData.getInstance()).thenReturn("test-%server-01");
CollectRep.ValueRow mockValueRow = Mockito.mock(CollectRep.ValueRow.class);
List<String> columnValues = List.of("test-%server-01", "68.7");
when(mockValueRow.getColumnsList()).thenReturn(columnValues);
when(mockValueRow.getColumns(0)).thenReturn("test-%server-01");
when(mockValueRow.getColumns(1)).thenReturn("68.7");
List<CollectRep.ValueRow> mockValueRowsList = List.of(mockValueRow);
when(mockMetricsData.getValues()).thenReturn(mockValueRowsList);
CollectRep.Field instanceField = Mockito.mock(CollectRep.Field.class);
when(instanceField.getName()).thenReturn("instance");
CollectRep.Field usageField = Mockito.mock(CollectRep.Field.class);
when(usageField.getName()).thenReturn("usage");
CollectRep.Field systemField = Mockito.mock(CollectRep.Field.class);
when(systemField.getName()).thenReturn("system");
List<CollectRep.Field> mockFields = List.of(instanceField, usageField, systemField);
when(mockMetricsData.getFields()).thenReturn(mockFields);
ArrowType instanceArrowType = new ArrowType.Utf8();
FieldType instanceFieldType = new FieldType(true, instanceArrowType, null, null);
Field instanceArrowField = new Field("instance", instanceFieldType, null);
ArrowCell instanceCell = Mockito.mock(ArrowCell.class);
when(instanceCell.getField()).thenReturn(instanceArrowField);
when(instanceCell.getValue()).thenReturn("test-%server-01");
when(instanceCell.getMetadataAsBoolean(MetricDataConstants.LABEL)).thenReturn(true);
when(instanceCell.getMetadataAsByte(MetricDataConstants.TYPE)).thenReturn(CommonConstants.TYPE_STRING);
ArrowType usageArrowType = new ArrowType.Utf8();
FieldType usageFieldType = new FieldType(true, usageArrowType, null, null);
Field usageArrowField = new Field("usage", usageFieldType, null);
ArrowCell usageCell = Mockito.mock(ArrowCell.class);
when(usageCell.getField()).thenReturn(usageArrowField);
when(usageCell.getValue()).thenReturn("68.7");
when(usageCell.getMetadataAsBoolean(MetricDataConstants.LABEL)).thenReturn(false);
when(usageCell.getMetadataAsByte(MetricDataConstants.TYPE)).thenReturn(CommonConstants.TYPE_NUMBER);
List<ArrowCell> mockCells = List.of(instanceCell, usageCell);
// Create Arrow Field list for RowWrapper
List<org.apache.arrow.vector.types.pojo.Field> arrowFields = List.of(instanceArrowField, usageArrowField);
RowWrapper mockRowWrapper = Mockito.mock(RowWrapper.class);
when(mockRowWrapper.hasNextRow()).thenReturn(true).thenReturn(false);
when(mockRowWrapper.nextRow()).thenReturn(mockRowWrapper);
when(mockRowWrapper.cellStream()).thenAnswer(invocation -> mockCells.stream());
when(mockRowWrapper.getFieldList()).thenReturn(arrowFields);
when(mockMetricsData.readRow()).thenReturn(mockRowWrapper);
return mockMetricsData;
}
}