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

(improvement)(chat) The group by field can be added even if the group by field already exists (#192)

Browse Source
This commit is contained in:
lexluo09
2023-10-11 13:14:42 +08:00
committed by GitHub
parent d6cefaa6d2
commit 6b2a14e589
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
chat/core/src/main/java/com/tencent/supersonic/chat/responder/execute/EntityInfoExecuteResponder.java
View File

@@ -17,6 +17,9 @@ public class EntityInfoExecuteResponder implements ExecuteResponder {
@Override @Override
public void fillResponse(QueryResult queryResult, SemanticParseInfo semanticParseInfo, ExecuteQueryReq queryReq) { public void fillResponse(QueryResult queryResult, SemanticParseInfo semanticParseInfo, ExecuteQueryReq queryReq) {
if (semanticParseInfo == null || semanticParseInfo.getModelId() <= 0L) {
return;
}
SemanticService semanticService = ContextUtils.getBean(SemanticService.class); SemanticService semanticService = ContextUtils.getBean(SemanticService.class);
User user = queryReq.getUser(); User user = queryReq.getUser();
queryResult.setEntityInfo(semanticService.getEntityInfo(semanticParseInfo, user)); queryResult.setEntityInfo(semanticService.getEntityInfo(semanticParseInfo, user));
@@ -27,6 +30,9 @@ public class EntityInfoExecuteResponder implements ExecuteResponder {
return; return;
} }
String primaryEntityBizName = entityInfo.getModelInfo().getPrimaryEntityBizName(); String primaryEntityBizName = entityInfo.getModelInfo().getPrimaryEntityBizName();
if (CollectionUtils.isEmpty(queryResult.getQueryColumns())) {
return;
}
boolean existPrimaryEntityName = queryResult.getQueryColumns().stream() boolean existPrimaryEntityName = queryResult.getQueryColumns().stream()
.anyMatch(queryColumn -> primaryEntityBizName.equals(queryColumn.getNameEn())); .anyMatch(queryColumn -> primaryEntityBizName.equals(queryColumn.getNameEn()));

6
common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserUpdateHelper.java
View File

@@ -312,7 +312,7 @@ public class SqlParserUpdateHelper {
} }
public static String addGroupBy(String sql, Set<String> groupByFields) { public static String addGroupBy(String sql, Set<String> groupByFields) {
if (SqlParserSelectHelper.hasGroupBy(sql) || CollectionUtils.isEmpty(groupByFields)) { if (CollectionUtils.isEmpty(groupByFields)) {
return sql; return sql;
} }
Select selectStatement = SqlParserSelectHelper.getSelect(sql); Select selectStatement = SqlParserSelectHelper.getSelect(sql);
@@ -324,6 +324,10 @@ public class SqlParserUpdateHelper {
PlainSelect plainSelect = (PlainSelect) selectBody; PlainSelect plainSelect = (PlainSelect) selectBody;
GroupByElement groupByElement = new GroupByElement(); GroupByElement groupByElement = new GroupByElement();
List<String> originalGroupByFields = SqlParserSelectHelper.getGroupByFields(sql);
if (!CollectionUtils.isEmpty(originalGroupByFields)) {
groupByFields.addAll(originalGroupByFields);
}
for (String groupByField : groupByFields) { for (String groupByField : groupByFields) {
groupByElement.addGroupByExpression(new Column(groupByField)); groupByElement.addGroupByExpression(new Column(groupByField));
} }