[improvement][headless]Rename METRIC query type enum to AGGREGATE.

This commit is contained in:
jerryjzhang
2024-09-27 15:19:26 +08:00
parent c34c3ecf09
commit ae3e9f142b
14 changed files with 24 additions and 24 deletions

View File

@@ -46,7 +46,7 @@ public class MetricTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -68,7 +68,7 @@ public class MetricTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(
DateConf.DateMode.BETWEEN, 7, DatePeriodEnum.DAY, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -94,7 +94,7 @@ public class MetricTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -116,7 +116,7 @@ public class MetricTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(3, DateConf.DateMode.BETWEEN, DatePeriodEnum.DAY));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -136,7 +136,7 @@ public class MetricTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -166,7 +166,7 @@ public class MetricTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, 1, period, startDay, startDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}

View File

@@ -38,7 +38,7 @@ public class MultiTurnsTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -67,7 +67,7 @@ public class MultiTurnsTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}
@@ -94,7 +94,7 @@ public class MultiTurnsTest extends BaseTest {
expectedParseInfo.setDateInfo(
DataUtils.getDateConf(DateConf.DateMode.BETWEEN, unit, period, startDay, endDay));
expectedParseInfo.setQueryType(QueryType.METRIC);
expectedParseInfo.setQueryType(QueryType.AGGREGATE);
assertQueryResult(expectedResult, actualResult);
}

View File

@@ -47,7 +47,7 @@ public class BaseTest extends BaseApplication {
}
protected QueryStructReq buildQueryStructReq(List<String> groups) {
return buildQueryStructReq(groups, QueryType.METRIC);
return buildQueryStructReq(groups, QueryType.AGGREGATE);
}
protected QueryStructReq buildQueryStructReq(List<String> groups, QueryType queryType) {
@@ -84,7 +84,7 @@ public class BaseTest extends BaseApplication {
for (Long modelId : DataUtils.getMetricAgentIModelIds()) {
queryStructReq.addModelId(modelId);
}
queryStructReq.setQueryType(QueryType.METRIC);
queryStructReq.setQueryType(QueryType.AGGREGATE);
queryStructReq.setAggregators(Arrays.asList(aggregator));
if (CollectionUtils.isNotEmpty(groups)) {