topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-04-23 07:34:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GroupByCorrector.java
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;
}

2
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java
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();

2
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java
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;

2
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/utils/QueryReqBuilder.java
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);

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java
View File

@@ -74,7 +74,7 @@ public class ParseInfoProcessor implements ResultProcessor {
parseInfo.setMetrics(metrics);
// extract dimensions from S2SQL
if (QueryType.METRIC.equals(parseInfo.getQueryType())) {
if (QueryType.AGGREGATE.equals(parseInfo.getQueryType())) {
List<String> groupByFields = SqlSelectHelper.getGroupByFields(s2SQL);
List<String> groupByDimensions = filterDateField(dsSchema, groupByFields);
parseInfo.setDimensions(

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
View File

@@ -294,7 +294,7 @@ public class QueryReqConverter {
boolean isAgg = AggOption.isAgg(aggOption);
QueryType queryType = QueryType.DETAIL;
if (isAgg) {
queryType = QueryType.METRIC;
queryType = QueryType.AGGREGATE;
}
return queryType;
}

2
headless/server/src/test/java/com/tencent/supersonic/headless/server/utils/QueryNLReqBuilderTest.java
View File

@@ -29,7 +29,7 @@ class QueryNLReqBuilderTest {
QueryStructReq queryStructReq = new QueryStructReq();
queryStructReq.setDataSetId(1L);
queryStructReq.setDataSetName("内容库");
queryStructReq.setQueryType(QueryType.METRIC);
queryStructReq.setQueryType(QueryType.AGGREGATE);
Aggregator aggregator = new Aggregator();
aggregator.setFunc(AggOperatorEnum.UNKNOWN);