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

(improvement)(Headless) queryBySql supports the 'correct' feature. (#907)

Browse Source
This commit is contained in:
lexluo09
2024-04-15 22:12:38 +08:00
committed by GitHub
parent 5b84bcf80c
commit bfbf9d2c8c
5 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/src/main/java/com/tencent/supersonic/common/pojo/enums/TimeDimensionEnum.java
View File

@@ -1,6 +1,7 @@
package com.tencent.supersonic.common.pojo.enums;
import cn.hutool.core.collection.CollectionUtil;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -58,7 +59,7 @@ public enum TimeDimensionEnum {
}
/**
* Determine if a time dimension field is included in a Chinese text field
* Determine if a time dimension field is included in a Chinese/English text field
*
* @param fields field
* @return true/false
@@ -67,8 +68,6 @@ public enum TimeDimensionEnum {
if (CollectionUtil.isEmpty(fields)) {
return false;
}
return fields.contains(TimeDimensionEnum.DAY.getChName())
|| fields.contains(TimeDimensionEnum.WEEK.getChName())
|| fields.contains(TimeDimensionEnum.MONTH.getChName());
return fields.stream().anyMatch(field -> containsTimeDimension(field));
}
}

23
headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/api/SqlQueryApiController.java
View File

@@ -2,10 +2,15 @@ package com.tencent.supersonic.headless.server.rest.api;
import com.tencent.supersonic.auth.api.authentication.pojo.User;
import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
import com.tencent.supersonic.headless.api.pojo.SqlInfo;
import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
import com.tencent.supersonic.headless.api.pojo.request.QuerySqlsReq;
import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq;
import com.tencent.supersonic.headless.core.chat.corrector.GrammarCorrector;
import com.tencent.supersonic.headless.core.pojo.QueryContext;
import com.tencent.supersonic.headless.server.service.QueryService;
import com.tencent.supersonic.headless.server.utils.ComponentFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +37,7 @@ public class SqlQueryApiController {
HttpServletRequest request,
HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
correct(querySqlReq);
return queryService.queryByReq(querySqlReq, user);
}
@@ -45,8 +51,25 @@ public class SqlQueryApiController {
QuerySqlReq querySqlReq = new QuerySqlReq();
BeanUtils.copyProperties(querySqlsReq, querySqlReq);
querySqlReq.setSql(sql);
correct(querySqlReq);
return querySqlReq;
}).collect(Collectors.toList());
return queryService.queryByReqs(semanticQueryReqs, user);
}
private void correct(QuerySqlReq querySqlReq) {
QueryContext queryCtx = new QueryContext();
SemanticParseInfo semanticParseInfo = new SemanticParseInfo();
SqlInfo sqlInfo = new SqlInfo();
sqlInfo.setCorrectS2SQL(querySqlReq.getSql());
sqlInfo.setS2SQL(querySqlReq.getSql());
semanticParseInfo.setSqlInfo(sqlInfo);
ComponentFactory.getSemanticCorrectors().forEach(corrector -> {
if (!(corrector instanceof GrammarCorrector)) {
corrector.correct(queryCtx, semanticParseInfo);
}
});
querySqlReq.setSql(sqlInfo.getCorrectS2SQL());
}
}

1
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java
View File

@@ -180,6 +180,7 @@ public class ChatQueryServiceImpl implements ChatQueryService {
.modelIdToDataSetIds(modelIdToDataSetIds)
.text2SQLType(queryReq.getText2SQLType())
.mapModeEnum(queryReq.getMapModeEnum())
.dataSetIds(queryReq.getDataSetIds())
.build();
BeanUtils.copyProperties(queryReq, queryCtx);
return queryCtx;

3
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java
View File

@@ -116,6 +116,9 @@ public class DataSetServiceImpl
if (metaFilter.getName() != null) {
wrapper.lambda().eq(DataSetDO::getName, metaFilter.getName());
}
if (!CollectionUtils.isEmpty(metaFilter.getNames())) {
wrapper.lambda().in(DataSetDO::getName, metaFilter.getNames());
}
wrapper.lambda().ne(DataSetDO::getStatus, StatusEnum.DELETED.getCode());
return list(wrapper).stream().map(entry -> convert(entry, user)).collect(Collectors.toList());
}

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

@@ -157,13 +157,13 @@ public class QueryReqConverter {
return AggOption.DEFAULT;
}
private void convertNameToBizName(QuerySqlReq databaseReq, SemanticSchemaResp semanticSchemaResp) {
private void convertNameToBizName(QuerySqlReq querySqlReq, SemanticSchemaResp semanticSchemaResp) {
Map<String, String> fieldNameToBizNameMap = getFieldNameToBizNameMap(semanticSchemaResp);
String sql = databaseReq.getSql();
log.info("convert name to bizName before:{}", sql);
String sql = querySqlReq.getSql();
log.info("dataSetId:{},convert name to bizName before:{}", querySqlReq.getDataSetId(), sql);
String replaceFields = SqlReplaceHelper.replaceFields(sql, fieldNameToBizNameMap, true);
log.info("convert name to bizName after:{}", replaceFields);
databaseReq.setSql(replaceFields);
log.info("dataSetId:{},convert name to bizName after:{}", querySqlReq.getDataSetId(), replaceFields);
querySqlReq.setSql(replaceFields);
}
private Set<String> getDimensions(SemanticSchemaResp semanticSchemaResp, List<String> allFields) {