diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java index ffaf657bf..0c1d64101 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java @@ -137,7 +137,7 @@ public class SearchService { } public static void clear() { - log.info("clear all trie"); + log.debug("clear all trie"); trie = new BinTrie<>(); suffixTrie = new BinTrie<>(); } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java index 32ca78768..3af36af5f 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java @@ -86,8 +86,6 @@ public class HanlpHelper { */ public static boolean reloadCustomDictionary() throws IOException { - log.info("reloadCustomDictionary start"); - final long startTime = System.currentTimeMillis(); if (HanLP.Config.CustomDictionaryPath == null || HanLP.Config.CustomDictionaryPath.length == 0) { @@ -106,7 +104,10 @@ public class HanlpHelper { SearchService.clear(); boolean reload = getDynamicCustomDictionary().reload(); - log.info("reloadCustomDictionary end ,cost:{},reload:{}", System.currentTimeMillis() - startTime, reload); + if (reload) { + log.info("Custom dictionary has been reloaded in {} milliseconds", + System.currentTimeMillis() - startTime); + } return reload; } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMSqlParser.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMSqlParser.java index 5309a7426..f4c9e377e 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMSqlParser.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMSqlParser.java @@ -35,7 +35,7 @@ public class LLMSqlParser implements SemanticParser { if (dataSetId == null) { return; } - log.info("Generate query statement for dataSetId:{}", dataSetId); + log.info("Try generating query statement for dataSetId:{}", dataSetId); //3.invoke LLM service to do parsing. tryParse(queryCtx, dataSetId); @@ -51,11 +51,11 @@ public class LLMSqlParser implements SemanticParser { LLMReq llmReq = requestService.getLlmReq(queryCtx, dataSetId); - int currentRetry = 0; + int currentRetry = 1; Map sqlRespMap = new HashMap<>(); ParseResult parseResult = null; - while (currentRetry < maxRetries) { - log.info("currentRetry:{},start runText2SQL", currentRetry); + while (currentRetry <= maxRetries) { + log.info("currentRetryRound:{}, start runText2SQL", currentRetry); try { LLMResp llmResp = requestService.runText2SQL(llmReq); if (Objects.nonNull(llmResp)) { @@ -68,7 +68,7 @@ public class LLMSqlParser implements SemanticParser { } } } catch (Exception e) { - log.error("currentRetry:{},runText2SQL error", currentRetry, e); + log.error("currentRetryRound:{}, runText2SQL failed", currentRetry, e); } currentRetry++; } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/DataSourceNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/DataSourceNode.java index 73efd35f9..c1b6fedaf 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/DataSourceNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/DataSourceNode.java @@ -226,14 +226,14 @@ public class DataSourceNode extends SemanticNode { boolean isAllMatch = checkMatch(sourceMeasure, queryDimension, measures, dimension, metricCommand, scope, engineType); if (isAllMatch) { - log.info("baseDataSource match all "); + log.debug("baseDataSource match all "); return dataSources; } // find all dataSource has the same identifiers List linkDataSources = getLinkDataSourcesByJoinRelation(queryDimension, measures, baseDataSource, schema); if (CollectionUtils.isEmpty(linkDataSources)) { - log.info("baseDataSource get by identifiers "); + log.debug("baseDataSource get by identifiers "); Set baseIdentifiers = baseDataSource.getIdentifiers().stream().map(i -> i.getName()) .collect(Collectors.toSet()); if (baseIdentifiers.isEmpty()) { @@ -279,7 +279,7 @@ public class DataSourceNode extends SemanticNode { dimension.retainAll(queryDimension); if (dimension.size() < queryDimension.size()) { - log.info("baseDataSource not match all dimension"); + log.debug("baseDataSource not match all dimension"); isAllMatch = false; } queryDimension.removeAll(dimension); 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 07f6656a6..d4098882b 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 @@ -75,7 +75,7 @@ public class RetrieveServiceImpl implements RetrieveService { dataSetService.getModelIdToDataSetIds(new ArrayList<>(dataSetIdToName.keySet()), User.getFakeUser()); // 2.detect by segment List originals = knowledgeBaseService.getTerms(queryText, modelIdToDataSetIds); - log.info("hanlp parse result: {}", originals); + log.debug("hanlp parse result: {}", originals); Set dataSetIds = queryReq.getDataSetIds(); QueryContext queryContext = new QueryContext(); @@ -100,7 +100,7 @@ public class RetrieveServiceImpl implements RetrieveService { return Lists.newArrayList(); } Map.Entry> searchTextEntry = mostSimilarSearchResult.get(); - log.info("searchTextEntry:{},queryReq:{}", searchTextEntry, queryReq); + log.debug("searchTextEntry:{},queryReq:{}", searchTextEntry, queryReq); Set searchResults = new LinkedHashSet(); DataSetInfoStat dataSetInfoStat = NatureHelper.getDataSetStat(originals); @@ -273,7 +273,7 @@ public class RetrieveServiceImpl implements RetrieveService { Map.Entry> searchTextEntry, Set searchResults) { boolean existMetric = false; - log.info("searchMetricAndDimension searchTextEntry:{}", searchTextEntry); + log.debug("searchMetricAndDimension searchTextEntry:{}", searchTextEntry); MatchText matchText = searchTextEntry.getKey(); List hanlpMapResults = searchTextEntry.getValue(); @@ -301,7 +301,7 @@ public class RetrieveServiceImpl implements RetrieveService { //visibility to filter metrics searchResults.add(searchResult); } - log.info("parseResult:{},dimensionMetricClassIds:{},possibleDataSets:{}", hanlpMapResult, + log.debug("parseResult:{},dimensionMetricClassIds:{},possibleDataSets:{}", hanlpMapResult, dimensionMetricClassIds, possibleDataSets); } log.info("searchMetricAndDimension searchResults:{}", searchResults); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java index 196f40b74..c4bf5ecc7 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java @@ -110,7 +110,7 @@ public class S2SemanticLayerService implements SemanticLayerService { //2.query from cache QueryCache queryCache = ComponentFactory.getQueryCache(); String cacheKey = queryCache.getCacheKey(queryReq); - log.info("cacheKey:{}", cacheKey); + log.debug("cacheKey:{}", cacheKey); Object query = queryCache.query(queryReq, cacheKey); if (Objects.nonNull(query)) { SemanticQueryResp queryResp = (SemanticQueryResp) query; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java index 659c55640..3a1081b5e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/task/MetaEmbeddingTask.java @@ -45,11 +45,12 @@ public class MetaEmbeddingTask implements CommandLineRunner { private void embeddingStorePersistFile() { if (embeddingStoreFactory instanceof InMemoryEmbeddingStoreFactory) { - log.info("start persistFile"); + long startTime = System.currentTimeMillis(); InMemoryEmbeddingStoreFactory inMemoryFactory = (InMemoryEmbeddingStoreFactory) embeddingStoreFactory; inMemoryFactory.persistFile(); - log.info("end persistFile"); + long duration = System.currentTimeMillis() - startTime; + log.info("Embedding file has been regularly persisted in {} milliseconds", duration); } } @@ -63,7 +64,7 @@ public class MetaEmbeddingTask implements CommandLineRunner { */ @Scheduled(cron = "${s2.reload.meta.embedding.corn:0 0 */2 * * ?}") public void reloadMetaEmbedding() { - log.info("reload.meta.embedding start"); + long startTime = System.currentTimeMillis(); try { List metricDataItems = metricService.getDataEvent().getDataItems(); @@ -74,10 +75,10 @@ public class MetaEmbeddingTask implements CommandLineRunner { embeddingService.addQuery(embeddingConfig.getMetaCollectionName(), TextSegmentConvert.convertToEmbedding(dimensionDataItems)); } catch (Exception e) { - log.error("reload.meta.embedding error", e); + log.error("Failed to reload meta embedding.", e); } - - log.info("reload.meta.embedding end"); + long duration = System.currentTimeMillis() - startTime; + log.info("Embedding has been regularly reloaded in {} milliseconds", duration); } @Override diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java index dde8e6597..2f4bd195d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/DictWordService.java @@ -37,15 +37,17 @@ public class DictWordService { } public void reloadDictWord() { + long startTime = System.currentTimeMillis(); List dictWords = getAllDictWords(); List preDictWords = getPreDictWords(); if (org.apache.commons.collections.CollectionUtils.isEqualCollection(dictWords, preDictWords)) { log.debug("Dictionary hasn't been reloaded."); return; } - log.info("Dictionary has been reloaded."); setPreDictWords(dictWords); knowledgeBaseService.updateOnlineKnowledge(getAllDictWords()); + long duration = System.currentTimeMillis() - startTime; + log.info("Dictionary has been regularly reloaded in {} milliseconds", duration); } public List getAllDictWords() {