topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[improvement][Chat] Optimize the chat corrector code (#728)

Browse Source
This commit is contained in:
lexluo09
2024-02-19 19:04:29 +08:00
committed by GitHub
parent 699a33b1c1
commit b85778babd
3 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
chat/core/src/main/java/com/tencent/supersonic/chat/core/corrector/GroupByCorrector.java
View File

@@ -31,22 +31,20 @@ public class GroupByCorrector extends BaseSemanticCorrector {
@Override @Override
public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) { public void doCorrect(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
Boolean addGroupBy = addGroupBy(queryContext, semanticParseInfo); Boolean needAddGroupBy = needAddGroupBy(queryContext, semanticParseInfo);
log.info("addGroupBy:{}", addGroupBy); if (!needAddGroupBy) {
if (!addGroupBy) {
return; return;
} }
addGroupByFields(queryContext, semanticParseInfo); addGroupByFields(queryContext, semanticParseInfo);
} }
private Boolean addGroupBy(QueryContext queryContext, SemanticParseInfo semanticParseInfo) { private Boolean needAddGroupBy(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
Long viewId = semanticParseInfo.getViewId(); Long viewId = semanticParseInfo.getViewId();
ViewService viewService = ContextUtils.getBean(ViewService.class); ViewService viewService = ContextUtils.getBean(ViewService.class);
ModelService modelService = ContextUtils.getBean(ModelService.class); ModelService modelService = ContextUtils.getBean(ModelService.class);
ViewResp viewResp = viewService.getView(viewId); ViewResp viewResp = viewService.getView(viewId);
List<Long> modelIds = viewResp.getViewDetail().getViewModelConfigs().stream().map(config -> config.getId() List<Long> modelIds = viewResp.getViewDetail().getViewModelConfigs().stream().map(config -> config.getId())
).collect(Collectors.toList()); .collect(Collectors.toList());
MetaFilter metaFilter = new MetaFilter(modelIds); MetaFilter metaFilter = new MetaFilter(modelIds);
List<ModelResp> modelRespList = modelService.getModelList(metaFilter); List<ModelResp> modelRespList = modelService.getModelList(metaFilter);
for (ModelResp modelResp : modelRespList) { for (ModelResp modelResp : modelRespList) {
@@ -57,22 +55,33 @@ public class GroupByCorrector extends BaseSemanticCorrector {
} }
} }
} }
return true;
}
private void addGroupByFields(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
Long viewId = semanticParseInfo.getViewId();
//add dimension group by //add dimension group by
SqlInfo sqlInfo = semanticParseInfo.getSqlInfo(); SqlInfo sqlInfo = semanticParseInfo.getSqlInfo();
String correctS2SQL = sqlInfo.getCorrectS2SQL(); String correctS2SQL = sqlInfo.getCorrectS2SQL();
SemanticSchema semanticSchema = queryContext.getSemanticSchema(); SemanticSchema semanticSchema = queryContext.getSemanticSchema();
// check if has distinct // check has distinct
boolean hasDistinct = SqlSelectHelper.hasDistinct(correctS2SQL); if (SqlSelectHelper.hasDistinct(correctS2SQL)) {
if (hasDistinct) {
log.info("not add group by ,exist distinct in correctS2SQL:{}", correctS2SQL); log.info("not add group by ,exist distinct in correctS2SQL:{}", correctS2SQL);
return; return false;
} }
//add alias field name //add alias field name
Set<String> dimensions = getDimensions(viewId, semanticSchema);
List<String> selectFields = SqlSelectHelper.getSelectFields(correctS2SQL);
if (CollectionUtils.isEmpty(selectFields) || CollectionUtils.isEmpty(dimensions)) {
return false;
}
// if only date in select not add group by.
if (selectFields.size() == 1 && selectFields.contains(TimeDimensionEnum.DAY.getChName())) {
return false;
}
if (SqlSelectHelper.hasGroupBy(correctS2SQL)) {
log.info("not add group by ,exist group by in correctS2SQL:{}", correctS2SQL);
return false;
}
return true;
}
private Set<String> getDimensions(Long viewId, SemanticSchema semanticSchema) {
Set<String> dimensions = semanticSchema.getDimensions(viewId).stream() Set<String> dimensions = semanticSchema.getDimensions(viewId).stream()
.flatMap( .flatMap(
schemaElement -> { schemaElement -> {
@@ -85,21 +94,18 @@ public class GroupByCorrector extends BaseSemanticCorrector {
} }
).collect(Collectors.toSet()); ).collect(Collectors.toSet());
dimensions.add(TimeDimensionEnum.DAY.getChName()); dimensions.add(TimeDimensionEnum.DAY.getChName());
return dimensions;
}
private void addGroupByFields(QueryContext queryContext, SemanticParseInfo semanticParseInfo) {
Long viewId = semanticParseInfo.getViewId();
//add dimension group by
SqlInfo sqlInfo = semanticParseInfo.getSqlInfo();
String correctS2SQL = sqlInfo.getCorrectS2SQL();
SemanticSchema semanticSchema = queryContext.getSemanticSchema();
//add alias field name
Set<String> dimensions = getDimensions(viewId, semanticSchema);
List<String> selectFields = SqlSelectHelper.getSelectFields(correctS2SQL); List<String> selectFields = SqlSelectHelper.getSelectFields(correctS2SQL);
if (CollectionUtils.isEmpty(selectFields) || CollectionUtils.isEmpty(dimensions)) {
return;
}
// if only date in select not add group by.
if (selectFields.size() == 1 && selectFields.contains(TimeDimensionEnum.DAY.getChName())) {
return;
}
if (SqlSelectHelper.hasGroupBy(correctS2SQL)) {
log.info("not add group by ,exist group by in correctS2SQL:{}", correctS2SQL);
return;
}
List<String> aggregateFields = SqlSelectHelper.getAggregateFields(correctS2SQL); List<String> aggregateFields = SqlSelectHelper.getAggregateFields(correctS2SQL);
Set<String> groupByFields = selectFields.stream() Set<String> groupByFields = selectFields.stream()
.filter(field -> dimensions.contains(field)) .filter(field -> dimensions.contains(field))
@@ -111,7 +117,6 @@ public class GroupByCorrector extends BaseSemanticCorrector {
}) })
.collect(Collectors.toSet()); .collect(Collectors.toSet());
semanticParseInfo.getSqlInfo().setCorrectS2SQL(SqlAddHelper.addGroupBy(correctS2SQL, groupByFields)); semanticParseInfo.getSqlInfo().setCorrectS2SQL(SqlAddHelper.addGroupBy(correctS2SQL, groupByFields));
addAggregate(queryContext, semanticParseInfo); addAggregate(queryContext, semanticParseInfo);
} }

2
common/src/main/META-INF/spring.factories
View File

@@ -1,2 +0,0 @@
com.tencent.supersonic.headless.core.cache.CacheManager=\
com.tencent.supersonic.headless.core.cache.CaffeineCacheManager

4
launchers/standalone/src/main/resources/config.update/data-update.txt
View File

@@ -1,2 +1,4 @@
#20240123 #20240123
rm /tmp/InMemory.text2dsl_agent_collection rm /tmp/InMemory.text2dsl_agent_collection
#20240219
rm /tmp/InMemory.meta_collection