[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

@@ -33,7 +33,7 @@ public class GroupByCorrector extends BaseSemanticCorrector {
private Boolean needAddGroupBy(
ChatQueryContext chatQueryContext, SemanticParseInfo semanticParseInfo) {
if (!QueryType.METRIC.equals(semanticParseInfo.getQueryType())) {
if (!QueryType.AGGREGATE.equals(semanticParseInfo.getQueryType())) {
return false;
}

View File

@@ -53,7 +53,7 @@ public class TimeCorrector extends BaseSemanticCorrector {
if (CollectionUtils.isEmpty(whereFields) || !whereFields.contains(partitionDimension)) {
TimeDefaultConfig timeConfig;
QueryConfig queryConfig = dataSetSchema.getQueryConfig();
if (QueryType.METRIC.equals(semanticParseInfo.getQueryType())) {
if (QueryType.AGGREGATE.equals(semanticParseInfo.getQueryType())) {
timeConfig = queryConfig.getAggregateTypeDefaultConfig().getTimeDefaultConfig();
} else {
timeConfig = queryConfig.getDetailTypeDefaultConfig().getTimeDefaultConfig();

View File

@@ -73,7 +73,7 @@ public class QueryTypeParser implements SemanticParser {
// 2. metric queryType
if (selectContainsMetric(sqlInfo, dataSetId, semanticSchema)
|| SqlSelectFunctionHelper.hasAggregateFunction(sqlInfo.getParsedS2SQL())) {
return QueryType.METRIC;
return QueryType.AGGREGATE;
}
return QueryType.DETAIL;

View File

@@ -259,7 +259,7 @@ public class QueryReqBuilder {
public static QueryStructReq buildStructRatioReq(
SemanticParseInfo parseInfo, SchemaElement metric, AggOperatorEnum aggOperatorEnum) {
QueryStructReq queryStructReq = buildStructReq(parseInfo);
queryStructReq.setQueryType(QueryType.METRIC);
queryStructReq.setQueryType(QueryType.AGGREGATE);
queryStructReq.setOrders(new ArrayList<>());
List<Aggregator> aggregators = new ArrayList<>();
Aggregator ratioRoll = new Aggregator(metric.getBizName(), aggOperatorEnum);