[fix]Fix and pass the checkstyle error in warehouse module code (#1590)

Signed-off-by: tomsun28 <tomsun28@outlook.com>
Co-authored-by: tomsun28 <tomsun28@outlook.com>
This commit is contained in:
Logic
2024-02-28 11:45:43 +08:00
committed by GitHub
co-authored by tomsun28
parent 764739ad87
commit 024d2b45dc
6 changed files with 53 additions and 4 deletions
+1 -1
View File
@@ -22,7 +22,7 @@
<module name="SuppressWarningsFilter"/>
<property name="charset" value="UTF-8"/>
<property name="severity" value="error"/>
<property name="severity" value="warning"/>
<property name="fileExtensions" value="java, properties, xml"/>
<!-- Excludes all 'module-info.java' files -->
<!-- See https://checkstyle.org/config_filefilters.html -->
@@ -75,6 +75,9 @@ public class WarehouseProperties {
this.kafka = kafka;
}
/**
* kafka配置信息
*/
public static class KafkaProperties {
/**
* kafka数据入口是否启动
@@ -233,6 +236,9 @@ public class WarehouseProperties {
this.greptime = greptime;
}
/**
* 内存存储配置信息
*/
public static class MemoryProperties {
/**
* 内存数据存储是否启动
@@ -260,6 +266,9 @@ public class WarehouseProperties {
}
}
/**
* JPA配置信息
*/
public static class JpaProperties {
/**
* use mysql/h2 jpa store metrics history data
@@ -301,6 +310,9 @@ public class WarehouseProperties {
}
}
/**
* Influxdb配置信息
*/
public static class InfluxdbProperties {
/**
* influxdb数据存储是否启动
@@ -376,6 +388,9 @@ public class WarehouseProperties {
}
}
/**
* TdEngine配置信息
*/
public static class TdEngineProperties {
/**
* Whether the TdEngine data store is enabled
@@ -451,6 +466,9 @@ public class WarehouseProperties {
}
}
/**
* VictoriaMetrics配置信息
*/
public static class VictoriaMetricsProperties {
/**
* Whether the VictoriaMetrics data store is enabled
@@ -503,6 +521,9 @@ public class WarehouseProperties {
}
/**
* Redis配置信息
*/
public static class RedisProperties {
/**
* redis数据存储是否启动
@@ -566,6 +587,9 @@ public class WarehouseProperties {
}
}
/**
* IoTDB配置信息
*/
public static class IotDbProperties {
/**
* Whether the iotDB data store is enabled
@@ -698,6 +722,9 @@ public class WarehouseProperties {
}
}
/**
* GrepTimeDB配置信息
*/
public static class GreptimeProperties {
/**
* Whether the GrepTimeDB data store is enabled
@@ -63,7 +63,8 @@ public class HistoryGrepTimeDbDataStorage extends AbstractHistoryDataStorage {
private static final String QUERY_INSTANCE_SQL
= "SELECT DISTINCT instance FROM %s WHERE ts >= now() - interval '1' WEEK";
private static final String QUERY_HISTORY_INTERVAL_WITH_INSTANCE_SQL
= "SELECT first, avg ,max, min FROM (SELECT \"%s\" as first FROM %s WHERE monitor_id = %s and ts >= %s and ts < %s ORDER BY ts LIMIT 1) LEFT JOIN (SELECT avg(\"%s\") as avg, min(\"%s\") as min, max(\"%s\") as max FROM %s WHERE ts >= %s and ts < %s) ON 1=1";
= "SELECT first, avg ,max, min FROM (SELECT \"%s\" as first FROM %s WHERE monitor_id = %s and ts >= %s" +
" and ts < %s ORDER BY ts LIMIT 1) LEFT JOIN (SELECT avg(\"%s\") as avg, min(\"%s\") as min, max(\"%s\") as max FROM %s WHERE ts >= %s and ts < %s) ON 1=1";
private static final String TABLE_NOT_EXIST = "not exist";
private static final String DATABASE_NOT_EXIST = "not exist";
private GreptimeDB greptimeDb;
@@ -162,6 +162,9 @@ public class HistoryJpaDatabaseDataStorage extends AbstractHistoryDataStorage {
.int32(null);
break;
}
default:
historyBuilder.metricType(CommonConstants.TYPE_NUMBER);
break;
}
} else {
switch (fieldType) {
@@ -182,6 +185,10 @@ public class HistoryJpaDatabaseDataStorage extends AbstractHistoryDataStorage {
.int32(Integer.parseInt(columnValue));
break;
}
default:
historyBuilder.metricType(CommonConstants.TYPE_NUMBER)
.dou(Double.parseDouble(columnValue));
break;
}
if (field.getLabel()) {
@@ -446,7 +446,10 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
}
return instanceValuesMap;
}
/**
* victoria metrics content
*/
@Data
@Builder
@AllArgsConstructor
@@ -470,6 +473,9 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
private Long[] timestamps;
}
/**
* victoria metrics query content
*/
@Data
@Builder
@AllArgsConstructor
@@ -479,7 +485,10 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
private String status;
private ContentData data;
/**
* content data
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -489,6 +498,9 @@ public class HistoryVictoriaMetricsDataStorage extends AbstractHistoryDataStorag
private List<Content> result;
/**
* content
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@@ -56,9 +56,11 @@ public class RealTimeRedisDataStorage extends AbstractRealTimeDataStorage {
this.serverAvailable = initRedisClient(properties);
this.db = getRedisSelectDb(properties);
}
private Integer getRedisSelectDb(WarehouseProperties properties){
return properties.getStore().getRedis().getDb();
}
@Override
public CollectRep.MetricsData getCurrentMetricsData(@NonNull Long monitorId, @NonNull String metric) {
RedisCommands<String, CollectRep.MetricsData> commands = connection.sync();