Skip to content

Commit 6700ba7

Browse files
committed
refactor(db-collector): 重命名 Matrix 相关模块为 DBCollector
- 将 MatrixController 重命名为 DBCollectorController 并调整相关注释和请求路径 - 将 MatrixLogService 接口重命名为 DBCollectorService,更新注释说明 - 将 MatrixPresetSqlRegistry 类重命名为 DBCollectorPresetSqlRegistry 并更新日志及注释 - 将 MatrixLogServiceImpl 实现类重命名为 DBCollectorServiceImpl,同时修改实现细节标识 - 更新前端 API 请求路径,从 /matrix/statistics 改为 /db-collector/statistics - 统一更改日志输出和警告提示中 "Matrix" 为 "DBCollector" 以保持一致性 - 调整所有相关依赖注入和调用代码以配合重构后的类名和路径
1 parent 4b65e75 commit 6700ba7

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

himarket-server/src/main/java/com/alibaba/himarket/controller/MatrixController.java renamed to himarket-server/src/main/java/com/alibaba/himarket/controller/DBCollectorController.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.alibaba.himarket.dto.params.sls.GenericSlsQueryResponse;
2525
import com.alibaba.himarket.dto.params.sls.ScenarioQueryResponse;
2626
import com.alibaba.himarket.dto.params.sls.TimeSeriesChartResponse;
27-
import com.alibaba.himarket.service.MatrixLogService;
28-
import com.alibaba.himarket.service.gateway.factory.MatrixPresetSqlRegistry;
27+
import com.alibaba.himarket.service.DBCollectorService;
28+
import com.alibaba.himarket.service.gateway.factory.DBCollectorPresetSqlRegistry;
2929
import com.alibaba.himarket.service.gateway.factory.SlsPresetSqlRegistry;
3030
import io.swagger.v3.oas.annotations.Operation;
3131
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,24 +40,24 @@
4040
import org.springframework.web.bind.annotation.RequestMapping;
4141
import org.springframework.web.bind.annotation.RestController;
4242

43-
@Tag(name = "Matrix可观测", description = "基于数据库 access_logs 的可观测大盘查询能力、计量、日志检索")
43+
@Tag(name = "DBCollector可观测", description = "基于数据库 access_logs 的可观测大盘查询能力、计量、日志检索")
4444
@RestController
45-
@RequestMapping("/matrix")
45+
@RequestMapping("/db-collector")
4646
@Slf4j
4747
@RequiredArgsConstructor
48-
public class MatrixController {
48+
public class DBCollectorController {
4949

50-
private final MatrixLogService matrixLogService;
51-
private final MatrixPresetSqlRegistry presetRegistry;
50+
private final DBCollectorService DBCollectorService;
51+
private final DBCollectorPresetSqlRegistry presetRegistry;
5252

5353
@PostMapping("/statistics")
54-
@Operation(summary = "日志转指标聚合查询(Matrix 存储)")
55-
public ScenarioQueryResponse matrixScenarioQuery(
54+
@Operation(summary = "日志转指标聚合查询(DBCollector 存储)")
55+
public ScenarioQueryResponse DBCollectorScenarioQuery(
5656
@RequestBody @Validated GenericSlsQueryRequest request) {
57-
MatrixPresetSqlRegistry.Preset preset = presetRegistry.getPreset(request.getScenario());
57+
DBCollectorPresetSqlRegistry.Preset preset = presetRegistry.getPreset(request.getScenario());
5858
if (preset == null) {
5959
log.warn(
60-
"Matrix scenario not found, returning empty result. scenario: {}",
60+
"DBCollector scenario not found, returning empty result. scenario: {}",
6161
request.getScenario());
6262
return buildEmptyResponse(request.getScenario());
6363
}
@@ -66,7 +66,7 @@ public ScenarioQueryResponse matrixScenarioQuery(
6666
request.setSql(preset.getSqlTemplate());
6767

6868
try {
69-
GenericSlsQueryResponse response = matrixLogService.executeQuery(request);
69+
GenericSlsQueryResponse response = DBCollectorService.executeQuery(request);
7070
Integer interval = request.getInterval() != null ? request.getInterval() : 60;
7171

7272
switch (preset.getType()) {
@@ -116,7 +116,7 @@ public ScenarioQueryResponse matrixScenarioQuery(
116116
}
117117
} catch (Exception e) {
118118
log.warn(
119-
"Matrix query failed, returning empty result. scenario: {}, err: {}",
119+
"DBCollector query failed, returning empty result. scenario: {}, err: {}",
120120
request.getScenario(),
121121
e.getMessage(),
122122
e);
@@ -125,7 +125,7 @@ public ScenarioQueryResponse matrixScenarioQuery(
125125
}
126126

127127
private ScenarioQueryResponse buildEmptyResponse(String scenario) {
128-
MatrixPresetSqlRegistry.Preset preset = presetRegistry.getPreset(scenario);
128+
DBCollectorPresetSqlRegistry.Preset preset = presetRegistry.getPreset(scenario);
129129
if (preset == null) {
130130
return ScenarioQueryResponse.builder()
131131
.type(SlsPresetSqlRegistry.DisplayType.CARD)

himarket-server/src/main/java/com/alibaba/himarket/service/MatrixLogService.java renamed to himarket-server/src/main/java/com/alibaba/himarket/service/DBCollectorService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import com.alibaba.himarket.dto.params.sls.GenericSlsQueryRequest;
2323
import com.alibaba.himarket.dto.params.sls.GenericSlsQueryResponse;
2424

25-
/** Matrix 日志查询服务(基于数据库存储的 access_logs) */
26-
public interface MatrixLogService {
25+
/** DBCollector 日志查询服务(基于数据库存储的 access_logs) */
26+
public interface DBCollectorService {
2727

2828
/**
2929
* 执行通用 SQL 查询(面向 access_logs 的场景化统计查询)

himarket-server/src/main/java/com/alibaba/himarket/service/gateway/factory/MatrixPresetSqlRegistry.java renamed to himarket-server/src/main/java/com/alibaba/himarket/service/gateway/factory/DBCollectorPresetSqlRegistry.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.springframework.stereotype.Component;
2727

2828
/**
29-
* Matrix 场景 SQL 注册表(MySQL/MariaDB 方言)
29+
* DBCollector 场景 SQL 注册表(MySQL/MariaDB 方言)
3030
*
3131
* <p>说明:
3232
*
@@ -39,7 +39,7 @@
3939
*/
4040
@Component
4141
@Slf4j
42-
public class MatrixPresetSqlRegistry {
42+
public class DBCollectorPresetSqlRegistry {
4343

4444
public static final String WHERE_PLACEHOLDER = "/*WHERE*/";
4545
public static final String BIZ_PLACEHOLDER = "/*BIZ*/";
@@ -69,7 +69,7 @@ public Preset(
6969

7070
private final Map<String, Preset> presets = new HashMap<>();
7171

72-
public MatrixPresetSqlRegistry() {
72+
public DBCollectorPresetSqlRegistry() {
7373
// ===== CARD =====
7474
presets.put(
7575
"pv",
@@ -694,7 +694,7 @@ public Preset getPreset(String scenario) {
694694
if (scenario == null) return null;
695695
Preset p = presets.get(scenario);
696696
if (p == null) {
697-
log.warn("Unknown matrix scenario: {}", scenario);
697+
log.warn("Unknown DBCollector scenario: {}", scenario);
698698
}
699699
return p;
700700
}

himarket-server/src/main/java/com/alibaba/himarket/service/impl/MatrixLogServiceImpl.java renamed to himarket-server/src/main/java/com/alibaba/himarket/service/impl/DBCollectorServiceImpl.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121

2222
import com.alibaba.himarket.dto.params.sls.GenericSlsQueryRequest;
2323
import com.alibaba.himarket.dto.params.sls.GenericSlsQueryResponse;
24-
import com.alibaba.himarket.service.MatrixLogService;
25-
import com.alibaba.himarket.service.gateway.factory.MatrixPresetSqlRegistry;
24+
import com.alibaba.himarket.service.DBCollectorService;
25+
import com.alibaba.himarket.service.gateway.factory.DBCollectorPresetSqlRegistry;
2626
import java.sql.Timestamp;
2727
import java.time.Instant;
2828
import java.time.LocalDateTime;
@@ -45,7 +45,7 @@
4545
@Service
4646
@Slf4j
4747
@RequiredArgsConstructor
48-
public class MatrixLogServiceImpl implements MatrixLogService {
48+
public class DBCollectorServiceImpl implements DBCollectorService {
4949

5050
private static final int DEFAULT_LIMIT = 1000;
5151
private static final int MAX_LIMIT = 5000;
@@ -68,15 +68,15 @@ public GenericSlsQueryResponse executeQuery(GenericSlsQueryRequest request) {
6868
MapSqlParameterSource params = new MapSqlParameterSource();
6969
String where = buildWhereClause(request, params);
7070

71-
if (!sql.contains(MatrixPresetSqlRegistry.WHERE_PLACEHOLDER)) {
71+
if (!sql.contains(DBCollectorPresetSqlRegistry.WHERE_PLACEHOLDER)) {
7272
// 兜底:如果模板里没有占位符,就直接在末尾拼 WHERE(避免误改 SQL 结构)
7373
sql = sql + " " + where;
7474
} else {
75-
sql = sql.replace(MatrixPresetSqlRegistry.WHERE_PLACEHOLDER, where);
75+
sql = sql.replace(DBCollectorPresetSqlRegistry.WHERE_PLACEHOLDER, where);
7676
}
7777

78-
if (sql.contains(MatrixPresetSqlRegistry.BIZ_PLACEHOLDER)) {
79-
sql = sql.replace(MatrixPresetSqlRegistry.BIZ_PLACEHOLDER, buildBizClause(request));
78+
if (sql.contains(DBCollectorPresetSqlRegistry.BIZ_PLACEHOLDER)) {
79+
sql = sql.replace(DBCollectorPresetSqlRegistry.BIZ_PLACEHOLDER, buildBizClause(request));
8080
}
8181

8282
// 可选 limit:仅当请求显式传入 pageSize 且 SQL 未显式 limit 时追加
@@ -104,7 +104,7 @@ public GenericSlsQueryResponse executeQuery(GenericSlsQueryRequest request) {
104104
.elapsedMillis(System.currentTimeMillis() - start)
105105
.build();
106106
} catch (Exception e) {
107-
log.warn("[Matrix Query Failed] sql: {}, err: {}", originalSql, e.getMessage(), e);
107+
log.warn("[DBCollector Query Failed] sql: {}, err: {}", originalSql, e.getMessage(), e);
108108
return GenericSlsQueryResponse.builder()
109109
.success(false)
110110
.processStatus("Complete")

himarket-web/himarket-admin/src/lib/slsApi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export async function querySlsStatistics(
2626
): Promise<ScenarioQueryResponse> {
2727
const { data } = await api.post<
2828
ScenarioQueryResponse | ApiResponse<ScenarioQueryResponse>
29-
>("/matrix/statistics", request);
29+
>("/db-collector/statistics", request);
3030

3131
// 解包后端响应,从 { code, message, data } 中提取 data
3232
if (isWrappedResponse<ScenarioQueryResponse>(data)) {

0 commit comments

Comments
 (0)