From d3f3fc5de3cf5151317611c35dd660739cf573e2 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Wed, 10 Jul 2024 09:41:56 +0800 Subject: [PATCH] (improvement)(headless)Rename `contextModel` to `contextDataset` --- .../service/impl/ChatQueryServiceImpl.java | 44 +++++++++---------- .../service/impl/RetrieveServiceImpl.java | 10 ++--- .../web/service/ChatContextService.java | 2 +- .../service/impl/ChatContextServiceImpl.java | 2 +- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java index fecf44641..31867ad87 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java @@ -173,27 +173,6 @@ public class ChatQueryServiceImpl implements ChatQueryService { 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> resultList = queryResp == null ? new ArrayList<>() - : queryResp.getResultList(); - List 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 public SemanticParseInfo queryContext(Integer chatId) { ChatContext context = chatContextService.getOrCreateContext(chatId); @@ -251,6 +230,27 @@ public class ChatQueryServiceImpl implements ChatQueryService { 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> resultList = queryResp == null ? new ArrayList<>() + : queryResp.getResultList(); + List 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 oriFields, Set metrics) { if (CollectionUtils.isEmpty(oriFields)) { return false; @@ -262,7 +262,7 @@ public class ChatQueryServiceImpl implements ChatQueryService { return !oriFields.containsAll(metricNames); } - public String reviseCorrectS2SQL(QueryDataReq queryData, SemanticParseInfo parseInfo) { + private String reviseCorrectS2SQL(QueryDataReq queryData, SemanticParseInfo parseInfo) { Map> filedNameToValueMap = new HashMap<>(); Map> havingFiledNameToValueMap = new HashMap<>(); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java index e3a314b60..b83e876cd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/RetrieveServiceImpl.java @@ -135,14 +135,14 @@ public class RetrieveServiceImpl implements RetrieveService { List possibleDataSets = NatureHelper.selectPossibleDataSets(originals); - Long contextModel = chatContextService.getContextModel(queryCtx.getChatId()); + Long contextDataset = chatContextService.getContextDataset(queryCtx.getChatId()); - log.debug("possibleDataSets:{},dataSetInfoStat:{},contextModel:{}", - possibleDataSets, dataSetInfoStat, contextModel); + log.debug("possibleDataSets:{},dataSetInfoStat:{},contextDataset:{}", + 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)) { - return Lists.newArrayList(contextModel); + return Lists.newArrayList(contextDataset); } return possibleDataSets; } diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java index 20261a05c..dd968b062 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/ChatContextService.java @@ -9,7 +9,7 @@ public interface ChatContextService { * @param chatId * @return */ - Long getContextModel(Integer chatId); + Long getContextDataset(Integer chatId); ChatContext getOrCreateContext(Integer chatId); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java index e076c48d8..6d9055ba9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/ChatContextServiceImpl.java @@ -21,7 +21,7 @@ public class ChatContextServiceImpl implements ChatContextService { } @Override - public Long getContextModel(Integer chatId) { + public Long getContextDataset(Integer chatId) { if (Objects.isNull(chatId)) { return null; }