diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java index d662e152e..7b25c269f 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/config/EntityInternalDetail.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.chat.core.config; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; import java.util.List; import lombok.Data; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java index 8b42787cf..2b8c717dc 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/BaseSemanticInterpreter.java @@ -3,7 +3,7 @@ package com.tencent.supersonic.chat.core.knowledge.semantic; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.tencent.supersonic.chat.api.pojo.ModelSchema; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/LocalSemanticInterpreter.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/LocalSemanticInterpreter.java index f497fc633..41c1f91b8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/LocalSemanticInterpreter.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/LocalSemanticInterpreter.java @@ -5,21 +5,21 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.ExplainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.MetricService; import com.tencent.supersonic.headless.server.service.QueryService; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java index 84dacec24..725ca8315 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/ModelSchemaBuilder.java @@ -9,9 +9,9 @@ import com.tencent.supersonic.chat.api.pojo.SchemaValueMap; import com.tencent.supersonic.headless.api.pojo.DimValueMap; import com.tencent.supersonic.headless.api.pojo.RelateDimension; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/RemoteSemanticInterpreter.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/RemoteSemanticInterpreter.java index 010cdeee1..ba9e38eb8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/RemoteSemanticInterpreter.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/RemoteSemanticInterpreter.java @@ -20,21 +20,21 @@ import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.S2ThreadContext; import com.tencent.supersonic.common.util.ThreadContext; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.ExplainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import java.net.URI; import java.net.URL; import java.util.ArrayList; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/SemanticInterpreter.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/SemanticInterpreter.java index bca60d8d8..1bf90f7f1 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/SemanticInterpreter.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/knowledge/semantic/SemanticInterpreter.java @@ -4,20 +4,20 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.chat.api.pojo.ModelSchema; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.ExplainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import java.util.List; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java index 5f6d99d2a..c1ae12be2 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/parser/sql/llm/LLMRequestService.java @@ -25,7 +25,7 @@ import com.tencent.supersonic.common.pojo.enums.DataFormatTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import java.util.ArrayList; import java.util.Comparator; import java.util.HashSet; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/BaseSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/BaseSemanticQuery.java index eaecdc360..0b3558fbf 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/BaseSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/BaseSemanticQuery.java @@ -14,11 +14,11 @@ import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.Order; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.enums.QueryType; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.enums.QueryType; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/MetricAnalyzeQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/MetricAnalyzeQuery.java index 64a6ff54d..8ffbc6e9f 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/MetricAnalyzeQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/analytics/MetricAnalyzeQuery.java @@ -19,8 +19,8 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/s2sql/LLMSqlQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/s2sql/LLMSqlQuery.java index 7ea44ef5a..749291e2a 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/s2sql/LLMSqlQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/llm/s2sql/LLMSqlQuery.java @@ -11,8 +11,8 @@ import com.tencent.supersonic.chat.core.utils.QueryReqBuilder; import com.tencent.supersonic.chat.core.query.QueryManager; import com.tencent.supersonic.chat.core.query.llm.LLMSemanticQuery; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/RuleSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/RuleSemanticQuery.java index c645c07fc..0c8f76bb0 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/RuleSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/RuleSemanticQuery.java @@ -22,9 +22,9 @@ import com.tencent.supersonic.common.pojo.ModelCluster; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricFilterQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricFilterQuery.java index 9c900fef0..80b1c54ee 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricFilterQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricFilterQuery.java @@ -9,8 +9,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.common.pojo.enums.FilterType; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.Filter; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricSemanticQuery.java index 57e95a24c..9e45e849d 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricSemanticQuery.java @@ -35,8 +35,8 @@ import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.RatioOverType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import java.text.DecimalFormat; import java.time.DayOfWeek; import java.time.LocalDate; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricTagQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricTagQuery.java index fcf238b1d..09c8939ec 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricTagQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/query/rule/metric/MetricTagQuery.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterType; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import java.util.ArrayList; import java.util.HashSet; import java.util.List; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/DictQueryHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/DictQueryHelper.java index 48e6c37f5..cf4a7ccce 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/DictQueryHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/DictQueryHelper.java @@ -18,8 +18,8 @@ import com.tencent.supersonic.common.pojo.Order; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/QueryReqBuilder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/QueryReqBuilder.java index db190ab51..ed72fa06c 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/QueryReqBuilder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/core/utils/QueryReqBuilder.java @@ -13,9 +13,9 @@ 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; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java index 92d0fbff2..140c7d9e0 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatConfigController.java @@ -12,12 +12,12 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp; import com.tencent.supersonic.chat.core.utils.ComponentFactory; import com.tencent.supersonic.chat.server.service.ConfigService; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/SemanticService.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/SemanticService.java index 3afa09d47..4cbbb4d17 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/SemanticService.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/SemanticService.java @@ -26,8 +26,8 @@ import com.tencent.supersonic.common.pojo.ModelCluster; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import java.time.LocalDate; import java.util.ArrayList; import java.util.Collections; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java index 2e8ef402c..ca17ee1d7 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ConfigServiceImpl.java @@ -32,8 +32,8 @@ import com.tencent.supersonic.chat.server.service.ConfigService; import com.tencent.supersonic.chat.server.service.SemanticService; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.MetricService; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java index bd2de4a88..77a82182f 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java @@ -16,7 +16,7 @@ import com.tencent.supersonic.chat.server.persistence.repository.PluginRepositor import com.tencent.supersonic.chat.server.service.PluginService; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java index 3de2d26b7..f437de221 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/QueryServiceImpl.java @@ -63,8 +63,8 @@ import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserRemoveHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/DictMetaHelper.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/DictMetaHelper.java index a601dc233..18bf00e21 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/DictMetaHelper.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/DictMetaHelper.java @@ -17,8 +17,8 @@ import com.tencent.supersonic.chat.core.knowledge.DimValue2DictCommand; import com.tencent.supersonic.chat.core.knowledge.semantic.SemanticInterpreter; import com.tencent.supersonic.chat.server.persistence.dataobject.DimValueDO; import com.tencent.supersonic.chat.server.service.ConfigService; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; diff --git a/chat/server/src/test/java/com/tencent/supersonic/chat/server/test/context/MockBeansConfiguration.java b/chat/server/src/test/java/com/tencent/supersonic/chat/server/test/context/MockBeansConfiguration.java index c31c5dd52..f2d3139a8 100644 --- a/chat/server/src/test/java/com/tencent/supersonic/chat/server/test/context/MockBeansConfiguration.java +++ b/chat/server/src/test/java/com/tencent/supersonic/chat/server/test/context/MockBeansConfiguration.java @@ -15,11 +15,11 @@ import com.tencent.supersonic.chat.server.service.ChatService; import com.tencent.supersonic.chat.server.service.QueryService; import com.tencent.supersonic.chat.server.service.impl.ConfigServiceImpl; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; diff --git a/chat/server/src/test/java/com/tencent/supersonic/chat/server/utils/QueryReqBuilderTest.java b/chat/server/src/test/java/com/tencent/supersonic/chat/server/utils/QueryReqBuilderTest.java index 6b86110b2..ddf32bead 100644 --- a/chat/server/src/test/java/com/tencent/supersonic/chat/server/utils/QueryReqBuilderTest.java +++ b/chat/server/src/test/java/com/tencent/supersonic/chat/server/utils/QueryReqBuilderTest.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; import com.tencent.supersonic.common.util.SqlFilterUtils; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/common/src/main/java/com/tencent/supersonic/common/pojo/Parameter.java b/common/src/main/java/com/tencent/supersonic/common/pojo/Parameter.java index bcba1397f..248ab7a92 100644 --- a/common/src/main/java/com/tencent/supersonic/common/pojo/Parameter.java +++ b/common/src/main/java/com/tencent/supersonic/common/pojo/Parameter.java @@ -16,15 +16,6 @@ public class Parameter { private String dataType; private String module; private List candidateValues; - - public Parameter(String name, String value, String comment, String dataType, String module) { - this.name = name; - this.value = value; - this.comment = comment; - this.dataType = dataType; - this.module = module; - } - public Parameter(String name, String value, String comment, String description, String dataType, String module) { this.name = name; this.value = value; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java index 41dd6cfa1..fb8057d05 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.api.pojo; -import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java index 9f1732e0c..ba2960953 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.api.pojo; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.enums.DimensionType; +import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java index 8c09598ee..8aabc8ae0 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.api.pojo; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import lombok.Data; @Data diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AggOption.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AggOption.java index a8a742e1d..3fdfa574c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AggOption.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; /** * Aggregation type of metric when query metric without aggregation method diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AppStatus.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AppStatus.java index 41d2ad3d7..43ac44fac 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/AppStatus.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum AppStatus { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DataType.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DataType.java index ca7fe9f8a..8ab8c561b 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DataType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; import com.tencent.supersonic.common.pojo.Constants; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DatasourceQuery.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DatasourceQuery.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DatasourceQuery.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DatasourceQuery.java index 7af517604..4d7f4d7ba 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DatasourceQuery.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DatasourceQuery.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; /** * model datasource define type: diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DimensionType.java similarity index 51% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DimensionType.java index 611069992..b23ee68ab 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/DimensionType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum DimensionType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/EngineType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/EngineType.java similarity index 93% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/EngineType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/EngineType.java index 7e3b2a23f..485fa181c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/EngineType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/EngineType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum EngineType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/IdentifyType.java similarity index 50% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/IdentifyType.java index b113cdf66..c0d7b324c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/IdentifyType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum IdentifyType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricDefineType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricDefineType.java similarity index 55% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricDefineType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricDefineType.java index 948dec3a5..1679caefc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricDefineType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricDefineType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum MetricDefineType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricType.java similarity index 96% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricType.java index 52d0ffbc7..4007eb1fe 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/MetricType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; import com.tencent.supersonic.headless.api.pojo.MeasureParam; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/ModelSourceType.java similarity index 94% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/ModelSourceType.java index d454a9577..085d29e9f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/ModelSourceType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; import java.util.Objects; /** diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryOptMode.java similarity index 52% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryOptMode.java index 602058abc..b52ac8652 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryOptMode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum QueryOptMode { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryType.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryType.java index b49be8508..2d54b99ee 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum QueryType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryTypeBack.java similarity index 92% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryTypeBack.java index e847eedea..c3aff9910 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/QueryTypeBack.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum QueryTypeBack { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/SemanticType.java similarity index 56% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/SemanticType.java index cae66da82..4f3289e6a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/SemanticType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.enums; +package com.tencent.supersonic.headless.api.pojo.enums; public enum SemanticType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppQueryReq.java similarity index 83% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppQueryReq.java index 9ea81df1f..05407af24 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppQueryReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; -import com.tencent.supersonic.headless.api.enums.AppStatus; +import com.tencent.supersonic.headless.api.pojo.enums.AppStatus; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppReq.java index 40b238f42..f2005ae9f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/AppReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.headless.api.pojo.AppConfig; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/BatchDownloadReq.java similarity index 80% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/BatchDownloadReq.java index 0f42c50e7..bda5c7452 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/BatchDownloadReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DatabaseReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DatabaseReq.java index 55076f97d..c4270481f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DatabaseReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.enums.DataType; +import com.tencent.supersonic.headless.api.pojo.enums.DataType; import lombok.Data; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DateInfoReq.java similarity index 95% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DateInfoReq.java index 874beaec4..c1d1968cf 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DateInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import java.util.ArrayList; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java similarity index 92% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java index b5abf021e..f7c095727 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimensionReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; import com.tencent.supersonic.headless.api.pojo.DimValueMap; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainReq.java similarity index 93% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainReq.java index 574ca30ba..85c481d51 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.headless.api.pojo.SchemaItem; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainUpdateReq.java similarity index 64% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainUpdateReq.java index 1324b606c..74669c661 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DomainUpdateReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DownloadStructReq.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DownloadStructReq.java index 00019ca94..c9c967e1b 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DownloadStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ExplainSqlReq.java similarity index 70% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ExplainSqlReq.java index 9f7c74507..5502e61ce 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ExplainSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; -import com.tencent.supersonic.headless.api.enums.QueryType; +import com.tencent.supersonic.headless.api.pojo.enums.QueryType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/FieldRemovedReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/FieldRemovedReq.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/FieldRemovedReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/FieldRemovedReq.java index 1fb38e764..c539e2843 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/FieldRemovedReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/FieldRemovedReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemUseReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemUseReq.java index 1b63ecf19..2ca79ea4e 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ItemUseReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import java.util.List; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetaBatchReq.java similarity index 70% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetaBatchReq.java index 398e9421d..88a3c87be 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetaBatchReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricBaseReq.java similarity index 93% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricBaseReq.java index 22b33412b..c3e8f183c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricBaseReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.DataFormat; import com.tencent.supersonic.headless.api.pojo.RelateDimension; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricQueryReq.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricQueryReq.java index fe00a64d6..36f10d830 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricQueryReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.ColumnOrder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricReq.java similarity index 87% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricReq.java index 6e70dc183..d25204d7d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/MetricReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.alibaba.fastjson.JSONObject; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; -import com.tencent.supersonic.headless.api.enums.MetricType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricType; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelReq.java similarity index 96% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelReq.java index f6be9aa92..20c83f4c5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelReq.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; +import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaFilterReq.java similarity index 76% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaFilterReq.java index e34419eff..b9f27e052 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelSchemaFilterReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageDimensionReq.java similarity index 67% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageDimensionReq.java index 1afae7c49..177d7ed33 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageDimensionReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageMetricReq.java similarity index 66% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageMetricReq.java index 2a0740f5a..aca8caf69 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageMetricReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java index 589293f0e..6ddc77a79 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ParseSqlReq.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ParseSqlReq.java index 98ea15d7d..f2d121c33 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ParseSqlReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.headless.api.pojo.MetricTable; import java.util.HashMap; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDimValueReq.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDimValueReq.java index a34e5512d..cfaa74f6f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryDimValueReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java index a5e573ad6..63101182c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryItemReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryMultiStructReq.java similarity index 94% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryMultiStructReq.java index bb7724998..3ad0b4f40 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryMultiStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.alibaba.fastjson.JSONObject; import com.tencent.supersonic.headless.api.pojo.Cache; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QuerySqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QuerySqlReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QuerySqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QuerySqlReq.java index f1af2ce4e..ddd1128a9 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QuerySqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QuerySqlReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java similarity index 99% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java index 20e7c0dce..911e50907 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Aggregator; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SchemaItemQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java similarity index 87% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SchemaItemQueryReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java index f4b2ed352..13b45af7a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SchemaItemQueryReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SchemaItemQueryReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SemanticQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SemanticQueryReq.java similarity index 95% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SemanticQueryReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SemanticQueryReq.java index 85c2a1652..1624bbbb3 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SemanticQueryReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SemanticQueryReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import com.google.common.collect.Lists; import com.tencent.supersonic.headless.api.pojo.Cache; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java index a23a38b49..2022a12d5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import javax.validation.constraints.NotBlank; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ViewInfoReq.java similarity index 83% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ViewInfoReq.java index 3a631703f..e1777b0c3 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ViewInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.request; +package com.tencent.supersonic.headless.api.pojo.request; import java.util.Date; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppDetailResp.java similarity index 64% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppDetailResp.java index 2202cbb29..62f76fba7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppDetailResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppResp.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppResp.java index cd6db8fea..f6fa4f3ce 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/AppResp.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.headless.api.enums.AppStatus; +import com.tencent.supersonic.headless.api.pojo.enums.AppStatus; import com.tencent.supersonic.headless.api.pojo.AppConfig; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DatabaseResp.java similarity index 96% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DatabaseResp.java index a1e87de2c..6ef425172 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DatabaseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java index 598d4114a..83b779b05 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimensionResp.java similarity index 92% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimensionResp.java index 692eef73b..ce2de52f1 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DimensionResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DomainResp.java similarity index 94% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DomainResp.java index 01e5a6353..d615f8ae0 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DomainResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ExplainResp.java similarity index 83% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ExplainResp.java index d7198ba24..4f2730506 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ExplainResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemQueryResultResp.java similarity index 80% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemQueryResultResp.java index 88513343f..d41793a34 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemQueryResultResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult; import lombok.Builder; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemUseResp.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemUseResp.java index a78f0b904..933a0eba2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ItemUseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MeasureResp.java similarity index 87% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MeasureResp.java index 77e6673c2..4ee4ff0be 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MeasureResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricResp.java similarity index 95% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricResp.java index 8378a56a9..5c63510ef 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricResp.java @@ -1,15 +1,15 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; -import com.tencent.supersonic.headless.api.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import lombok.ToString; import org.apache.commons.collections.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricSchemaResp.java similarity index 73% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricSchemaResp.java index 7707f9e88..117a4d2f9 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java similarity index 97% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java index 42df76cd1..c6b661c6a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.google.common.collect.Lists; import com.tencent.supersonic.headless.api.pojo.Dim; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaRelaResp.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaRelaResp.java index cf8104005..c52703ca5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaRelaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaResp.java similarity index 93% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaResp.java index cb0be3692..f96617aeb 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.headless.api.pojo.Identify; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SemanticQueryResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SemanticQueryResp.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SemanticQueryResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SemanticQueryResp.java index 985221f47..462601604 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SemanticQueryResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SemanticQueryResp.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.QueryAuthorization; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.headless.api.enums.SemanticType; import com.tencent.supersonic.headless.api.pojo.QueryResult; +import com.tencent.supersonic.headless.api.pojo.enums.SemanticType; import lombok.Data; import lombok.ToString; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SqlParserResp.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SqlParserResp.java index df0b0c8b5..68ecded0e 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/SqlParserResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/UnAvailableItemResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/UnAvailableItemResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/api/response/UnAvailableItemResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/UnAvailableItemResp.java index f7d1da66a..7553f8be4 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/UnAvailableItemResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/UnAvailableItemResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.api.response; +package com.tencent.supersonic.headless.api.pojo.response; import lombok.Builder; import lombok.Data; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java index d1e0734c4..08c1f245d 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.adaptor.db; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import java.util.HashMap; import java.util.Map; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/QueryCache.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/QueryCache.java index 7c6a1bf8e..b964498df 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/QueryCache.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/cache/QueryCache.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.cache; import com.tencent.supersonic.headless.api.pojo.Cache; -import com.tencent.supersonic.headless.api.request.SemanticQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; import java.util.List; import java.util.Objects; import java.util.concurrent.CompletableFuture; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java index 1d99e851d..8beb11673 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.executor; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.pojo.Database; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.SqlUtils; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java index 452f2eec2..c8bf7ad83 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.executor; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.pojo.QueryStatement; /** diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java index da0d8701b..145ba1a13 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java @@ -2,12 +2,12 @@ package com.tencent.supersonic.headless.core.parser; import com.google.common.base.Strings; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; import com.tencent.supersonic.headless.api.pojo.MetricTable; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.request.SqlExecuteReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq; import com.tencent.supersonic.headless.core.parser.converter.HeadlessConverter; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.ComponentFactory; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java index fd5dbc93d..0f2075d2a 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.parser; -import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; import com.tencent.supersonic.headless.core.pojo.QueryStatement; public interface SqlParser { diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java index 77534b5c6..aa034746c 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.SqlParser; import com.tencent.supersonic.headless.core.parser.calcite.planner.AggPlanner; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/Configuration.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/Configuration.java index 05868881b..ee8fa5791 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/Configuration.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/Configuration.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlTypeFactoryImpl; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlDialect; import com.tencent.supersonic.headless.core.parser.calcite.schema.ViewExpanderImpl; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java index 98fb3f1a1..4c6f8de44 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.core.parser.calcite.planner; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java index 164e7d51e..09a069c80 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.planner; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.pojo.QueryStatement; /** diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/schema/SchemaBuilder.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/schema/SchemaBuilder.java index 01104a91a..f65a3e2dd 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/schema/SchemaBuilder.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/schema/SchemaBuilder.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.schema; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.sql.S2SQLSqlValidatorImpl; import java.util.Collections; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java index e70557b5b..10cf47e43 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MeasureNode; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MetricNode; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/AggFunctionNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/AggFunctionNode.java index d385291b3..e59fbded9 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/AggFunctionNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/AggFunctionNode.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import java.util.Objects; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.validate.SqlValidatorScope; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java index 69e22b1b1..7ee3f36c8 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DimensionNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DimensionNode.java index dbfbb8d32..bee6a3411 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DimensionNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DimensionNode.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; import java.util.List; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/IdentifyNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/IdentifyNode.java index 51f6028a4..5253405b7 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/IdentifyNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/IdentifyNode.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify.Type; import java.util.List; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MeasureNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MeasureNode.java index 853cafe59..82a76f3de 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MeasureNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MeasureNode.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Measure; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.validate.SqlValidatorScope; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MetricNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MetricNode.java index 03b89e97a..dc7ecc548 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MetricNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/MetricNode.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema; import java.util.HashMap; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/SemanticNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/SemanticNode.java index 03bfbb000..cbb1c0d70 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/SemanticNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/SemanticNode.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java index 75f74b59e..a421ecc5b 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java index 63728bcf6..08dfcafdd 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java index d64f79b6c..182cf23a4 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.common.pojo.ColumnOrder; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java index d74331dab..017c75f17 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/CalculateAggConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/CalculateAggConverter.java index 78f33c4b1..212925c22 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/CalculateAggConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/CalculateAggConverter.java @@ -5,11 +5,11 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.api.pojo.MetricTable; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.core.pojo.Database; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java index 389ad476f..23ea8bf6a 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.parser.converter; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import lombok.extern.slf4j.Slf4j; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/ParserDefaultConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/ParserDefaultConverter.java index 11686969e..58bdc970d 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/ParserDefaultConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/ParserDefaultConverter.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.core.parser.converter; import com.tencent.supersonic.common.pojo.ColumnOrder; import com.tencent.supersonic.headless.api.pojo.Param; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/DetailQueryOptimizer.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/DetailQueryOptimizer.java index b1206db8e..e1205f3f4 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/DetailQueryOptimizer.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/DetailQueryOptimizer.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.planner; import com.google.common.base.Strings; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/JdbcDataSource.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/JdbcDataSource.java index ae2b2646f..9de6c5bc5 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/JdbcDataSource.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/JdbcDataSource.java @@ -6,7 +6,7 @@ import com.alibaba.druid.filter.Filter; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.wall.WallConfig; import com.alibaba.druid.wall.WallFilter; -import com.tencent.supersonic.headless.api.enums.DataType; +import com.tencent.supersonic.headless.api.pojo.enums.DataType; import com.tencent.supersonic.headless.core.utils.JdbcDataSourceUtils; import java.util.Arrays; import java.util.Map; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/QueryStatement.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/QueryStatement.java index f8fd9d588..afd34fca9 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/QueryStatement.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/QueryStatement.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.pojo; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel; import java.util.List; import lombok.Data; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/JdbcDataSourceUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/JdbcDataSourceUtils.java index 49967ca82..313dce312 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/JdbcDataSourceUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/JdbcDataSourceUtils.java @@ -11,7 +11,7 @@ import static com.tencent.supersonic.common.pojo.Constants.SPACE; import com.alibaba.druid.util.StringUtils; import com.tencent.supersonic.common.util.MD5Util; -import com.tencent.supersonic.headless.api.enums.DataType; +import com.tencent.supersonic.headless.api.pojo.enums.DataType; import com.tencent.supersonic.headless.core.pojo.Database; import com.tencent.supersonic.headless.core.pojo.JdbcDataSource; import java.sql.Connection; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlDialectFactory.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlDialectFactory.java index 26a354f3c..118bb4cb1 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlDialectFactory.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlDialectFactory.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.utils; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlDialect; import java.util.HashMap; import java.util.Map; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java index f67c91e4a..600346dd4 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java @@ -17,13 +17,13 @@ import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.common.util.StringUtil; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.Measure; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.Collections; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlUtils.java index 9a5312a99..ca6834628 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlUtils.java @@ -4,8 +4,8 @@ import static com.tencent.supersonic.common.pojo.Constants.AT_SYMBOL; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.headless.api.enums.DataType; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.enums.DataType; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.pojo.Database; import com.tencent.supersonic.headless.core.pojo.JdbcDataSource; import java.rmi.ServerException; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java index e662e855d..311f3e124 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SysTimeDimensionBuilder.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.utils; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.headless.api.enums.DimensionType; +import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptor; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java index c5c6bb871..65656eb37 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/ApiHeaderCheckAspect.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.aspect; import com.tencent.supersonic.common.pojo.Pair; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.SignatureUtils; -import com.tencent.supersonic.headless.api.enums.AppStatus; -import com.tencent.supersonic.headless.api.response.AppDetailResp; +import com.tencent.supersonic.headless.api.pojo.enums.AppStatus; +import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; import com.tencent.supersonic.headless.server.service.AppService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/AuthCheckBaseAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/AuthCheckBaseAspect.java index db9ae16ea..ffaf97c5e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/AuthCheckBaseAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/AuthCheckBaseAspect.java @@ -16,10 +16,10 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.MetricService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java index ed9c29a9b..0e99d1b54 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java @@ -8,11 +8,11 @@ import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.api.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2SQLDataAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2SQLDataAspect.java index b288e22a0..a5f5a9ec3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2SQLDataAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2SQLDataAspect.java @@ -9,10 +9,10 @@ import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResource import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.service.DimensionService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/StructDataAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/StructDataAspect.java index 86eae6bf1..36bc32a2a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/StructDataAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/StructDataAspect.java @@ -7,10 +7,10 @@ import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResource import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.utils.QueryStructUtils; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/DimensionYamlManager.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/DimensionYamlManager.java index 830836310..24940bb0c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/DimensionYamlManager.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/DimensionYamlManager.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.manager; -import com.tencent.supersonic.headless.api.enums.IdentifyType; -import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.enums.IdentifyType; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/MetricYamlManager.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/MetricYamlManager.java index ba65e6ac6..d7bf12660 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/MetricYamlManager.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/MetricYamlManager.java @@ -1,14 +1,14 @@ package com.tencent.supersonic.headless.server.manager; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.FieldParam; import com.tencent.supersonic.headless.api.pojo.MeasureParam; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; import com.tencent.supersonic.headless.api.pojo.MetricParam; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.yaml.FieldParamYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MeasureYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricParamYamlTpl; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java index f15e97dbb..1ae4d7f57 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java @@ -1,13 +1,13 @@ package com.tencent.supersonic.headless.server.manager; -import com.tencent.supersonic.headless.api.enums.DatasourceQuery; -import com.tencent.supersonic.headless.api.enums.ModelSourceType; +import com.tencent.supersonic.headless.api.pojo.enums.DatasourceQuery; +import com.tencent.supersonic.headless.api.pojo.enums.ModelSourceType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.Identify; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptor; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptorFactory; import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java index 5613ceb68..7aea80e1d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java @@ -6,7 +6,7 @@ import com.google.common.cache.LoadingCache; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.headless.api.pojo.Field; -import com.tencent.supersonic.headless.api.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataType; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/mapper/StatMapper.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/mapper/StatMapper.java index 3d8f58ca5..967c0ff15 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/mapper/StatMapper.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/mapper/StatMapper.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.server.persistence.mapper; import com.tencent.supersonic.headless.api.pojo.QueryStat; -import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/DateInfoRepository.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/DateInfoRepository.java index 52669db34..5bf403ea1 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/DateInfoRepository.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/DateInfoRepository.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.server.persistence.repository; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.request.DateInfoReq; +import com.tencent.supersonic.headless.api.pojo.request.DateInfoReq; import com.tencent.supersonic.headless.server.persistence.dataobject.DateInfoDO; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/StatRepository.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/StatRepository.java index 56a012284..8f9fac9d6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/StatRepository.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/StatRepository.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.persistence.repository; import com.tencent.supersonic.headless.api.pojo.QueryStat; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; import java.util.List; public interface StatRepository { diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DateInfoRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DateInfoRepositoryImpl.java index a5591bdd9..85ae4b17a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DateInfoRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DateInfoRepositoryImpl.java @@ -5,7 +5,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Stopwatch; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.request.DateInfoReq; +import com.tencent.supersonic.headless.api.pojo.request.DateInfoReq; import com.tencent.supersonic.headless.server.persistence.dataobject.DateInfoDO; import com.tencent.supersonic.headless.server.persistence.mapper.DateInfoMapper; import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRepository; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java index f1eaa5609..568bbef5a 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/StatRepositoryImpl.java @@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.headless.api.pojo.QueryStat; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; import com.tencent.supersonic.headless.server.persistence.mapper.StatMapper; import com.tencent.supersonic.headless.server.persistence.repository.StatRepository; import lombok.SneakyThrows; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DbParameterFactory.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DbParameterFactory.java index b809254d9..ff40c818c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DbParameterFactory.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DbParameterFactory.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.server.pojo; -import com.tencent.supersonic.headless.api.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; import java.util.LinkedHashMap; import java.util.Map; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java index af89bbdb2..a4e39f695 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.server.pojo.yaml; -import com.tencent.supersonic.headless.api.enums.ModelSourceType; +import com.tencent.supersonic.headless.api.pojo.enums.ModelSourceType; import com.tencent.supersonic.headless.api.pojo.Field; import lombok.Data; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java index a47c0eddc..340120884 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/AppController.java @@ -3,10 +3,10 @@ package com.tencent.supersonic.headless.server.rest; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.headless.api.request.AppQueryReq; -import com.tencent.supersonic.headless.api.request.AppReq; -import com.tencent.supersonic.headless.api.response.AppDetailResp; -import com.tencent.supersonic.headless.api.response.AppResp; +import com.tencent.supersonic.headless.api.pojo.request.AppQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.AppReq; +import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; +import com.tencent.supersonic.headless.api.pojo.response.AppResp; import com.tencent.supersonic.headless.server.service.AppService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java index b8e5ef6bb..8a28c2c74 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java @@ -2,10 +2,10 @@ package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.headless.api.request.DatabaseReq; -import com.tencent.supersonic.headless.api.request.SqlExecuteReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; +import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.pojo.DatabaseParameter; import com.tencent.supersonic.headless.server.service.DatabaseService; import java.util.Map; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java index 5dc1e2257..5f1329aef 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DimensionController.java @@ -6,10 +6,10 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.headless.api.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java index c0d5ccb40..bb6b11be9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DomainController.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.headless.api.request.DomainReq; -import com.tencent.supersonic.headless.api.request.DomainUpdateReq; -import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.request.DomainReq; +import com.tencent.supersonic.headless.api.pojo.request.DomainUpdateReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import com.tencent.supersonic.headless.server.service.DomainService; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java index 39f6e0d4c..5125a38cf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/MetricController.java @@ -8,11 +8,11 @@ import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.MetricBaseReq; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricBaseReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.MetricFilter; import com.tencent.supersonic.headless.server.service.MetricService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java index 4d7fa25d3..795c4458c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ModelController.java @@ -3,12 +3,12 @@ package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.FieldRemovedReq; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.ModelReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.UnAvailableItemResp; +import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp; import com.tencent.supersonic.headless.server.pojo.ModelFilter; import com.tencent.supersonic.headless.server.service.ModelService; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryController.java index b2e0f92d7..2eea08787 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/QueryController.java @@ -3,22 +3,22 @@ package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.enums.QueryType; -import com.tencent.supersonic.headless.api.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.request.DownloadStructReq; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.request.QueryItemReq; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.ExplainResp; -import com.tencent.supersonic.headless.api.response.ItemQueryResultResp; -import com.tencent.supersonic.headless.api.response.ItemUseResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; -import com.tencent.supersonic.headless.api.response.SqlParserResp; +import com.tencent.supersonic.headless.api.pojo.enums.QueryType; +import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.pojo.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryItemReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemQueryResultResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.response.SqlParserResp; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.server.service.DownloadService; import com.tencent.supersonic.headless.server.service.QueryService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java index 6cb6753bd..6aa6fb660 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/SchemaController.java @@ -4,15 +4,15 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.request.SchemaItemQueryReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.request.SchemaItemQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.service.SchemaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ViewInfoController.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ViewInfoController.java index 28bb20b32..b39816e88 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ViewInfoController.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ViewInfoController.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.headless.api.request.ViewInfoReq; -import com.tencent.supersonic.headless.api.response.ModelSchemaRelaResp; +import com.tencent.supersonic.headless.api.pojo.request.ViewInfoReq; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaRelaResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ViewInfoDO; import com.tencent.supersonic.headless.server.service.impl.ViewInfoServiceImpl; import org.springframework.web.bind.annotation.DeleteMapping; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java index c260da0d5..4d576a7c2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/AppService.java @@ -3,10 +3,10 @@ package com.tencent.supersonic.headless.server.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.request.AppQueryReq; -import com.tencent.supersonic.headless.api.request.AppReq; -import com.tencent.supersonic.headless.api.response.AppDetailResp; -import com.tencent.supersonic.headless.api.response.AppResp; +import com.tencent.supersonic.headless.api.pojo.request.AppQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.AppReq; +import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; +import com.tencent.supersonic.headless.api.pojo.response.AppResp; public interface AppService { diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/Catalog.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/Catalog.java index 260cab482..eb60e6474 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/Catalog.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/Catalog.java @@ -3,11 +3,11 @@ package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java index 57237e30f..b255d50eb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.request.DatabaseReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.pojo.DatabaseParameter; import java.util.List; import java.util.Map; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java index 0b20bf7ac..2015def62 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java @@ -4,10 +4,10 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.headless.api.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java index 48e79c946..4d82b26aa 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DomainService.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.DomainReq; -import com.tencent.supersonic.headless.api.request.DomainUpdateReq; -import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.request.DomainReq; +import com.tencent.supersonic.headless.api.pojo.request.DomainUpdateReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import java.util.List; import java.util.Map; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java index a9667d46a..45ecfc37b 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DownloadService.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.pojo.request.DownloadStructReq; import javax.servlet.http.HttpServletResponse; public interface DownloadService { diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java index 51aae99ed..4d710bd4c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/MetricService.java @@ -5,11 +5,11 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.MetricBaseReq; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricBaseReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java index b0327b279..b971c7eb6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java @@ -4,14 +4,14 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.request.FieldRemovedReq; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.ModelReq; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.UnAvailableItemResp; +import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp; import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryService.java index ceca84b7c..3f452657c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/QueryService.java @@ -1,23 +1,23 @@ package com.tencent.supersonic.headless.server.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.request.QueryItemReq; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.ExplainResp; -import com.tencent.supersonic.headless.api.response.ItemQueryResultResp; -import com.tencent.supersonic.headless.api.response.ItemUseResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryItemReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemQueryResultResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.server.annotation.ApiHeaderCheck; - -import javax.servlet.http.HttpServletRequest; import java.util.List; +import javax.servlet.http.HttpServletRequest; public interface QueryService { @@ -25,6 +25,8 @@ public interface QueryService { SemanticQueryResp queryByStruct(QueryStructReq queryStructCmd, User user) throws Exception; + SemanticQueryResp queryBySemanticQuery(SemanticQueryReq semanticQueryReq, User user) throws Exception; + SemanticQueryResp queryByStructWithAuth(QueryStructReq queryStructCmd, User user) throws Exception; SemanticQueryResp queryByMultiStruct(QueryMultiStructReq queryMultiStructCmd, User user) throws Exception; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java index bc52a6e40..2e3b55607 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/SchemaService.java @@ -3,15 +3,15 @@ package com.tencent.supersonic.headless.server.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.request.SchemaItemQueryReq; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.request.SchemaItemQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import java.util.List; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java index bceec6898..b17830202 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/AppServiceImpl.java @@ -10,14 +10,14 @@ import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.PageUtils; -import com.tencent.supersonic.headless.api.enums.AppStatus; +import com.tencent.supersonic.headless.api.pojo.enums.AppStatus; import com.tencent.supersonic.headless.api.pojo.AppConfig; -import com.tencent.supersonic.headless.api.request.AppQueryReq; -import com.tencent.supersonic.headless.api.request.AppReq; -import com.tencent.supersonic.headless.api.response.AppDetailResp; -import com.tencent.supersonic.headless.api.response.AppResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.request.AppQueryReq; +import com.tencent.supersonic.headless.api.pojo.request.AppReq; +import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; +import com.tencent.supersonic.headless.api.pojo.response.AppResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.persistence.dataobject.AppDO; import com.tencent.supersonic.headless.server.persistence.mapper.AppMapper; import com.tencent.supersonic.headless.server.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java index d7de1d371..cd8838a33 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java @@ -3,12 +3,12 @@ package com.tencent.supersonic.headless.server.service.impl; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl; import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java index 81e48422f..910633085 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.headless.server.service.impl; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.request.DatabaseReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptor; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptorFactory; import com.tencent.supersonic.headless.core.pojo.Database; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java index 5edf4fc4a..9c43c7bc3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java @@ -17,13 +17,13 @@ import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.ChatGptHelper; import com.tencent.supersonic.headless.api.pojo.DimValueMap; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DimensionDO; import com.tencent.supersonic.headless.server.persistence.repository.DimensionRepository; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java index 775b32708..b82849c57 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DomainServiceImpl.java @@ -6,10 +6,10 @@ import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.headless.api.request.DomainReq; -import com.tencent.supersonic.headless.api.request.DomainUpdateReq; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.DomainReq; +import com.tencent.supersonic.headless.api.pojo.request.DomainUpdateReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DomainDO; import com.tencent.supersonic.headless.server.persistence.repository.DomainRepository; import com.tencent.supersonic.headless.server.service.DomainService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java index ab39c4155..49a600aaf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java @@ -12,17 +12,17 @@ import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.headless.api.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.request.DownloadStructReq; -import com.tencent.supersonic.headless.api.enums.SemanticType; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.pojo.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.pojo.enums.SemanticType; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.utils.DataTransformUtils; import com.tencent.supersonic.headless.server.pojo.DataDownload; import com.tencent.supersonic.headless.server.service.DownloadService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java index 1dda69657..a1148a8a3 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java @@ -14,17 +14,17 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.ChatGptHelper; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.MetricParam; import com.tencent.supersonic.headless.api.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.MetricBaseReq; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricBaseReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.CollectDO; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricQueryDefaultConfigDO; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java index accab3969..50aad4483 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java @@ -15,22 +15,22 @@ import com.tencent.supersonic.headless.api.pojo.Identify; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.request.DateInfoReq; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.request.FieldRemovedReq; -import com.tencent.supersonic.headless.api.request.MetaBatchReq; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.request.ModelReq; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.UnAvailableItemResp; +import com.tencent.supersonic.headless.api.pojo.request.DateInfoReq; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq; +import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp; import com.tencent.supersonic.headless.server.manager.DimensionYamlManager; import com.tencent.supersonic.headless.server.manager.MetricYamlManager; import com.tencent.supersonic.headless.server.manager.ModelYamlManager; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryServiceImpl.java index 2916dc752..15d6aed9c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryServiceImpl.java @@ -14,28 +14,29 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.enums.QueryType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.Item; import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult; -import com.tencent.supersonic.headless.api.request.ExplainSqlReq; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QueryDimValueReq; -import com.tencent.supersonic.headless.api.request.QueryItemReq; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.AppDetailResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.ExplainResp; -import com.tencent.supersonic.headless.api.response.ItemQueryResultResp; -import com.tencent.supersonic.headless.api.response.ItemUseResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryItemReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.AppDetailResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.ExplainResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemQueryResultResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; +import com.tencent.supersonic.headless.core.cache.QueryCache; import com.tencent.supersonic.headless.core.executor.QueryExecutor; import com.tencent.supersonic.headless.core.parser.DefaultQueryParser; import com.tencent.supersonic.headless.core.parser.QueryParser; @@ -45,7 +46,6 @@ import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.server.annotation.S2SQLDataPermission; import com.tencent.supersonic.headless.server.annotation.StructDataPermission; import com.tencent.supersonic.headless.server.aspect.ApiHeaderCheckAspect; -import com.tencent.supersonic.headless.core.cache.QueryCache; import com.tencent.supersonic.headless.server.manager.SemanticSchemaManager; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; import com.tencent.supersonic.headless.server.service.AppService; @@ -114,36 +114,12 @@ public class QueryServiceImpl implements QueryService { @S2SQLDataPermission @SneakyThrows public SemanticQueryResp queryBySql(QuerySqlReq querySQLReq, User user) { - TaskStatusEnum state = TaskStatusEnum.SUCCESS; - try { - //1.initStatInfo - statUtils.initStatInfo(querySQLReq, user); - //2.query from cache - Object query = queryCache.query(querySQLReq); - if (Objects.nonNull(query)) { - return (SemanticQueryResp) query; - } - StatUtils.get().setUseResultCache(false); - //3 query from db - QueryStatement queryStatement = convertToQueryStatement(querySQLReq, user); - log.info("queryStatement:{}", queryStatement); - SemanticQueryResp result = query(queryStatement); - //4 reset cache and set stateInfo - Boolean setCacheSuccess = queryCache.put(querySQLReq, result); - if (setCacheSuccess) { - // if semanticQueryResp is not null, update cache data - statUtils.updateResultCacheKey(queryCache.getCacheKey(querySQLReq)); - } - if (Objects.isNull(result)) { - state = TaskStatusEnum.ERROR; - } - return result; - } catch (Exception e) { - log.info("convertToQueryStatement has a exception:", e); - throw e; - } finally { - statUtils.statInfo2DbAsync(state); - } + return queryBySemanticQuery(querySQLReq, user); + } + + @Override + public SemanticQueryResp queryByStruct(QueryStructReq queryStructCmd, User user) throws Exception { + return queryBySemanticQuery(queryStructCmd, user); } public SemanticQueryResp queryByQueryStatement(QueryStatement queryStatement) { @@ -161,7 +137,7 @@ public class QueryServiceImpl implements QueryService { } - private QueryStatement convertToQueryStatement(QuerySqlReq querySQLReq, User user) throws Exception { + private QueryStatement buildSqlQueryStatement(QuerySqlReq querySQLReq, User user) throws Exception { ModelSchemaFilterReq filter = new ModelSchemaFilterReq(); filter.setModelIds(querySQLReq.getModelIds()); SchemaService schemaService = ContextUtils.getBean(SchemaService.class); @@ -175,26 +151,26 @@ public class QueryServiceImpl implements QueryService { } @Override - public SemanticQueryResp queryByStruct(QueryStructReq queryStructReq, User user) throws Exception { + public SemanticQueryResp queryBySemanticQuery(SemanticQueryReq semanticQueryReq, User user) throws Exception { TaskStatusEnum state = TaskStatusEnum.SUCCESS; - log.info("[queryStructReq:{}]", queryStructReq); + log.info("[semanticQueryReq:{}]", semanticQueryReq); try { //1.initStatInfo - statUtils.initStatInfo(queryStructReq, user); + statUtils.initStatInfo(semanticQueryReq, user); //2.query from cache - Object query = queryCache.query(queryStructReq); + Object query = queryCache.query(semanticQueryReq); if (Objects.nonNull(query)) { return (SemanticQueryResp) query; } StatUtils.get().setUseResultCache(false); //3 query - QueryStatement queryStatement = buildQueryStatement(queryStructReq); + QueryStatement queryStatement = buildQueryStatement(semanticQueryReq, user); SemanticQueryResp result = query(queryStatement); //4 reset cache and set stateInfo - Boolean setCacheSuccess = queryCache.put(queryStructReq, result); + Boolean setCacheSuccess = queryCache.put(semanticQueryReq, result); if (setCacheSuccess) { // if result is not null, update cache data - statUtils.updateResultCacheKey(queryCache.getCacheKey(queryStructReq)); + statUtils.updateResultCacheKey(queryCache.getCacheKey(semanticQueryReq)); } if (Objects.isNull(result)) { state = TaskStatusEnum.ERROR; @@ -209,7 +185,20 @@ public class QueryServiceImpl implements QueryService { } } - private QueryStatement buildQueryStatement(QueryStructReq queryStructReq) throws Exception { + private QueryStatement buildQueryStatement(SemanticQueryReq semanticQueryReq, User user) throws Exception { + if (semanticQueryReq instanceof QuerySqlReq) { + return buildSqlQueryStatement((QuerySqlReq) semanticQueryReq, user); + } + if (semanticQueryReq instanceof QueryStructReq) { + return buildStructQueryStatement((QueryStructReq) semanticQueryReq, user); + } + if (semanticQueryReq instanceof QueryMultiStructReq) { + return buildMultiStructQueryStatement((QueryMultiStructReq) semanticQueryReq, user); + } + return null; + } + + private QueryStatement buildStructQueryStatement(QueryStructReq queryStructReq, User user) throws Exception { QueryStatement queryStatement = new QueryStatement(); queryStatement.setQueryStructReq(queryStructReq); queryStatement.setIsS2SQL(false); @@ -220,10 +209,11 @@ public class QueryServiceImpl implements QueryService { return queryStatement; } - private QueryStatement buildQueryStatement(QueryMultiStructReq queryMultiStructReq) throws Exception { + private QueryStatement buildMultiStructQueryStatement(QueryMultiStructReq queryMultiStructReq, User user) + throws Exception { List sqlParsers = new ArrayList<>(); for (QueryStructReq queryStructReq : queryMultiStructReq.getQueryStructReqs()) { - QueryStatement queryStatement = buildQueryStatement(queryStructReq); + QueryStatement queryStatement = buildQueryStatement(queryStructReq, user); SemanticModel semanticModel = semanticSchemaManager.get(queryStructReq.getModelIdStr()); queryStatement.setModelIds(queryStatement.getQueryStructReq().getModelIds()); queryStatement.setSemanticModel(semanticModel); @@ -259,7 +249,7 @@ public class QueryServiceImpl implements QueryService { //3.parse and optimizer List sqlParsers = new ArrayList<>(); for (QueryStructReq queryStructReq : queryMultiStructReq.getQueryStructReqs()) { - QueryStatement queryStatement = buildQueryStatement(queryStructReq); + QueryStatement queryStatement = buildQueryStatement(queryStructReq, user); queryParser.parse(queryStatement); queryPlanner.plan(queryStatement); sqlParsers.add(queryStatement); @@ -294,7 +284,7 @@ public class QueryServiceImpl implements QueryService { @SneakyThrows public SemanticQueryResp queryDimValue(QueryDimValueReq queryDimValueReq, User user) { QuerySqlReq querySQLReq = buildQuerySqlReq(queryDimValueReq); - return (SemanticQueryResp) queryBySql(querySQLReq, user); + return queryBySql(querySQLReq, user); } @Override @@ -312,27 +302,10 @@ public class QueryServiceImpl implements QueryService { @Override public ExplainResp explain(ExplainSqlReq explainSqlReq, User user) throws Exception { - QueryType queryTypeEnum = explainSqlReq.getQueryTypeEnum(); T queryReq = explainSqlReq.getQueryReq(); - - if (QueryType.SQL.equals(queryTypeEnum) && queryReq instanceof QuerySqlReq) { - QueryStatement queryStatement = convertToQueryStatement((QuerySqlReq) queryReq, user); - queryStatement = plan(queryStatement); - return getExplainResp(queryStatement); - } - if (QueryType.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryStructReq) { - QueryStatement queryStatement = buildQueryStatement((QueryStructReq) queryReq); - queryStatement = plan(queryStatement); - return getExplainResp(queryStatement); - } - if (QueryType.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryMultiStructReq) { - QueryMultiStructReq queryMultiStructReq = (QueryMultiStructReq) queryReq; - QueryStatement queryStatement = buildQueryStatement(queryMultiStructReq); - queryStatement = plan(queryStatement); - return getExplainResp(queryStatement); - } - - throw new IllegalArgumentException("Parameters are invalid, explainSqlReq: " + explainSqlReq); + QueryStatement queryStatement = buildQueryStatement((QuerySqlReq) queryReq, user); + queryStatement = plan(queryStatement); + return getExplainResp(queryStatement); } @Override diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java index 08d84f86a..e07708282 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java @@ -5,19 +5,19 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.PageDimensionReq; -import com.tencent.supersonic.headless.api.request.PageMetricReq; -import com.tencent.supersonic.headless.api.request.SchemaItemQueryReq; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.ItemUseResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.PageMetricReq; +import com.tencent.supersonic.headless.api.pojo.request.SchemaItemQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.DomainService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ViewInfoServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ViewInfoServiceImpl.java index 7bcd5edd4..78c5730cb 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ViewInfoServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ViewInfoServiceImpl.java @@ -4,11 +4,11 @@ package com.tencent.supersonic.headless.server.service.impl; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.api.request.ViewInfoReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaRelaResp; +import com.tencent.supersonic.headless.api.pojo.request.ViewInfoReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaRelaResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ViewInfoDO; import com.tencent.supersonic.headless.server.persistence.repository.ViewInfoRepository; import com.tencent.supersonic.headless.server.pojo.MetaFilter; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DatabaseConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DatabaseConverter.java index 182768a4a..047e30c5d 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DatabaseConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DatabaseConverter.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.server.utils; import com.alibaba.fastjson.JSONObject; -import com.tencent.supersonic.headless.api.request.DatabaseReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DatabaseDO; import com.tencent.supersonic.headless.core.pojo.ConnectInfo; import com.tencent.supersonic.headless.core.pojo.Database; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java index 3491dff44..fd79b54ba 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DimensionConverter.java @@ -7,9 +7,9 @@ import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.headless.api.pojo.DimValueMap; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DimensionDO; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DomainConvert.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DomainConvert.java index 8cbaf816b..151905e54 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DomainConvert.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DomainConvert.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.server.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.api.request.DomainReq; -import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.request.DomainReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; import com.tencent.supersonic.headless.server.persistence.dataobject.DomainDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java index 199a5e24d..2a1788fc7 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java @@ -2,11 +2,11 @@ package com.tencent.supersonic.headless.server.utils; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; -import com.tencent.supersonic.headless.api.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricConverter.java index 0dddd5209..5680c9ade 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricConverter.java @@ -6,14 +6,14 @@ import com.tencent.supersonic.common.pojo.DataFormat; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; import com.tencent.supersonic.headless.api.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java index 06d796bb5..2ad823f1c 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java @@ -6,9 +6,9 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.api.enums.DimensionType; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; -import com.tencent.supersonic.headless.api.enums.SemanticType; +import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.SemanticType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.Identify; @@ -16,12 +16,12 @@ import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.MeasureParam; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.request.ModelReq; -import com.tencent.supersonic.headless.api.response.DomainResp; -import com.tencent.supersonic.headless.api.response.MeasureResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.response.DomainResp; +import com.tencent.supersonic.headless.api.pojo.response.MeasureResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ModelDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java index 72867f716..531701e0f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java @@ -9,19 +9,19 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.enums.MetricType; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricType; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.MetricTable; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.request.ParseSqlReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.DatabaseResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptor; import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptorFactory; import com.tencent.supersonic.headless.core.pojo.QueryStatement; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java index e1b058377..afbc8434e 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java @@ -18,14 +18,14 @@ import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.Catalog; import com.tencent.supersonic.headless.server.service.SchemaService; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java index 20523c598..460bf302f 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java @@ -3,18 +3,16 @@ package com.tencent.supersonic.headless.server.utils; import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE; import static com.tencent.supersonic.common.pojo.Constants.UNIONALL; -import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.headless.api.enums.SemanticType; -import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.api.response.DimensionResp; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.enums.SemanticType; +import com.tencent.supersonic.headless.api.pojo.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.core.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils; -import com.tencent.supersonic.headless.core.cache.CacheManager; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.Catalog; import java.util.Arrays; @@ -31,7 +29,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.springframework.util.CollectionUtils; @Slf4j @@ -43,22 +40,12 @@ public class QueryUtils { private static final String no_quotation_pattern = "\\((.*?)\\)"; private final Set patterns = new HashSet<>(); - @Value("${query.cache.enable:true}") - private Boolean cacheEnable; @Value("${query.optimizer.enable:true}") private Boolean optimizeEnable; - - private final CacheManager cacheManager; - private final StatUtils statUtils; - private final Catalog catalog; - public QueryUtils( - CacheManager cacheManager, StatUtils statUtils, Catalog catalog) { - - this.cacheManager = cacheManager; - this.statUtils = statUtils; + public QueryUtils(Catalog catalog) { this.catalog = catalog; } @@ -122,45 +109,6 @@ public class QueryUtils { }); } - public void fillItemNameInfo(SemanticQueryResp queryResultWithColumns, - QueryMultiStructReq queryMultiStructCmd) { - List aggregators = queryMultiStructCmd.getQueryStructReqs().stream() - .flatMap(queryStructCmd -> queryStructCmd.getAggregators().stream()) - .collect(Collectors.toList()); - log.info("multi agg merge:{}", aggregators); - Map metricNameFromAgg = getMetricNameFromAgg(aggregators); - log.info("metricNameFromAgg:{}", metricNameFromAgg); - Map namePair = new HashMap<>(); - Map nameTypePair = new HashMap<>(); - addSysTimeDimension(namePair, nameTypePair); - namePair.putAll(metricNameFromAgg); - List columns = queryResultWithColumns.getColumns(); - columns.forEach(column -> { - String nameEn = column.getNameEn().toLowerCase(); - if (nameEn.contains(JOIN_UNDERLINE)) { - nameEn = nameEn.split(JOIN_UNDERLINE)[1]; - } - if (namePair.containsKey(nameEn)) { - column.setName(namePair.get(nameEn)); - } else { - if (nameEn.startsWith("name")) { - column.setName("名称"); - } else if (nameEn.startsWith("value")) { - column.setName("指标值"); - } - } - if (nameTypePair.containsKey(nameEn)) { - column.setShowType(nameTypePair.get(nameEn)); - } else { - if (nameEn.startsWith("name")) { - column.setShowType("CATEGORY"); - } else if (nameEn.startsWith("value")) { - column.setShowType("NUMBER"); - } - } - }); - } - private String getName(String nameEn) { Pattern pattern = Pattern.compile("\\((.*?)\\)"); Matcher matcher = pattern.matcher(nameEn); @@ -195,21 +143,6 @@ public class QueryUtils { return false; } - private Map getMetricNameFromAgg(List aggregators) { - Map map = new HashMap<>(); - if (CollectionUtils.isEmpty(aggregators)) { - return map; - } - for (int i = 0; i < aggregators.size(); i++) { - Aggregator aggregator = aggregators.get(i); - if (StringUtils.isBlank(aggregator.getNameCh())) { - continue; - } - map.put("value" + (i + 1), aggregator.getNameCh()); - } - return map; - } - private static void addSysTimeDimension(Map namePair, Map nameTypePair) { for (TimeDimensionEnum timeDimensionEnum : TimeDimensionEnum.values()) { namePair.put(timeDimensionEnum.getName(), "date"); @@ -217,13 +150,6 @@ public class QueryUtils { } } - public void checkSqlParse(QueryStatement sqlParser) { - if (com.google.common.base.Strings.isNullOrEmpty(sqlParser.getSql()) - || com.google.common.base.Strings.isNullOrEmpty(sqlParser.getSourceId())) { - throw new RuntimeException("parse Exception: " + sqlParser.getErrMsg()); - } - } - public QueryStatement sqlParserUnion(QueryMultiStructReq queryMultiStructCmd, List sqlParsers) { QueryStatement sqlParser = new QueryStatement(); StringBuilder unionSqlBuilder = new StringBuilder(); diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java index 652f1288d..d36138a32 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java @@ -7,16 +7,17 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.api.enums.QueryOptMode; -import com.tencent.supersonic.headless.api.enums.QueryType; -import com.tencent.supersonic.headless.api.enums.QueryTypeBack; +import com.tencent.supersonic.headless.api.pojo.enums.QueryOptMode; +import com.tencent.supersonic.headless.api.pojo.enums.QueryType; +import com.tencent.supersonic.headless.api.pojo.enums.QueryTypeBack; import com.tencent.supersonic.headless.api.pojo.QueryStat; import com.tencent.supersonic.headless.api.pojo.SchemaItem; -import com.tencent.supersonic.headless.api.request.ItemUseReq; -import com.tencent.supersonic.headless.api.request.QuerySqlReq; -import com.tencent.supersonic.headless.api.request.QueryStructReq; -import com.tencent.supersonic.headless.api.response.ItemUseResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; +import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.request.SemanticQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.persistence.repository.StatRepository; import com.tencent.supersonic.headless.server.service.ModelService; import lombok.extern.slf4j.Slf4j; @@ -85,7 +86,16 @@ public class StatUtils { return true; } - public void initStatInfo(QuerySqlReq querySQLReq, User facadeUser) { + public void initStatInfo(SemanticQueryReq semanticQueryReq, User facadeUser) { + if (semanticQueryReq instanceof QuerySqlReq) { + initSqlStatInfo((QuerySqlReq) semanticQueryReq, facadeUser); + } + if (semanticQueryReq instanceof QueryStructReq) { + initStructStatInfo((QueryStructReq) semanticQueryReq, facadeUser); + } + } + + public void initSqlStatInfo(QuerySqlReq querySQLReq, User facadeUser) { QueryStat queryStatInfo = new QueryStat(); List allFields = SqlParserSelectHelper.getAllFields(querySQLReq.getSql()); queryStatInfo.setModelId(querySQLReq.getModelIds().get(0)); @@ -118,7 +128,7 @@ public class StatUtils { StatUtils.set(queryStatInfo); } - public void initStatInfo(QueryStructReq queryStructCmd, User facadeUser) { + public void initStructStatInfo(QueryStructReq queryStructCmd, User facadeUser) { QueryStat queryStatInfo = new QueryStat(); String traceId = ""; List dimensions = queryStructCmd.getGroups(); diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/calcite/HeadlessParserServiceTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/calcite/HeadlessParserServiceTest.java index f19089572..81479624e 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/calcite/HeadlessParserServiceTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/calcite/HeadlessParserServiceTest.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.headless.server.calcite; import com.tencent.supersonic.common.pojo.ColumnOrder; -import com.tencent.supersonic.headless.api.enums.AggOption; -import com.tencent.supersonic.headless.api.enums.EngineType; -import com.tencent.supersonic.headless.api.request.MetricQueryReq; -import com.tencent.supersonic.headless.api.response.SqlParserResp; +import com.tencent.supersonic.headless.api.pojo.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.enums.EngineType; +import com.tencent.supersonic.headless.api.pojo.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.pojo.response.SqlParserResp; import com.tencent.supersonic.headless.core.parser.calcite.planner.AggPlanner; import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema; import com.tencent.supersonic.headless.core.pojo.QueryStatement; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/DownloadServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/DownloadServiceImplTest.java index c6bd40db6..785bb60c5 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/DownloadServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/DownloadServiceImplTest.java @@ -10,11 +10,11 @@ import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.request.BatchDownloadReq; -import com.tencent.supersonic.headless.api.response.DimSchemaResp; -import com.tencent.supersonic.headless.api.response.MetricSchemaResp; -import com.tencent.supersonic.headless.api.response.ModelSchemaResp; -import com.tencent.supersonic.headless.api.response.SemanticQueryResp; +import com.tencent.supersonic.headless.api.pojo.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp; import com.tencent.supersonic.headless.server.service.impl.DownloadServiceImpl; import java.io.File; import java.util.Date; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java index 72a5af37e..663a3cfd8 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/MetricServiceImplTest.java @@ -8,15 +8,15 @@ import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.ChatGptHelper; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; -import com.tencent.supersonic.headless.api.enums.MetricType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricType; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.MeasureParam; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.response.MetricResp; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import com.tencent.supersonic.headless.server.persistence.repository.MetricRepository; import com.tencent.supersonic.headless.server.service.impl.MetricServiceImpl; diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java index 8901d16df..2e91dff47 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/service/ModelServiceImplTest.java @@ -5,15 +5,15 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.enums.DimensionType; -import com.tencent.supersonic.headless.api.enums.IdentifyType; +import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; +import com.tencent.supersonic.headless.api.pojo.enums.IdentifyType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; import com.tencent.supersonic.headless.api.pojo.Identify; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.request.ModelReq; -import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ModelDO; import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRepository; import com.tencent.supersonic.headless.server.persistence.repository.ModelRepository; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java index 6b48fa8bc..567a9882e 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java @@ -6,15 +6,15 @@ import com.tencent.supersonic.common.pojo.JoinCondition; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.api.enums.DimensionType; -import com.tencent.supersonic.headless.api.enums.IdentifyType; +import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; +import com.tencent.supersonic.headless.api.pojo.enums.IdentifyType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; import com.tencent.supersonic.headless.api.pojo.Identify; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.ModelDetail; -import com.tencent.supersonic.headless.api.request.DomainReq; -import com.tencent.supersonic.headless.api.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.request.DomainReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; import com.tencent.supersonic.headless.server.service.DomainService; import com.tencent.supersonic.headless.server.service.ModelRelaService; import com.tencent.supersonic.headless.server.service.ModelService; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java index 5ba7f7054..e19f70515 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java @@ -12,11 +12,11 @@ import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.api.enums.DataType; -import com.tencent.supersonic.headless.api.enums.DimensionType; -import com.tencent.supersonic.headless.api.enums.IdentifyType; -import com.tencent.supersonic.headless.api.enums.MetricDefineType; -import com.tencent.supersonic.headless.api.enums.SemanticType; +import com.tencent.supersonic.headless.api.pojo.enums.DataType; +import com.tencent.supersonic.headless.api.pojo.enums.DimensionType; +import com.tencent.supersonic.headless.api.pojo.enums.IdentifyType; +import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; +import com.tencent.supersonic.headless.api.pojo.enums.SemanticType; import com.tencent.supersonic.headless.api.pojo.Dim; import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; @@ -31,11 +31,11 @@ import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; import com.tencent.supersonic.headless.api.pojo.MetricParam; import com.tencent.supersonic.headless.api.pojo.ModelDetail; import com.tencent.supersonic.headless.api.pojo.RelateDimension; -import com.tencent.supersonic.headless.api.request.DatabaseReq; -import com.tencent.supersonic.headless.api.request.DimensionReq; -import com.tencent.supersonic.headless.api.request.DomainReq; -import com.tencent.supersonic.headless.api.request.MetricReq; -import com.tencent.supersonic.headless.api.request.ModelReq; +import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; +import com.tencent.supersonic.headless.api.pojo.request.DimensionReq; +import com.tencent.supersonic.headless.api.pojo.request.DomainReq; +import com.tencent.supersonic.headless.api.pojo.request.MetricReq; +import com.tencent.supersonic.headless.api.pojo.request.ModelReq; import com.tencent.supersonic.headless.server.service.DatabaseService; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.DomainService; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java index 27d951740..2c4479208 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.integration.model; import com.google.common.collect.Lists; import com.tencent.supersonic.StandaloneLauncher; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; -import com.tencent.supersonic.headless.api.enums.MetricType; -import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.enums.MetricType; +import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.MetricFilter; import com.tencent.supersonic.headless.server.service.MetricService; import org.junit.jupiter.api.Assertions;