From 221e88de0f087b5014fd2dd4b3b7cb1811a07b90 Mon Sep 17 00:00:00 2001 From: jerryjzhang Date: Mon, 11 Dec 2023 11:32:18 +0800 Subject: [PATCH] [improvement][common]Replace QueryType.OTHER with ID --- .../chat/api/pojo/SemanticParseInfo.java | 4 ++-- .../chat/parser/QueryTypeParser.java | 6 ++--- .../parser/sql/rule/AgentCheckParser.java | 2 +- .../chat/processor/MetricCheckProcessor.java | 2 +- .../chat/processor/ParseInfoProcessor.java | 2 +- .../query/SimilarMetricQueryResponder.java | 2 +- .../llm/analytics/MetricAnalyzeQuery.java | 2 +- .../chat/query/rule/tag/TagSemanticQuery.java | 2 +- .../chat/service/SemanticService.java | 2 +- .../chat/service/impl/QueryServiceImpl.java | 4 ++-- .../chat/utils/QueryReqBuilder.java | 2 +- .../chat/utils/QueryReqBuilderTest.java | 2 +- .../semantic/RemoteSemanticInterpreter.java | 2 +- .../supersonic/common/pojo/QueryType.java | 23 ------------------- .../supersonic/common/pojo/ResultData.java | 1 + .../common/pojo/enums/QueryType.java | 23 +++++++++++++++++++ .../common/pojo/{ => enums}/ReturnCode.java | 2 +- .../advice/RestExceptionHandler.java | 2 +- .../tencent/supersonic/ChatDemoLoader.java | 2 +- .../integration/MetricQueryTest.java | 2 +- .../integration/MultiTurnsTest.java | 2 +- .../supersonic/integration/TagQueryTest.java | 2 +- .../integration/mapper/MapperTest.java | 2 +- .../api/query/request/QueryStructReq.java | 4 ++-- .../parser/convert/QueryReqConverter.java | 2 +- 25 files changed, 51 insertions(+), 50 deletions(-) delete mode 100644 common/src/main/java/com/tencent/supersonic/common/pojo/QueryType.java create mode 100644 common/src/main/java/com/tencent/supersonic/common/pojo/enums/QueryType.java rename common/src/main/java/com/tencent/supersonic/common/pojo/{ => enums}/ReturnCode.java (91%) diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java index 1ff9501f9..932229726 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java @@ -7,7 +7,7 @@ import com.tencent.supersonic.chat.api.pojo.response.SqlInfo; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.ModelCluster; import com.tencent.supersonic.common.pojo.Order; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.FilterType; import lombok.Data; @@ -42,7 +42,7 @@ public class SemanticParseInfo { private Map properties = new HashMap<>(); private EntityInfo entityInfo; private SqlInfo sqlInfo = new SqlInfo(); - private QueryType queryType = QueryType.OTHER; + private QueryType queryType = QueryType.ID; public String getModelClusterKey() { if (model == null) { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/QueryTypeParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/QueryTypeParser.java index fdec994ae..348ff54c8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/QueryTypeParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/QueryTypeParser.java @@ -12,7 +12,7 @@ import com.tencent.supersonic.chat.api.pojo.response.SqlInfo; import com.tencent.supersonic.chat.query.llm.s2sql.LLMSqlQuery; import com.tencent.supersonic.chat.query.rule.RuleSemanticQuery; import com.tencent.supersonic.chat.service.SemanticService; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; import com.tencent.supersonic.knowledge.service.SchemaService; @@ -50,7 +50,7 @@ public class QueryTypeParser implements SemanticParser { SemanticParseInfo parseInfo = semanticQuery.getParseInfo(); SqlInfo sqlInfo = parseInfo.getSqlInfo(); if (Objects.isNull(sqlInfo) || StringUtils.isBlank(sqlInfo.getS2SQL())) { - return QueryType.OTHER; + return QueryType.ID; } //1. entity queryType Set modelIds = parseInfo.getModel().getModelIds(); @@ -78,7 +78,7 @@ public class QueryTypeParser implements SemanticParser { return QueryType.METRIC; } } - return QueryType.OTHER; + return QueryType.ID; } } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/rule/AgentCheckParser.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/rule/AgentCheckParser.java index 84b7c9327..ce32256a6 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/rule/AgentCheckParser.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/rule/AgentCheckParser.java @@ -11,7 +11,7 @@ import com.tencent.supersonic.chat.api.pojo.ChatContext; import com.tencent.supersonic.chat.api.pojo.QueryContext; import com.tencent.supersonic.chat.query.QueryManager; import com.tencent.supersonic.chat.service.AgentService; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java index 7160df7fa..0449055f8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/MetricCheckProcessor.java @@ -12,7 +12,7 @@ import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; import com.tencent.supersonic.chat.api.pojo.SemanticSchema; import com.tencent.supersonic.chat.api.pojo.response.ParseResp; import com.tencent.supersonic.chat.service.SemanticService; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.jsqlparser.SqlParserRemoveHelper; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/ParseInfoProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/ParseInfoProcessor.java index 6c1277063..3945f0f83 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/ParseInfoProcessor.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/ParseInfoProcessor.java @@ -11,7 +11,7 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryFilter; import com.tencent.supersonic.chat.api.pojo.response.ParseResp; import com.tencent.supersonic.chat.api.pojo.response.SqlInfo; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/SimilarMetricQueryResponder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/SimilarMetricQueryResponder.java index 0a0178ddc..31bee85a3 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/SimilarMetricQueryResponder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/SimilarMetricQueryResponder.java @@ -6,7 +6,7 @@ import com.tencent.supersonic.chat.api.pojo.SchemaElementType; import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo; import com.tencent.supersonic.chat.api.pojo.request.ExecuteQueryReq; import com.tencent.supersonic.chat.api.pojo.response.QueryResult; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ComponentFactory; import com.tencent.supersonic.common.util.embedding.Retrieval; import com.tencent.supersonic.common.util.embedding.RetrieveQuery; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java index ac0b36b81..3e43cf6b1 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java @@ -15,7 +15,7 @@ import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.utils.QueryReqBuilder; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/tag/TagSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/tag/TagSemanticQuery.java index deec86bf3..0486dc617 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/tag/TagSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/tag/TagSemanticQuery.java @@ -8,7 +8,7 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatDefaultRichConfigResp; import com.tencent.supersonic.chat.query.rule.RuleSemanticQuery; import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; import lombok.extern.slf4j.Slf4j; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java index 7deeaae1f..e682ab145 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java @@ -25,7 +25,7 @@ import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf.DateMode; import com.tencent.supersonic.common.pojo.ModelCluster; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.RatioOverType; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java index 3be90e45b..91967ae3f 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java @@ -42,7 +42,7 @@ import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.utils.SolvedQueryManager; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.DictWordType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; @@ -640,7 +640,7 @@ public class QueryServiceImpl implements QueryService { queryStructReq.setDateInfo(dateConf); queryStructReq.setLimit(20L); queryStructReq.setModelId(dimensionValueReq.getModelId()); - queryStructReq.setQueryType(QueryType.OTHER); + queryStructReq.setQueryType(QueryType.ID); List groups = new ArrayList<>(); groups.add(dimensionValueReq.getBizName()); queryStructReq.setGroups(groups); diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java index 50d0d5fac..de8329593 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.Order; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java b/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java index d1f05bf3a..dec5542db 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java @@ -5,7 +5,7 @@ import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf.DateMode; import com.tencent.supersonic.common.pojo.Order; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java index 191097cc7..3434e61b5 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java @@ -7,7 +7,7 @@ import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfi import com.tencent.supersonic.auth.api.authentication.constant.UserConstants; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ResultData; -import com.tencent.supersonic.common.pojo.ReturnCode; +import com.tencent.supersonic.common.pojo.enums.ReturnCode; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.exception.CommonException; import com.tencent.supersonic.common.util.ContextUtils; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/QueryType.java b/common/src/main/java/com/tencent/supersonic/common/pojo/QueryType.java deleted file mode 100644 index 4015cfe22..000000000 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/QueryType.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.tencent.supersonic.common.pojo; - -/*** - * Query Type - */ -public enum QueryType { - /** - * queries with metrics included in the select statement - */ - METRIC, - /** - * queries with only tag included in the select statement - */ - TAG, - /** - * the other queries - */ - OTHER; - - public boolean isNativeAggQuery() { - return TAG.equals(this); - } -} diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/ResultData.java b/common/src/main/java/com/tencent/supersonic/common/pojo/ResultData.java index 12fb49919..d687564c9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/ResultData.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/ResultData.java @@ -1,5 +1,6 @@ package com.tencent.supersonic.common.pojo; +import com.tencent.supersonic.common.pojo.enums.ReturnCode; import com.tencent.supersonic.common.util.TraceIdUtil; import lombok.Data; import org.slf4j.MDC; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/enums/QueryType.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/QueryType.java new file mode 100644 index 000000000..65a6f6a2b --- /dev/null +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/QueryType.java @@ -0,0 +1,23 @@ +package com.tencent.supersonic.common.pojo.enums; + +/** + * Enumerate query types supported by SuperSonic. + */ +public enum QueryType { + /** + * queries with metric calculation (optionally slice and dice by dimensions) + */ + METRIC, + /** + * queries with tag-based entity targeting + */ + TAG, + /** + * queries with ID-based entity selection + */ + ID; + + public boolean isNativeAggQuery() { + return TAG.equals(this); + } +} diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java similarity index 91% rename from common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java rename to common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java index 7ef51c09f..ce56f6279 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/ReturnCode.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/enums/ReturnCode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.pojo; +package com.tencent.supersonic.common.pojo.enums; public enum ReturnCode { SUCCESS(200, "success"), diff --git a/launchers/common/src/main/java/com/tencent/supersonic/advice/RestExceptionHandler.java b/launchers/common/src/main/java/com/tencent/supersonic/advice/RestExceptionHandler.java index d4e4e6324..cbb651a29 100644 --- a/launchers/common/src/main/java/com/tencent/supersonic/advice/RestExceptionHandler.java +++ b/launchers/common/src/main/java/com/tencent/supersonic/advice/RestExceptionHandler.java @@ -5,7 +5,7 @@ import com.tencent.supersonic.common.pojo.exception.CommonException; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.common.pojo.ResultData; -import com.tencent.supersonic.common.pojo.ReturnCode; +import com.tencent.supersonic.common.pojo.enums.ReturnCode; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.ExceptionHandler; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java index 5a4ce0936..4f68c5407 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ChatDemoLoader.java @@ -27,7 +27,7 @@ import com.tencent.supersonic.chat.service.ChatService; import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.chat.service.PluginService; import com.tencent.supersonic.chat.service.QueryService; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.SysParameter; import com.tencent.supersonic.common.service.SysParameterService; import com.tencent.supersonic.common.util.JsonUtil; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java index 12ff3ff36..27354a408 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.chat.query.rule.metric.MetricGroupByQuery; import com.tencent.supersonic.chat.query.rule.metric.MetricModelQuery; import com.tencent.supersonic.chat.query.rule.metric.MetricTopNQuery; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.util.DataUtils; import org.junit.Assert; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MultiTurnsTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MultiTurnsTest.java index c6f9645c9..dc2b792b0 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MultiTurnsTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MultiTurnsTest.java @@ -7,7 +7,7 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.chat.query.rule.metric.MetricFilterQuery; import com.tencent.supersonic.chat.query.rule.metric.MetricGroupByQuery; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.util.DataUtils; import java.text.DateFormat; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/TagQueryTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/TagQueryTest.java index b3410563b..8bbdaaf67 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/TagQueryTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/TagQueryTest.java @@ -8,7 +8,7 @@ import com.tencent.supersonic.chat.query.rule.metric.MetricTagQuery; import com.tencent.supersonic.chat.query.rule.tag.TagFilterQuery; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf.DateMode; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.util.DataUtils; import org.junit.Test; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/mapper/MapperTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/mapper/MapperTest.java index af61e518a..e31204322 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/mapper/MapperTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/mapper/MapperTest.java @@ -9,7 +9,7 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryReq; import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.chat.query.rule.metric.MetricTagQuery; import com.tencent.supersonic.common.pojo.DateConf; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.integration.BaseQueryTest; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.util.DataUtils; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java index 3d7f203f4..e7cc62cd8 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java +++ b/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java @@ -6,7 +6,7 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.Order; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; @@ -61,7 +61,7 @@ public class QueryStructReq { private List params = new ArrayList<>(); private DateConf dateInfo; private Long limit = 2000L; - private QueryType queryType = QueryType.OTHER; + private QueryType queryType = QueryType.ID; private Cache cacheInfo; /** diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java index 71f515ef7..57857af99 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java +++ b/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java @@ -3,7 +3,7 @@ package com.tencent.supersonic.semantic.query.parser.convert; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.common.pojo.QueryType; +import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper;