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)(headless)Rename contextModel to contextDataset

Browse Source
This commit is contained in:
jerryjzhang
2024-07-10 09:41:56 +08:00
parent c3b3b7e769
commit d3f3fc5de3
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,27 +173,6 @@ public class ChatQueryServiceImpl implements ChatQueryService {
return queryCtx; return queryCtx;
} }
private QueryResult doExecution(SemanticQueryReq semanticQueryReq,
SemanticParseInfo parseInfo, User user) throws Exception {
SemanticQueryResp queryResp = semanticLayerService.queryByReq(semanticQueryReq, user);
QueryResult queryResult = new QueryResult();
if (queryResp != null) {
queryResult.setQueryAuthorization(queryResp.getQueryAuthorization());
}
String sql = queryResp == null ? null : queryResp.getSql();
List<Map<String, Object>> resultList = queryResp == null ? new ArrayList<>()
: queryResp.getResultList();
List<QueryColumn> columns = queryResp == null ? new ArrayList<>() : queryResp.getColumns();
queryResult.setQuerySql(sql);
queryResult.setQueryResults(resultList);
queryResult.setQueryColumns(columns);
queryResult.setQueryMode(parseInfo.getQueryMode());
queryResult.setQueryState(QueryState.SUCCESS);
return queryResult;
}
@Override @Override
public SemanticParseInfo queryContext(Integer chatId) { public SemanticParseInfo queryContext(Integer chatId) {
ChatContext context = chatContextService.getOrCreateContext(chatId); ChatContext context = chatContextService.getOrCreateContext(chatId);
@@ -251,6 +230,27 @@ public class ChatQueryServiceImpl implements ChatQueryService {
return queryResult; return queryResult;
} }
private QueryResult doExecution(SemanticQueryReq semanticQueryReq,
SemanticParseInfo parseInfo, User user) throws Exception {
SemanticQueryResp queryResp = semanticLayerService.queryByReq(semanticQueryReq, user);
QueryResult queryResult = new QueryResult();
if (queryResp != null) {
queryResult.setQueryAuthorization(queryResp.getQueryAuthorization());
}
String sql = queryResp == null ? null : queryResp.getSql();
List<Map<String, Object>> resultList = queryResp == null ? new ArrayList<>()
: queryResp.getResultList();
List<QueryColumn> columns = queryResp == null ? new ArrayList<>() : queryResp.getColumns();
queryResult.setQuerySql(sql);
queryResult.setQueryResults(resultList);
queryResult.setQueryColumns(columns);
queryResult.setQueryMode(parseInfo.getQueryMode());
queryResult.setQueryState(QueryState.SUCCESS);
return queryResult;
}
private boolean checkMetricReplace(List<String> oriFields, Set<SchemaElement> metrics) { private boolean checkMetricReplace(List<String> oriFields, Set<SchemaElement> metrics) {
if (CollectionUtils.isEmpty(oriFields)) { if (CollectionUtils.isEmpty(oriFields)) {
return false; return false;
@@ -262,7 +262,7 @@ public class ChatQueryServiceImpl implements ChatQueryService {
return !oriFields.containsAll(metricNames); return !oriFields.containsAll(metricNames);
} }
public String reviseCorrectS2SQL(QueryDataReq queryData, SemanticParseInfo parseInfo) { private String reviseCorrectS2SQL(QueryDataReq queryData, SemanticParseInfo parseInfo) {
Map<String, Map<String, String>> filedNameToValueMap = new HashMap<>(); Map<String, Map<String, String>> filedNameToValueMap = new HashMap<>();
Map<String, Map<String, String>> havingFiledNameToValueMap = new HashMap<>(); Map<String, Map<String, String>> havingFiledNameToValueMap = new HashMap<>();

10
headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java
View File

@@ -135,14 +135,14 @@ public class RetrieveServiceImpl implements RetrieveService {
List<Long> possibleDataSets = NatureHelper.selectPossibleDataSets(originals); List<Long> possibleDataSets = NatureHelper.selectPossibleDataSets(originals);
Long contextModel = chatContextService.getContextModel(queryCtx.getChatId()); Long contextDataset = chatContextService.getContextDataset(queryCtx.getChatId());
log.debug("possibleDataSets:{},dataSetInfoStat:{},contextModel:{}", log.debug("possibleDataSets:{},dataSetInfoStat:{},contextDataset:{}",
possibleDataSets, dataSetInfoStat, contextModel); possibleDataSets, dataSetInfoStat, contextDataset);
// If nothing is recognized or only metric are present, then add the contextModel. // If nothing is recognized or only metric are present, then add the contextDataset.
if (nothingOrOnlyMetric(dataSetInfoStat)) { if (nothingOrOnlyMetric(dataSetInfoStat)) {
return Lists.newArrayList(contextModel); return Lists.newArrayList(contextDataset);
} }
return possibleDataSets; return possibleDataSets;
} }

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java
View File

@@ -9,7 +9,7 @@ public interface ChatContextService {
* @param chatId * @param chatId
* @return * @return
*/ */
Long getContextModel(Integer chatId); Long getContextDataset(Integer chatId);
ChatContext getOrCreateContext(Integer chatId); ChatContext getOrCreateContext(Integer chatId);

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java
View File

@@ -21,7 +21,7 @@ public class ChatContextServiceImpl implements ChatContextService {
} }
@Override @Override
public Long getContextModel(Integer chatId) { public Long getContextDataset(Integer chatId) {
if (Objects.isNull(chatId)) { if (Objects.isNull(chatId)) {
return null; return null;
} }