diff --git a/assembly/bin/supersonic-build.sh b/assembly/bin/supersonic-build.sh index 693d9d19a..70bfb0d92 100755 --- a/assembly/bin/supersonic-build.sh +++ b/assembly/bin/supersonic-build.sh @@ -19,7 +19,7 @@ if [ $? -ne 0 ]; then fi #2. move package to build -cp $baseDir/../launchers/semantic/target/*.tar.gz ${buildDir}/supersonic-semantic.tar.gz +cp $baseDir/../launchers/headless/target/*.tar.gz ${buildDir}/supersonic-headless.tar.gz cp $baseDir/../launchers/chat/target/*.tar.gz ${buildDir}/supersonic-chat.tar.gz cp $baseDir/../launchers/standalone/target/*.tar.gz ${buildDir}/supersonic-standalone.tar.gz @@ -38,7 +38,7 @@ fi cd $buildDir tar xvf supersonic-webapp.tar.gz mv supersonic-webapp webapp -cp -fr webapp ../../launchers/semantic/target/classes +cp -fr webapp ../../launchers/headless/target/classes cp -fr webapp ../../launchers/chat/target/classes cp -fr webapp ../../launchers/standalone/target/classes rm -fr ${buildDir}/webapp @@ -55,4 +55,4 @@ fi rm -fr $runtimeDir/supersonic* moveAllToRuntime setEnvToWeb chat -setEnvToWeb semantic +setEnvToWeb headless diff --git a/assembly/bin/supersonic-common.sh b/assembly/bin/supersonic-common.sh index de20b2627..b2e80fc66 100755 --- a/assembly/bin/supersonic-common.sh +++ b/assembly/bin/supersonic-common.sh @@ -10,11 +10,11 @@ runtimeDir=$baseDir/../runtime buildDir=$baseDir/build readonly CHAT_APP_NAME="supersonic_chat" -readonly SEMANTIC_APP_NAME="supersonic_semantic" +readonly HEADLESS_APP_NAME="supersonic_headless" readonly PYLLM_APP_NAME="supersonic_pyllm" readonly STANDALONE_APP_NAME="supersonic_standalone" readonly CHAT_SERVICE="chat" -readonly SEMANTIC_SERVICE="semantic" +readonly HEADLESS_SERVICE="headless" readonly PYLLM_SERVICE="pyllm" readonly STANDALONE_SERVICE="standalone" readonly PYLLM_HOST="127.0.0.1" @@ -46,7 +46,7 @@ function moveAllToRuntime { mv ${buildDir}/supersonic-webapp ${buildDir}/webapp moveToRuntime chat - moveToRuntime semantic + moveToRuntime headless moveToRuntime standalone rm -fr ${buildDir}/webapp } diff --git a/assembly/bin/supersonic-daemon.sh b/assembly/bin/supersonic-daemon.sh index 7dff8e3ab..6d05f0b27 100755 --- a/assembly/bin/supersonic-daemon.sh +++ b/assembly/bin/supersonic-daemon.sh @@ -33,8 +33,8 @@ cd $baseDir function setMainClass { if [ "$service" == $CHAT_SERVICE ]; then main_class="com.tencent.supersonic.ChatLauncher" - elif [ "$service" == $SEMANTIC_SERVICE ]; then - main_class="com.tencent.supersonic.SemanticLauncher" + elif [ "$service" == $HEADLESS_SERVICE ]; then + main_class="com.tencent.supersonic.HeadlessLauncher" fi } setMainClass @@ -42,8 +42,8 @@ setMainClass function setAppName { if [ "$service" == $CHAT_SERVICE ]; then app_name=$CHAT_APP_NAME - elif [ "$service" == $SEMANTIC_SERVICE ]; then - app_name=$SEMANTIC_APP_NAME + elif [ "$service" == $HEADLESS_SERVICE ]; then + app_name=$HEADLESS_APP_NAME elif [ "$service" == $PYLLM_SERVICE ]; then app_name=$PYLLM_APP_NAME fi diff --git a/chat/api/pom.xml b/chat/api/pom.xml index 75ec2ac4d..90a96f0bb 100644 --- a/chat/api/pom.xml +++ b/chat/api/pom.xml @@ -23,7 +23,7 @@ com.tencent.supersonic - semantic-api + headless-api ${project.version} compile diff --git a/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java b/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java index 8105cb560..f48cc3024 100644 --- a/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticInterpreter.java +++ b/chat/api/src/main/java/com/tencent/supersonic/chat/api/component/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.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import java.util.List; diff --git a/chat/core/pom.xml b/chat/core/pom.xml index 24806171f..dd50ad2b0 100644 --- a/chat/core/pom.xml +++ b/chat/core/pom.xml @@ -77,12 +77,12 @@ com.tencent.supersonic - semantic-api + headless-api ${project.version} com.tencent.supersonic - semantic-query + headless-query ${project.version} diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java b/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java index 0c2935a36..f657d69c0 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/config/EntityInternalDetail.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.chat.config; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; import java.util.List; import lombok.Data; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java index c77af9cb8..604623ce8 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/EmbeddingMatchStrategy.java @@ -10,7 +10,7 @@ import com.tencent.supersonic.common.util.embedding.RetrieveQuery; import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; import com.tencent.supersonic.knowledge.dictionary.EmbeddingResult; -import com.tencent.supersonic.semantic.model.domain.listener.MetaEmbeddingListener; +import com.tencent.supersonic.headless.model.domain.listener.MetaEmbeddingListener; import java.util.Comparator; import java.util.HashMap; import java.util.List; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/ModelWithSemanticType.java b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/ModelWithSemanticType.java index b22c573ef..5499fe2e9 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/ModelWithSemanticType.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/mapper/ModelWithSemanticType.java @@ -10,10 +10,10 @@ import lombok.ToString; public class ModelWithSemanticType implements Serializable { private Long model; - private SchemaElementType semanticType; + private SchemaElementType schemaElementType; - public ModelWithSemanticType(Long model, SchemaElementType semanticType) { + public ModelWithSemanticType(Long model, SchemaElementType schemaElementType) { this.model = model; - this.semanticType = semanticType; + this.schemaElementType = schemaElementType; } } \ No newline at end of file diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java index 9388184a8..8fe74b4bb 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/parser/sql/llm/LLMRequestService.java @@ -23,8 +23,8 @@ 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.knowledge.service.SchemaService; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.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/processor/execute/MetricRecommendProcessor.java b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/execute/MetricRecommendProcessor.java index 4a47a8373..126c4941e 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/processor/execute/MetricRecommendProcessor.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/processor/execute/MetricRecommendProcessor.java @@ -12,7 +12,7 @@ import com.tencent.supersonic.common.util.embedding.Retrieval; import com.tencent.supersonic.common.util.embedding.RetrieveQuery; import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; -import com.tencent.supersonic.semantic.model.domain.listener.MetaEmbeddingListener; +import com.tencent.supersonic.headless.model.domain.listener.MetaEmbeddingListener; import org.springframework.util.CollectionUtils; import java.util.Collections; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java index e384dd62c..4289de603 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java @@ -15,11 +15,11 @@ 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.knowledge.service.SchemaService; -import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import lombok.ToString; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java index 3e43cf6b1..14a42d09d 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/analytics/MetricAnalyzeQuery.java @@ -18,8 +18,8 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java index 29f98a119..9fbd5384a 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/s2sql/LLMSqlQuery.java @@ -10,8 +10,8 @@ import com.tencent.supersonic.chat.query.llm.LLMSemanticQuery; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.utils.QueryReqBuilder; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java index 55b4a32d4..71bc11652 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java @@ -23,9 +23,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.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.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/query/rule/metric/MetricFilterQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java index 00e050441..00ad5da24 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricFilterQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/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.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.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/query/rule/metric/MetricSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java index 82ccd163c..53dc5eda4 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricSemanticQuery.java @@ -1,5 +1,9 @@ package com.tencent.supersonic.chat.query.rule.metric; +import static com.tencent.supersonic.chat.api.pojo.SchemaElementType.METRIC; +import static com.tencent.supersonic.chat.query.rule.QueryMatchOption.OptionType.REQUIRED; +import static com.tencent.supersonic.chat.query.rule.QueryMatchOption.RequireNumberType.AT_LEAST; + import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.chat.api.pojo.ChatContext; import com.tencent.supersonic.chat.api.pojo.QueryContext; @@ -14,16 +18,11 @@ import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.chat.service.SemanticService; import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import lombok.extern.slf4j.Slf4j; - +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; import java.time.LocalDate; import java.util.List; import java.util.Objects; - -import static com.tencent.supersonic.chat.api.pojo.SchemaElementType.METRIC; -import static com.tencent.supersonic.chat.query.rule.QueryMatchOption.OptionType.REQUIRED; -import static com.tencent.supersonic.chat.query.rule.QueryMatchOption.RequireNumberType.AT_LEAST; +import lombok.extern.slf4j.Slf4j; @Slf4j public abstract class MetricSemanticQuery extends RuleSemanticQuery { diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java index ff84baa36..9b27eaa56 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/metric/MetricTagQuery.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/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.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.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/rest/ChatConfigController.java b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java index 8bfe52b05..8492050a1 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/rest/ChatConfigController.java @@ -12,12 +12,12 @@ import com.tencent.supersonic.chat.api.pojo.response.ChatConfigRichResp; import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.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/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java index e682ab145..977d1c642 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/SemanticService.java @@ -1,6 +1,16 @@ package com.tencent.supersonic.chat.service; +import static com.tencent.supersonic.common.pojo.Constants.DAY; +import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT; +import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT_INT; +import static com.tencent.supersonic.common.pojo.Constants.MONTH; +import static com.tencent.supersonic.common.pojo.Constants.MONTH_FORMAT; +import static com.tencent.supersonic.common.pojo.Constants.MONTH_FORMAT_INT; +import static com.tencent.supersonic.common.pojo.Constants.TIMES_FORMAT; +import static com.tencent.supersonic.common.pojo.Constants.TIME_FORMAT; +import static com.tencent.supersonic.common.pojo.Constants.WEEK; + import com.google.common.collect.Sets; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.chat.api.component.SemanticInterpreter; @@ -25,22 +35,15 @@ import com.tencent.supersonic.common.pojo.DateConf; import com.tencent.supersonic.common.pojo.DateConf.DateMode; import com.tencent.supersonic.common.pojo.ModelCluster; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; +import com.tencent.supersonic.common.pojo.enums.QueryType; 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.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import com.tencent.supersonic.knowledge.service.SchemaService; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; - import java.text.DecimalFormat; import java.time.DayOfWeek; import java.time.LocalDate; @@ -60,16 +63,12 @@ import java.util.Optional; import java.util.Set; import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; - -import static com.tencent.supersonic.common.pojo.Constants.DAY; -import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT; -import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT_INT; -import static com.tencent.supersonic.common.pojo.Constants.MONTH; -import static com.tencent.supersonic.common.pojo.Constants.MONTH_FORMAT; -import static com.tencent.supersonic.common.pojo.Constants.MONTH_FORMAT_INT; -import static com.tencent.supersonic.common.pojo.Constants.TIMES_FORMAT; -import static com.tencent.supersonic.common.pojo.Constants.TIME_FORMAT; -import static com.tencent.supersonic.common.pojo.Constants.WEEK; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; @Service @Slf4j diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java index a84801e50..a3bae8e64 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ConfigServiceImpl.java @@ -31,12 +31,12 @@ import com.tencent.supersonic.chat.utils.ChatConfigHelper; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.utils.VisibilityEvent; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java index af897ed1a..4ffd0cb85 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/PluginServiceImpl.java @@ -16,7 +16,7 @@ import com.tencent.supersonic.chat.service.PluginService; import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java index 7a01fc136..acdc5b176 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.chat.service.impl; import com.hankcs.hanlp.seg.common.Term; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.chat.api.component.SchemaMapper; import com.tencent.supersonic.chat.api.component.SemanticCorrector; +import com.tencent.supersonic.chat.api.component.SchemaMapper; import com.tencent.supersonic.chat.api.component.SemanticInterpreter; import com.tencent.supersonic.chat.api.component.SemanticParser; import com.tencent.supersonic.chat.api.component.SemanticQuery; @@ -34,8 +34,8 @@ import com.tencent.supersonic.chat.query.QueryManager; import com.tencent.supersonic.chat.query.llm.s2sql.LLMSqlQuery; import com.tencent.supersonic.chat.query.rule.RuleSemanticQuery; import com.tencent.supersonic.chat.service.ChatService; -import com.tencent.supersonic.chat.service.QueryService; import com.tencent.supersonic.chat.service.SemanticService; +import com.tencent.supersonic.chat.service.QueryService; import com.tencent.supersonic.chat.service.StatisticsService; import com.tencent.supersonic.chat.service.TimeCost; import com.tencent.supersonic.chat.utils.ComponentFactory; @@ -59,8 +59,8 @@ import com.tencent.supersonic.knowledge.dictionary.MultiCustomDictionary; import com.tencent.supersonic.knowledge.service.SearchService; import com.tencent.supersonic.knowledge.utils.HanlpHelper; import com.tencent.supersonic.knowledge.utils.NatureHelper; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.expression.LongValue; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/SearchServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/SearchServiceImpl.java index 60e1a3b64..929f387e3 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/SearchServiceImpl.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/SearchServiceImpl.java @@ -320,13 +320,13 @@ public class SearchServiceImpl implements SearchService { for (ModelWithSemanticType modelWithSemanticType : dimensionMetricClassIds) { existMetric = true; Long modelId = modelWithSemanticType.getModel(); - SchemaElementType semanticType = modelWithSemanticType.getSemanticType(); + SchemaElementType schemaElementType = modelWithSemanticType.getSchemaElementType(); SearchResult searchResult = SearchResult.builder() .modelId(modelId) .modelName(modelToName.get(modelId)) .recommend(matchText.getRegText() + hanlpMapResult.getName()) .subRecommend(hanlpMapResult.getName()) - .schemaElementType(semanticType) + .schemaElementType(schemaElementType) .build(); //visibility to filter metrics ItemNameVisibilityInfo visibility = (ItemNameVisibilityInfo) caffeineCache.getIfPresent(modelId); @@ -347,8 +347,8 @@ public class SearchServiceImpl implements SearchService { } private boolean matchCondition(ModelWithSemanticType entry, Set possibleModels) { - if (!(SchemaElementType.METRIC.equals(entry.getSemanticType()) || SchemaElementType.DIMENSION.equals( - entry.getSemanticType()))) { + if (!(SchemaElementType.METRIC.equals(entry.getSchemaElementType()) || SchemaElementType.DIMENSION.equals( + entry.getSchemaElementType()))) { return false; } diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ComponentFactory.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ComponentFactory.java index bd6b5f3d0..30d0972dd 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ComponentFactory.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/ComponentFactory.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.chat.utils; -import com.tencent.supersonic.chat.api.component.SchemaMapper; import com.tencent.supersonic.chat.api.component.SemanticCorrector; import com.tencent.supersonic.chat.api.component.SemanticInterpreter; +import com.tencent.supersonic.chat.api.component.SchemaMapper; import com.tencent.supersonic.chat.api.component.SemanticParser; import com.tencent.supersonic.chat.parser.JavaLLMProxy; import com.tencent.supersonic.chat.parser.LLMProxy; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java index ba1bbad19..d33773214 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java @@ -14,8 +14,8 @@ import com.tencent.supersonic.chat.persistence.dataobject.DimValueDO; import com.tencent.supersonic.chat.service.ConfigService; import com.tencent.supersonic.knowledge.dictionary.DictUpdateMode; import com.tencent.supersonic.knowledge.dictionary.DimValue2DictCommand; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java index 155dde2dc..ea7af203a 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictQueryHelper.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/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.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.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/utils/QueryReqBuilder.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java index e808dfcc2..dae4e6d0d 100644 --- a/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java +++ b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/QueryReqBuilder.java @@ -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.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/ContextTest.java b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/ContextTest.java index d4562f3fa..e0b5a89d1 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/ContextTest.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/ContextTest.java @@ -5,10 +5,10 @@ import com.tencent.supersonic.chat.utils.ComponentFactory; import com.tencent.supersonic.chat.persistence.mapper.ChatContextMapper; import com.tencent.supersonic.knowledge.semantic.RemoteSemanticInterpreter; import com.tencent.supersonic.chat.test.ChatBizLauncher; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.query.service.QueryService; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.query.service.QueryService; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java index aa9f28e5c..ecc263b7b 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java @@ -1,5 +1,9 @@ package com.tencent.supersonic.chat.test.context; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.Mockito.when; + import com.tencent.supersonic.chat.api.pojo.ChatContext; import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp; import com.tencent.supersonic.chat.config.DefaultMetric; @@ -11,29 +15,24 @@ import com.tencent.supersonic.chat.service.ChatService; import com.tencent.supersonic.chat.service.QueryService; import com.tencent.supersonic.chat.service.impl.ConfigServiceImpl; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import org.mockito.Mockito; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.client.RestTemplate; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyLong; -import static org.mockito.Mockito.when; - @Configuration public class MockBeansConfiguration { diff --git a/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java b/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java index dec5542db..33bad357b 100644 --- a/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java +++ b/chat/core/src/test/java/com/tencent/supersonic/chat/utils/QueryReqBuilderTest.java @@ -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.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/chat/knowledge/pom.xml b/chat/knowledge/pom.xml index 8bbf7f17b..081ef2f6f 100644 --- a/chat/knowledge/pom.xml +++ b/chat/knowledge/pom.xml @@ -100,7 +100,7 @@ com.tencent.supersonic - semantic-query + headless-query ${project.version} compile diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java index b1d0b8221..aa8a05b13 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/BaseSemanticInterpreter.java @@ -4,7 +4,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import com.tencent.supersonic.chat.api.component.SemanticInterpreter; import com.tencent.supersonic.chat.api.pojo.ModelSchema; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; import java.util.ArrayList; import java.util.List; import java.util.Optional; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java index 386a0c14d..9ac0ae9e7 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticInterpreter.java @@ -5,25 +5,25 @@ 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.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.query.service.QueryService; -import com.tencent.supersonic.semantic.query.service.SchemaService; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.query.service.QueryService; +import com.tencent.supersonic.headless.query.service.SchemaService; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java index 1fb5cc6c0..5316dbfc3 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/ModelSchemaBuilder.java @@ -6,12 +6,12 @@ import com.tencent.supersonic.chat.api.pojo.RelatedSchemaElement; import com.tencent.supersonic.chat.api.pojo.SchemaElement; import com.tencent.supersonic.chat.api.pojo.SchemaElementType; import com.tencent.supersonic.chat.api.pojo.SchemaValueMap; -import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java index 3434e61b5..ec6336264 100644 --- a/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java +++ b/chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticInterpreter.java @@ -1,5 +1,10 @@ package com.tencent.supersonic.knowledge.semantic; +import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER; +import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER; +import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER; +import static com.tencent.supersonic.common.pojo.Constants.TRUE_LOWER; + import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.google.gson.Gson; @@ -7,28 +12,34 @@ import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfi import com.tencent.supersonic.auth.api.authentication.constant.UserConstants; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ResultData; -import com.tencent.supersonic.common.pojo.enums.ReturnCode; import com.tencent.supersonic.common.pojo.enums.AuthType; +import com.tencent.supersonic.common.pojo.enums.ReturnCode; import com.tencent.supersonic.common.pojo.exception.CommonException; 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.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import java.net.URI; +import java.net.URL; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; @@ -42,18 +53,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; -import java.net.URI; -import java.net.URL; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Objects; - -import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER; -import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER; -import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER; -import static com.tencent.supersonic.common.pojo.Constants.TRUE_LOWER; - @Slf4j public class RemoteSemanticInterpreter extends BaseSemanticInterpreter { @@ -115,17 +114,17 @@ public class RemoteSemanticInterpreter extends BaseSemanticInterpreter { requestUrl, HttpMethod.POST, entity, structTypeRef); responseBody = responseEntity.getBody(); log.info("ApiResponse responseBody:{}", responseBody); - QueryResultWithSchemaResp semanticQuery = new QueryResultWithSchemaResp(); + QueryResultWithSchemaResp schemaResp = new QueryResultWithSchemaResp(); if (ReturnCode.SUCCESS.getCode() == responseBody.getCode()) { QueryResultWithSchemaResp data = responseBody.getData(); - semanticQuery.setColumns(data.getColumns()); - semanticQuery.setResultList(data.getResultList()); - semanticQuery.setSql(data.getSql()); - semanticQuery.setQueryAuthorization(data.getQueryAuthorization()); - return semanticQuery; + schemaResp.setColumns(data.getColumns()); + schemaResp.setResultList(data.getResultList()); + schemaResp.setSql(data.getSql()); + schemaResp.setQueryAuthorization(data.getQueryAuthorization()); + return schemaResp; } } catch (Exception e) { - throw new RuntimeException("search semantic interface error,url:" + url, e); + throw new RuntimeException("search headless interface error,url:" + url, e); } throw new CommonException(responseBody.getCode(), responseBody.getMsg()); } diff --git a/semantic/api/pom.xml b/headless/api/pom.xml similarity index 96% rename from semantic/api/pom.xml rename to headless/api/pom.xml index f00176620..386ec4067 100644 --- a/semantic/api/pom.xml +++ b/headless/api/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> com.tencent.supersonic - semantic + headless ${revision} 4.0.0 - semantic-api + headless-api diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/ElementFrequencyEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementFrequencyEnum.java similarity index 53% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/ElementFrequencyEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementFrequencyEnum.java index 3e89b1732..de4764734 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/ElementFrequencyEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementFrequencyEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.enums; +package com.tencent.supersonic.headless.api.materialization.enums; public enum ElementFrequencyEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/ElementTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementTypeEnum.java similarity index 61% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/ElementTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementTypeEnum.java index b07d90524..b2b9ef8bd 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/ElementTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/ElementTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.enums; +package com.tencent.supersonic.headless.api.materialization.enums; public enum ElementTypeEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/UpdateCycleEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java similarity index 50% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/UpdateCycleEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java index 254be941b..4d9385fd6 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/enums/UpdateCycleEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/enums/UpdateCycleEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.enums; +package com.tencent.supersonic.headless.api.materialization.enums; public enum UpdateCycleEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationConfFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationConfFilter.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationConfFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationConfFilter.java index 62508f6f8..e8bbfe2cf 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationConfFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationConfFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.pojo; +package com.tencent.supersonic.headless.api.materialization.pojo; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationDateFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationDateFilter.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationDateFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationDateFilter.java index 3608bb8ff..64e8c5e68 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationDateFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationDateFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.pojo; +package com.tencent.supersonic.headless.api.materialization.pojo; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationFilter.java similarity index 73% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationFilter.java index 04c0c55ac..836edfdcc 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationFilter.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.api.materialization.pojo; +package com.tencent.supersonic.headless.api.materialization.pojo; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationRecordFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationRecordFilter.java similarity index 91% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationRecordFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationRecordFilter.java index de5286d3e..cd248dccc 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/pojo/MaterializationRecordFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/pojo/MaterializationRecordFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.pojo; +package com.tencent.supersonic.headless.api.materialization.pojo; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationElementReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationElementReq.java similarity index 77% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationElementReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationElementReq.java index 8faedd9f2..75c6b0ef6 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationElementReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationElementReq.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.api.materialization.request; +package com.tencent.supersonic.headless.api.materialization.request; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; import lombok.Builder; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationRecordReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationRecordReq.java similarity index 90% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationRecordReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationRecordReq.java index cf1ccf54e..d052ab8e3 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationRecordReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationRecordReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.request; +package com.tencent.supersonic.headless.api.materialization.request; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationReq.java similarity index 77% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationReq.java index c5cbf6ca3..c63c9ba83 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.api.materialization.request; +package com.tencent.supersonic.headless.api.materialization.request; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; import lombok.Data; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationSourceReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationSourceReq.java similarity index 74% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationSourceReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationSourceReq.java index ac14b6568..6acb3f446 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/request/MaterializationSourceReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/request/MaterializationSourceReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.request; +package com.tencent.supersonic.headless.api.materialization.request; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationDateResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationDateResp.java similarity index 87% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationDateResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationDateResp.java index 48a530c21..7e230e301 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationDateResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationDateResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.response; +package com.tencent.supersonic.headless.api.materialization.response; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationElementModelResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementModelResp.java similarity index 75% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationElementModelResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementModelResp.java index d67479e76..d0073afd3 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationElementModelResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementModelResp.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.api.materialization.response; +package com.tencent.supersonic.headless.api.materialization.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.Measure; import java.util.List; import lombok.Builder; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationElementResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementResp.java similarity index 74% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationElementResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementResp.java index 57e85dd52..d14d7c1de 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationElementResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationElementResp.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.api.materialization.response; +package com.tencent.supersonic.headless.api.materialization.response; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; import lombok.Data; @Data diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationRecordResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationRecordResp.java similarity index 90% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationRecordResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationRecordResp.java index 5a561d0d3..109079b26 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationRecordResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationRecordResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.materialization.response; +package com.tencent.supersonic.headless.api.materialization.response; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationResp.java similarity index 77% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationResp.java index d6a750859..788b02e25 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationResp.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.api.materialization.response; +package com.tencent.supersonic.headless.api.materialization.response; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; import lombok.Data; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationSourceResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationSourceResp.java similarity index 75% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationSourceResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationSourceResp.java index 50b75aa52..78f243ab3 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/materialization/response/MaterializationSourceResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/materialization/response/MaterializationSourceResp.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.api.materialization.response; +package com.tencent.supersonic.headless.api.materialization.response; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.UpdateCycleEnum; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; import java.util.List; import java.util.Map; import lombok.AllArgsConstructor; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DataTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DataTypeEnum.java similarity index 98% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DataTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DataTypeEnum.java index a9174fc47..f397e9a46 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DataTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DataTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; import com.tencent.supersonic.common.pojo.Constants; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DimensionTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DimensionTypeEnum.java similarity index 53% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DimensionTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DimensionTypeEnum.java index ce299d856..dfb20f31e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DimensionTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/DimensionTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum DimensionTypeEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/IdentifyTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/IdentifyTypeEnum.java similarity index 52% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/IdentifyTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/IdentifyTypeEnum.java index 595b729d4..754fb745c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/IdentifyTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/IdentifyTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum IdentifyTypeEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/MetricTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java similarity index 50% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/MetricTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java index 112426b14..e2141fc4b 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/MetricTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/MetricTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum MetricTypeEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/ModelSourceTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/ModelSourceTypeEnum.java similarity index 93% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/ModelSourceTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/ModelSourceTypeEnum.java index 8cc109847..ea6234162 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/ModelSourceTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/ModelSourceTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; import java.util.Objects; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/OperatorEnum.java similarity index 86% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/OperatorEnum.java index a0cd59b6b..4480f8990 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/OperatorEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum OperatorEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryOptMode.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryOptMode.java similarity index 52% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryOptMode.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryOptMode.java index 080af6901..e24ca839c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryOptMode.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryOptMode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum QueryOptMode { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeBackEnum.java similarity index 92% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeBackEnum.java index 7cb37f193..07f11fad8 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeBackEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum QueryTypeBackEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeEnum.java similarity index 89% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeEnum.java index 08170c77a..25e86e250 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/QueryTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum QueryTypeEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/SemanticTypeEnum.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/SemanticTypeEnum.java similarity index 57% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/SemanticTypeEnum.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/SemanticTypeEnum.java index 04ed6b09f..fb5dd47fb 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/SemanticTypeEnum.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/enums/SemanticTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.enums; +package com.tencent.supersonic.headless.api.model.enums; public enum SemanticTypeEnum { diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DatasourceType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DatasourceType.java similarity index 88% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DatasourceType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DatasourceType.java index 729c88be2..4710ae920 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DatasourceType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DatasourceType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.tencent.supersonic.common.pojo.Constants; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Dim.java similarity index 96% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Dim.java index a72500541..5cfe7bfb0 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Dim.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.tencent.supersonic.common.pojo.Constants; import lombok.AllArgsConstructor; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimValueMap.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimValueMap.java similarity index 86% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimValueMap.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimValueMap.java index 8bdc0f7fd..b689cea6e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimValueMap.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimValueMap.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimensionTimeTypeParams.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimensionTimeTypeParams.java similarity index 82% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimensionTimeTypeParams.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimensionTimeTypeParams.java index e852e0567..6e69ee339 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimensionTimeTypeParams.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DimensionTimeTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DrillDownDimension.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DrillDownDimension.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DrillDownDimension.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DrillDownDimension.java index 221721dfb..335c58dda 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DrillDownDimension.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/DrillDownDimension.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Entity.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Entity.java similarity index 86% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Entity.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Entity.java index a547a98fb..148b63847 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Entity.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Entity.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Identify.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Identify.java similarity index 89% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Identify.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Identify.java index 30a62f79a..845b38dc8 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Identify.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Identify.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ItemDateFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ItemDateFilter.java similarity index 82% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ItemDateFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ItemDateFilter.java index 19cb7d60a..0827e9a71 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ItemDateFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ItemDateFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import java.util.List; import lombok.AllArgsConstructor; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Measure.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Measure.java similarity index 91% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Measure.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Measure.java index 66e9ac9f3..4ee882ffd 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Measure.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/Measure.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricQueryDefaultConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricQueryDefaultConfig.java similarity index 83% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricQueryDefaultConfig.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricQueryDefaultConfig.java index e9b77c552..0aecf8106 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricQueryDefaultConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricQueryDefaultConfig.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricTypeParams.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricTypeParams.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricTypeParams.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricTypeParams.java index 78d403b23..934fc3ba6 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricTypeParams.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/MetricTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import java.util.List; import com.google.common.collect.Lists; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ModelDetail.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ModelDetail.java similarity index 89% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ModelDetail.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ModelDetail.java index 1eabd59f5..dd70a2956 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ModelDetail.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/ModelDetail.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.google.common.collect.Lists; -import com.tencent.supersonic.semantic.api.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.DimensionTypeEnum; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryResult.java similarity index 86% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryResult.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryResult.java index 5c7a94967..89062973e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryResult.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryResult.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import java.io.Serializable; import java.util.ArrayList; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryStat.java similarity index 98% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryStat.java index ecc0941b0..4cc14d37e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/QueryStat.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/RelateDimension.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/RelateDimension.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/RelateDimension.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/RelateDimension.java index 285ba1ade..3391aff9c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/RelateDimension.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/RelateDimension.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/SchemaItem.java similarity index 96% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/SchemaItem.java index 8922799cb..f5c7171e4 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/pojo/SchemaItem.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.pojo; +package com.tencent.supersonic.headless.api.model.pojo; import com.google.common.base.Objects; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatabaseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DatabaseReq.java similarity index 90% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatabaseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DatabaseReq.java index 8cae6fa57..196cd725e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatabaseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DatabaseReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.semantic.api.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; import lombok.Data; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DateInfoReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DateInfoReq.java similarity index 95% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DateInfoReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DateInfoReq.java index ca830162e..d4333e527 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DateInfoReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DateInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import java.util.ArrayList; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DimensionReq.java similarity index 75% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DimensionReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DimensionReq.java index 44a8f8b92..2bff9eb54 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DimensionReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DimensionReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainReq.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainReq.java index d2c222de3..fbddd3644 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import java.util.ArrayList; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainUpdateReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainUpdateReq.java similarity index 63% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainUpdateReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainUpdateReq.java index ef8ab9fcc..2394cbcc2 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainUpdateReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/DomainUpdateReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetaBatchReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetaBatchReq.java similarity index 70% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetaBatchReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetaBatchReq.java index e90e9ed16..d5ce06c62 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetaBatchReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetaBatchReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import lombok.Data; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricBaseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricBaseReq.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricBaseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricBaseReq.java index bd0b3a37f..e8ce3d391 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricBaseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricBaseReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricReq.java similarity index 73% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricReq.java index 092a8c537..ff5874d43 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/MetricReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; -import com.tencent.supersonic.semantic.api.model.enums.MetricTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.model.enums.MetricTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; import lombok.Data; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java index b281b1859..81f164c88 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelReq.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import java.util.ArrayList; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelSchemaFilterReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelSchemaFilterReq.java similarity index 76% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelSchemaFilterReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelSchemaFilterReq.java index 8d8c72d90..f5d9b39cd 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ModelSchemaFilterReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ModelSchemaFilterReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageDimensionReq.java similarity index 66% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageDimensionReq.java index f9a22d0cd..91d8be4ac 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageDimensionReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageMetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageMetricReq.java similarity index 65% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageMetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageMetricReq.java index 40edea0c2..92f04df9c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageMetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageMetricReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageSchemaItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageSchemaItemReq.java similarity index 90% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageSchemaItemReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageSchemaItemReq.java index 556540f0e..3527b4d8e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageSchemaItemReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/PageSchemaItemReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/SqlExecuteReq.java similarity index 91% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/SqlExecuteReq.java index 6a1edf94a..a7bc37f70 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/SqlExecuteReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import javax.validation.constraints.NotBlank; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ViewInfoReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ViewInfoReq.java similarity index 83% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ViewInfoReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ViewInfoReq.java index ba253f349..57d0f1301 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ViewInfoReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/request/ViewInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.request; +package com.tencent.supersonic.headless.api.model.request; import java.util.Date; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DatabaseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DatabaseResp.java similarity index 95% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DatabaseResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DatabaseResp.java index fb085d85d..bbea6f867 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DatabaseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DatabaseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import java.util.List; import java.util.regex.Matcher; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimSchemaResp.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimSchemaResp.java index 3f9b09ddd..2a698cda3 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import lombok.Data; import lombok.ToString; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimensionResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimensionResp.java similarity index 77% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimensionResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimensionResp.java index 251874510..fe0628358 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimensionResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DimensionResp.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import lombok.ToString; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DomainResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DomainResp.java similarity index 84% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DomainResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DomainResp.java index 809f0d061..79dcc4848 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DomainResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/DomainResp.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; -import com.tencent.supersonic.semantic.api.model.pojo.Entity; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.Entity; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import java.util.List; import java.util.Objects; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ExplainResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ExplainResp.java similarity index 83% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ExplainResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ExplainResp.java index 96f5fa8e6..cf9d91605 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ExplainResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ExplainResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import java.io.Serializable; import lombok.AllArgsConstructor; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MeasureResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MeasureResp.java similarity index 86% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MeasureResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MeasureResp.java index 72811b6f8..9fabe2ed5 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MeasureResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MeasureResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricResp.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricResp.java index 4d0119440..da7ea237f 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricResp.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import lombok.ToString; import org.apache.commons.collections.CollectionUtils; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricSchemaResp.java similarity index 73% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricSchemaResp.java index 4c90188b6..7c88703ab 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/MetricSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import lombok.Data; import lombok.ToString; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelResp.java similarity index 84% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelResp.java index 7165ae6da..f1d03c8f8 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelResp.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import com.google.common.base.Objects; import com.google.common.collect.Lists; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.Identify; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.Identify; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelSchemaRelaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaRelaResp.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelSchemaRelaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaRelaResp.java index 11fa48f40..5f43d72b3 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelSchemaRelaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaRelaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaResp.java similarity index 87% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaResp.java index 69485587f..553c5721b 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ModelSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/ModelSchemaResp.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.semantic.api.model.pojo.Identify; +import com.tencent.supersonic.headless.api.model.pojo.Identify; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/QueryResultWithSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/QueryResultWithSchemaResp.java similarity index 84% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/QueryResultWithSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/QueryResultWithSchemaResp.java index 8a5bc5ecb..2697a2b3e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/QueryResultWithSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/QueryResultWithSchemaResp.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.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.semantic.api.model.enums.SemanticTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.QueryResult; +import com.tencent.supersonic.headless.api.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.QueryResult; import lombok.Data; import lombok.ToString; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/SqlParserResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/SqlParserResp.java similarity index 89% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/SqlParserResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/SqlParserResp.java index b8b37a688..9d5b56c94 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/SqlParserResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/response/SqlParserResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.response; +package com.tencent.supersonic.headless.api.model.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DataModelYamlTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DataModelYamlTpl.java similarity index 77% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DataModelYamlTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DataModelYamlTpl.java index 137582012..bd6e3658c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DataModelYamlTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DataModelYamlTpl.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; import java.util.List; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionTimeTypeParamsTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionTimeTypeParamsTpl.java similarity index 71% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionTimeTypeParamsTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionTimeTypeParamsTpl.java index 83943e388..551c8b908 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionTimeTypeParamsTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionTimeTypeParamsTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionYamlTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionYamlTpl.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionYamlTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionYamlTpl.java index a2da844af..0395ea20e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionYamlTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/DimensionYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/IdentifyYamlTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/IdentifyYamlTpl.java similarity index 83% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/IdentifyYamlTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/IdentifyYamlTpl.java index 8de633418..9dbf2969e 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/IdentifyYamlTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/IdentifyYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MeasureYamlTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MeasureYamlTpl.java similarity index 85% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MeasureYamlTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MeasureYamlTpl.java index 681041062..2b499c52c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MeasureYamlTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MeasureYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricTypeParamsYamlTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricTypeParamsYamlTpl.java similarity index 74% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricTypeParamsYamlTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricTypeParamsYamlTpl.java index 20986bfba..c661623b5 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricTypeParamsYamlTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricTypeParamsYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; import java.util.List; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricYamlTpl.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricYamlTpl.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricYamlTpl.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricYamlTpl.java index e4c5cea59..20ed5d14c 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricYamlTpl.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/model/yaml/MetricYamlTpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.model.yaml; +package com.tencent.supersonic.headless.api.model.yaml; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/enums/AggOption.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/enums/AggOption.java similarity index 84% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/enums/AggOption.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/enums/AggOption.java index 14c07b2ef..9fbd9d2e0 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/enums/AggOption.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/enums/AggOption.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.enums; +package com.tencent.supersonic.headless.api.query.enums; public enum AggOption { NATIVE, diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Cache.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Cache.java similarity index 84% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Cache.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Cache.java index e58dacaf4..5e1ab296a 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Cache.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Cache.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.pojo; +package com.tencent.supersonic.headless.api.query.pojo; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/DataDownload.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/DataDownload.java similarity index 75% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/DataDownload.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/DataDownload.java index 605083536..9d7b7637a 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/DataDownload.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/DataDownload.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.pojo; +package com.tencent.supersonic.headless.api.query.pojo; import lombok.Builder; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Materialization.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Materialization.java similarity index 83% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Materialization.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Materialization.java index d15a2a046..696c4de36 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Materialization.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Materialization.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.pojo; +package com.tencent.supersonic.headless.api.query.pojo; import java.util.List; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/MetricTable.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/MetricTable.java similarity index 68% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/MetricTable.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/MetricTable.java index 4b8e549b8..142dbdfcd 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/MetricTable.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/MetricTable.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.api.query.pojo; +package com.tencent.supersonic.headless.api.query.pojo; -import com.tencent.supersonic.semantic.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.enums.AggOption; import java.util.List; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Param.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Param.java similarity index 92% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Param.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Param.java index 7d47d71ed..d71cfa1af 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/Param.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/pojo/Param.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.pojo; +package com.tencent.supersonic.headless.api.query.pojo; import javax.validation.constraints.NotBlank; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/BatchDownloadReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/BatchDownloadReq.java similarity index 80% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/BatchDownloadReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/BatchDownloadReq.java index 61ef21164..ae02e7353 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/BatchDownloadReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/BatchDownloadReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/DownloadStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/DownloadStructReq.java similarity index 79% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/DownloadStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/DownloadStructReq.java index 1c6a392be..8513ca19b 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/DownloadStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/DownloadStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ExplainSqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ExplainSqlReq.java similarity index 71% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ExplainSqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ExplainSqlReq.java index eabf702fa..8ebfe4a42 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ExplainSqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ExplainSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; -import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ItemUseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ItemUseReq.java similarity index 90% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ItemUseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ItemUseReq.java index f98a808dc..42f11b350 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ItemUseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ItemUseReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import java.util.List; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/MetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/MetricReq.java similarity index 88% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/MetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/MetricReq.java index 5e493a1aa..3854d7eec 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/MetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/MetricReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import com.tencent.supersonic.common.pojo.ColumnOrder; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ParseSqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ParseSqlReq.java similarity index 80% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ParseSqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ParseSqlReq.java index 50216b67e..c826bf954 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ParseSqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/ParseSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; -import com.tencent.supersonic.semantic.api.query.pojo.MetricTable; +import com.tencent.supersonic.headless.api.query.pojo.MetricTable; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryDimValueReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryDimValueReq.java similarity index 82% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryDimValueReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryDimValueReq.java index 363e8417b..2aeceeab1 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryDimValueReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryDimValueReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryMultiStructReq.java similarity index 88% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryMultiStructReq.java index a216dd16b..9e69c78e4 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryMultiStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import com.alibaba.fastjson.JSONObject; import java.util.List; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryS2SQLReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryS2SQLReq.java similarity index 90% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryS2SQLReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryS2SQLReq.java index 978338491..56e005c4d 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryS2SQLReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryS2SQLReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import com.google.common.collect.Lists; import lombok.Data; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryStructReq.java similarity index 98% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryStructReq.java index e7cc62cd8..9d743d368 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/request/QueryStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.request; +package com.tencent.supersonic.headless.api.query.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Aggregator; @@ -12,8 +12,8 @@ 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.common.util.jsqlparser.SqlParserAddHelper; -import com.tencent.supersonic.semantic.api.query.pojo.Cache; -import com.tencent.supersonic.semantic.api.query.pojo.Param; +import com.tencent.supersonic.headless.api.query.pojo.Cache; +import com.tencent.supersonic.headless.api.query.pojo.Param; import lombok.Data; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/response/ItemUseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ItemUseResp.java similarity index 88% rename from semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/response/ItemUseResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ItemUseResp.java index d348b2e3c..f0875210f 100644 --- a/semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/response/ItemUseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/query/response/ItemUseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.api.query.response; +package com.tencent.supersonic.headless.api.query.response; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/semantic/materialization/pom.xml b/headless/materialization/pom.xml similarity index 83% rename from semantic/materialization/pom.xml rename to headless/materialization/pom.xml index 81f58fbed..4a57ee119 100644 --- a/semantic/materialization/pom.xml +++ b/headless/materialization/pom.xml @@ -3,17 +3,17 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - semantic + headless com.tencent.supersonic ${revision} 4.0.0 - semantic-materialization + headless-materialization com.tencent.supersonic - semantic-api + headless-api ${project.version} compile @@ -24,7 +24,7 @@ com.tencent.supersonic - semantic-model + headless-model ${project.version} compile diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java similarity index 93% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java index 742c95c14..2b6402eca 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationConfServiceImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationConfServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.application; +package com.tencent.supersonic.headless.materialization.application; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -7,32 +7,32 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementModelResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationSourceResp; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.MeasureResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.materialization.domain.MaterializationConfService; -import com.tencent.supersonic.semantic.materialization.domain.pojo.Materialization; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationElement; -import com.tencent.supersonic.semantic.materialization.domain.repository.MaterializationElementRepository; -import com.tencent.supersonic.semantic.materialization.domain.repository.MaterializationRepository; -import com.tencent.supersonic.semantic.materialization.domain.utils.MaterializationConverter; -import com.tencent.supersonic.semantic.materialization.domain.utils.MaterializationZipperUtils; -import com.tencent.supersonic.semantic.model.domain.ModelService; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementModelResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationSourceResp; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.MeasureResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.materialization.domain.MaterializationConfService; +import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; +import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationElementRepository; +import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRepository; +import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationConverter; +import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationZipperUtils; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationElement; +import com.tencent.supersonic.headless.model.domain.ModelService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationRecordServiceImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java similarity index 84% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationRecordServiceImpl.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java index 8cd0f6448..713e2cb9f 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/application/MaterializationRecordServiceImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/application/MaterializationRecordServiceImpl.java @@ -1,19 +1,19 @@ -package com.tencent.supersonic.semantic.materialization.application; +package com.tencent.supersonic.headless.materialization.application; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationDateFilter; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationDateResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationRecordResp; -import com.tencent.supersonic.semantic.materialization.domain.MaterializationRecordService; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationRecord; -import com.tencent.supersonic.semantic.materialization.domain.repository.MaterializationRecordRepository; -import com.tencent.supersonic.semantic.materialization.domain.utils.MaterializationRecordConverter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationDateFilter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationDateResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.materialization.domain.MaterializationRecordService; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; +import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRecordRepository; +import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationRecordConverter; import java.util.Arrays; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java similarity index 72% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java index ac6cad772..1a8af3899 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationConfService.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationConfService.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.materialization.domain; +package com.tencent.supersonic.headless.materialization.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementModelResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationSourceResp; -import com.tencent.supersonic.semantic.api.model.response.MeasureResp; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementModelResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationSourceResp; +import com.tencent.supersonic.headless.api.model.response.MeasureResp; import java.util.List; public interface MaterializationConfService { diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java similarity index 71% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java index 2425e9eb5..c0160fc06 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/MaterializationRecordService.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/MaterializationRecordService.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.materialization.domain; +package com.tencent.supersonic.headless.materialization.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationDateFilter; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationDateResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationDateFilter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationDateResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; import java.util.List; public interface MaterializationRecordService { diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDO.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDO.java similarity index 97% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDO.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDO.java index 5989f471b..018d20556 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDO.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; import java.util.Date; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDOExample.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDOExample.java similarity index 99% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDOExample.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDOExample.java index 94c607e17..247949c8a 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDOExample.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDOExample.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; import java.util.ArrayList; import java.util.Date; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDOWithBLOBs.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDOWithBLOBs.java similarity index 92% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDOWithBLOBs.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDOWithBLOBs.java index 7e99fd660..4c018fdae 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationDOWithBLOBs.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationDOWithBLOBs.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; public class MaterializationDOWithBLOBs extends MaterializationDO { private String dateInfo; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDO.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDO.java similarity index 96% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDO.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDO.java index a0a20a824..a8130be4a 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDO.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; import java.util.Date; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOExample.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOExample.java similarity index 99% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOExample.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOExample.java index 5683b0626..d3356821f 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOExample.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOExample.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; import java.util.ArrayList; import java.util.Date; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOKey.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOKey.java similarity index 90% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOKey.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOKey.java index fcd9e26fe..48f1b66f8 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOKey.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOKey.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; public class MaterializationElementDOKey { private Long id; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOWithBLOBs.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOWithBLOBs.java similarity index 89% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOWithBLOBs.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOWithBLOBs.java index 9e2542ccf..64288c031 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationElementDOWithBLOBs.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationElementDOWithBLOBs.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; public class MaterializationElementDOWithBLOBs extends MaterializationElementDO { private String depends; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationRecordDO.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationRecordDO.java similarity index 98% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationRecordDO.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationRecordDO.java index 42ee0fa4d..ecaf85f93 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationRecordDO.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationRecordDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; import lombok.Data; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationRecordDOExample.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationRecordDOExample.java similarity index 99% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationRecordDOExample.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationRecordDOExample.java index 5bc55894d..de241e365 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/dataobject/MaterializationRecordDOExample.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/dataobject/MaterializationRecordDOExample.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.dataobject; +package com.tencent.supersonic.headless.materialization.domain.dataobject; import java.util.ArrayList; import java.util.Date; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/Materialization.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java similarity index 78% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/Materialization.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java index 9bc42dd89..decc512f4 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/Materialization.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/Materialization.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.materialization.domain.pojo; +package com.tencent.supersonic.headless.materialization.domain.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; import lombok.Data; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/MaterializationElement.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java similarity index 76% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/MaterializationElement.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java index 51112c7d6..32040aa4a 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/MaterializationElement.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationElement.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.materialization.domain.pojo; +package com.tencent.supersonic.headless.materialization.domain.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; import lombok.Data; @Data diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/MaterializationRecord.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationRecord.java similarity index 90% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/MaterializationRecord.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationRecord.java index 333f4fe7e..4f5c21a19 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/pojo/MaterializationRecord.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/pojo/MaterializationRecord.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.materialization.domain.pojo; +package com.tencent.supersonic.headless.materialization.domain.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationElementRepository.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java similarity index 65% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationElementRepository.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java index 7ea85d579..3b18562ef 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationElementRepository.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationElementRepository.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.materialization.domain.repository; +package com.tencent.supersonic.headless.materialization.domain.repository; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationElement; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationElement; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationRecordRepository.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java similarity index 66% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationRecordRepository.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java index f568bc806..5130bf1a1 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationRecordRepository.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRecordRepository.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.materialization.domain.repository; +package com.tencent.supersonic.headless.materialization.domain.repository; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationRecordResp; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationRecord; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationRepository.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java similarity index 60% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationRepository.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java index 2987dc9c2..b5273d5c9 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/repository/MaterializationRepository.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/repository/MaterializationRepository.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.materialization.domain.repository; +package com.tencent.supersonic.headless.materialization.domain.repository; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.materialization.domain.pojo.Materialization; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationConverter.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java similarity index 89% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationConverter.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java index 454bcf232..2c79345b0 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationConverter.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationConverter.java @@ -1,20 +1,20 @@ -package com.tencent.supersonic.semantic.materialization.domain.utils; +package com.tencent.supersonic.headless.materialization.domain.utils; 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.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementTypeEnum; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.UpdateCycleEnum; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationDOWithBLOBs; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; -import com.tencent.supersonic.semantic.materialization.domain.pojo.Materialization; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationElement; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.materialization.enums.UpdateCycleEnum; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOWithBLOBs; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationElement; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationPartitionHelper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java similarity index 92% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationPartitionHelper.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java index 54b54aaec..b65d98c84 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationPartitionHelper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationPartitionHelper.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.materialization.domain.utils; +package com.tencent.supersonic.headless.materialization.domain.utils; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; import org.apache.logging.log4j.util.Strings; import org.springframework.util.CollectionUtils; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationRecordConverter.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java similarity index 89% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationRecordConverter.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java index 79891ebb0..2db77dc4c 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationRecordConverter.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationRecordConverter.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.semantic.materialization.domain.utils; +package com.tencent.supersonic.headless.materialization.domain.utils; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationRecordResp; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationRecordDO; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationRecord; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDO; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationUtils.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java similarity index 53% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationUtils.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java index aca96cf09..90c1d60c0 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationUtils.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationUtils.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.materialization.domain.utils; +package com.tencent.supersonic.headless.materialization.domain.utils; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; public interface MaterializationUtils { diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationZipperUtils.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java similarity index 90% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationZipperUtils.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java index c2f1b374e..a0cd566b7 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/domain/utils/MaterializationZipperUtils.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/domain/utils/MaterializationZipperUtils.java @@ -1,16 +1,16 @@ -package com.tencent.supersonic.semantic.materialization.domain.utils; +package com.tencent.supersonic.headless.materialization.domain.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementFrequencyEnum; -import com.tencent.supersonic.semantic.api.materialization.enums.ElementTypeEnum; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.api.materialization.enums.ElementFrequencyEnum; +import com.tencent.supersonic.headless.api.materialization.enums.ElementTypeEnum; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; import org.apache.logging.log4j.util.Strings; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java similarity index 60% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java index 7c05aa877..02eec8ac3 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOCustomMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.mapper; +package com.tencent.supersonic.headless.materialization.infrastructure.mapper; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationDOWithBLOBs; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOWithBLOBs; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationDOMapper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOMapper.java similarity index 77% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationDOMapper.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOMapper.java index 779ca2225..4ed7e432a 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationDOMapper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationDOMapper.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.mapper; +package com.tencent.supersonic.headless.materialization.infrastructure.mapper; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationDO; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationDOExample; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationDOWithBLOBs; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDO; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOExample; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOWithBLOBs; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationElementDOMapper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationElementDOMapper.java similarity index 78% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationElementDOMapper.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationElementDOMapper.java index ff2f1f507..85058e149 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationElementDOMapper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationElementDOMapper.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.mapper; +package com.tencent.supersonic.headless.materialization.infrastructure.mapper; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDO; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOExample; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOKey; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDO; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOExample; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOKey; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationRecordDOMapper.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationRecordDOMapper.java similarity index 83% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationRecordDOMapper.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationRecordDOMapper.java index 6ba124599..e7f80f944 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/mapper/MaterializationRecordDOMapper.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/mapper/MaterializationRecordDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.mapper; +package com.tencent.supersonic.headless.materialization.infrastructure.mapper; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationRecordDO; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationRecordDOExample; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDO; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDOExample; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java similarity index 85% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java index ef08df19b..be6c4a5ef 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationElementRepositoryImpl.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.repository; +package com.tencent.supersonic.headless.materialization.infrastructure.repository; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationElementResp; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOExample; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOKey; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationElement; -import com.tencent.supersonic.semantic.materialization.domain.repository.MaterializationElementRepository; -import com.tencent.supersonic.semantic.materialization.domain.utils.MaterializationConverter; -import com.tencent.supersonic.semantic.materialization.infrastructure.mapper.MaterializationElementDOMapper; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationElementResp; +import com.tencent.supersonic.headless.materialization.infrastructure.mapper.MaterializationElementDOMapper; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOExample; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOKey; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationElementDOWithBLOBs; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationElement; +import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationElementRepository; +import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationConverter; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java similarity index 89% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java index 8226544ec..b9cb957a6 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRecordRepositoryImpl.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.repository; +package com.tencent.supersonic.headless.materialization.infrastructure.repository; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationRecordResp; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationRecordDO; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationRecordDOExample; -import com.tencent.supersonic.semantic.materialization.domain.pojo.MaterializationRecord; -import com.tencent.supersonic.semantic.materialization.domain.repository.MaterializationRecordRepository; -import com.tencent.supersonic.semantic.materialization.domain.utils.MaterializationRecordConverter; -import com.tencent.supersonic.semantic.materialization.infrastructure.mapper.MaterializationRecordDOMapper; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDO; +import com.tencent.supersonic.headless.materialization.domain.pojo.MaterializationRecord; +import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRecordRepository; +import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationRecordConverter; +import com.tencent.supersonic.headless.materialization.infrastructure.mapper.MaterializationRecordDOMapper; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationRecordDOExample; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationRepositoryImpl.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java similarity index 81% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationRepositoryImpl.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java index 6f63ef64f..2c4af4bc5 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/infrastructure/repository/MaterializationRepositoryImpl.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/infrastructure/repository/MaterializationRepositoryImpl.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.materialization.infrastructure.repository; +package com.tencent.supersonic.headless.materialization.infrastructure.repository; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.materialization.domain.dataobject.MaterializationDOWithBLOBs; -import com.tencent.supersonic.semantic.materialization.domain.pojo.Materialization; -import com.tencent.supersonic.semantic.materialization.domain.repository.MaterializationRepository; -import com.tencent.supersonic.semantic.materialization.domain.utils.MaterializationConverter; -import com.tencent.supersonic.semantic.materialization.infrastructure.mapper.MaterializationDOCustomMapper; -import com.tencent.supersonic.semantic.materialization.infrastructure.mapper.MaterializationDOMapper; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.materialization.domain.pojo.Materialization; +import com.tencent.supersonic.headless.materialization.domain.repository.MaterializationRepository; +import com.tencent.supersonic.headless.materialization.domain.utils.MaterializationConverter; +import com.tencent.supersonic.headless.materialization.infrastructure.mapper.MaterializationDOCustomMapper; +import com.tencent.supersonic.headless.materialization.infrastructure.mapper.MaterializationDOMapper; +import com.tencent.supersonic.headless.materialization.domain.dataobject.MaterializationDOWithBLOBs; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java similarity index 89% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java index 10d5f2d8e..652a0c8bd 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationConfController.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationConfController.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.materialization.rest; +package com.tencent.supersonic.headless.materialization.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationConfFilter; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationFilter; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationElementReq; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationSourceResp; -import com.tencent.supersonic.semantic.materialization.domain.MaterializationConfService; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationConfFilter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationFilter; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationElementReq; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationSourceResp; +import com.tencent.supersonic.headless.materialization.domain.MaterializationConfService; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java similarity index 87% rename from semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java rename to headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java index 756447ec1..c7eb19441 100644 --- a/semantic/materialization/src/main/java/com/tencent/supersonic/semantic/materialization/rest/MaterializationRecordController.java +++ b/headless/materialization/src/main/java/com/tencent/supersonic/headless/materialization/rest/MaterializationRecordController.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.materialization.rest; +package com.tencent.supersonic.headless.materialization.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationDateFilter; -import com.tencent.supersonic.semantic.api.materialization.pojo.MaterializationRecordFilter; -import com.tencent.supersonic.semantic.api.materialization.request.MaterializationRecordReq; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationDateResp; -import com.tencent.supersonic.semantic.api.materialization.response.MaterializationRecordResp; -import com.tencent.supersonic.semantic.materialization.domain.MaterializationRecordService; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationDateFilter; +import com.tencent.supersonic.headless.api.materialization.pojo.MaterializationRecordFilter; +import com.tencent.supersonic.headless.api.materialization.request.MaterializationRecordReq; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationDateResp; +import com.tencent.supersonic.headless.api.materialization.response.MaterializationRecordResp; +import com.tencent.supersonic.headless.materialization.domain.MaterializationRecordService; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/semantic/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml b/headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml similarity index 92% rename from semantic/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml rename to headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml index 308ce140c..cc8fa3983 100644 --- a/semantic/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml +++ b/headless/materialization/src/main/resources/mapper/MaterializationDOCustomMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ - + @@ -59,7 +59,7 @@ date_info, entities, description - select * from s2_materialization diff --git a/semantic/materialization/src/main/resources/mapper/MaterializationDOMapper.xml b/headless/materialization/src/main/resources/mapper/MaterializationDOMapper.xml similarity index 93% rename from semantic/materialization/src/main/resources/mapper/MaterializationDOMapper.xml rename to headless/materialization/src/main/resources/mapper/MaterializationDOMapper.xml index 3a809feaf..a0f9e9ebf 100644 --- a/semantic/materialization/src/main/resources/mapper/MaterializationDOMapper.xml +++ b/headless/materialization/src/main/resources/mapper/MaterializationDOMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -17,7 +17,7 @@ - + @@ -58,7 +58,7 @@ date_info, entities, description - select distinct @@ -74,7 +74,7 @@ order by ${orderByClause} - select distinct @@ -100,7 +100,7 @@ delete from s2_materialization where id = #{id,jdbcType=BIGINT} - + insert into s2_materialization (id, name, materialized_type, update_cycle, model_id, database_id, level, status, destination_table, @@ -115,7 +115,7 @@ #{entities,jdbcType=LONGVARCHAR}, #{description,jdbcType=LONGVARCHAR}) - + insert into s2_materialization @@ -224,13 +224,13 @@ - select count(*) from s2_materialization - + update s2_materialization @@ -284,7 +284,7 @@ where id = #{id,jdbcType=BIGINT} - + update s2_materialization set name = #{name,jdbcType=VARCHAR}, materialized_type = #{materializedType,jdbcType=VARCHAR}, @@ -304,7 +304,7 @@ description = #{description,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=BIGINT} - + update s2_materialization set name = #{name,jdbcType=VARCHAR}, materialized_type = #{materializedType,jdbcType=VARCHAR}, diff --git a/semantic/materialization/src/main/resources/mapper/MaterializationElementDOMapper.xml b/headless/materialization/src/main/resources/mapper/MaterializationElementDOMapper.xml similarity index 91% rename from semantic/materialization/src/main/resources/mapper/MaterializationElementDOMapper.xml rename to headless/materialization/src/main/resources/mapper/MaterializationElementDOMapper.xml index 68ede5560..58021b907 100644 --- a/semantic/materialization/src/main/resources/mapper/MaterializationElementDOMapper.xml +++ b/headless/materialization/src/main/resources/mapper/MaterializationElementDOMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -15,7 +15,7 @@ - + @@ -55,7 +55,7 @@ depends, description - select distinct @@ -71,7 +71,7 @@ order by ${orderByClause} - select distinct @@ -85,7 +85,7 @@ order by ${orderByClause} - select , @@ -95,13 +95,13 @@ and type = #{type,jdbcType=VARCHAR} and materialization_id = #{materializationId,jdbcType=BIGINT} - + delete from s2_materialization_element where id = #{id,jdbcType=BIGINT} and type = #{type,jdbcType=VARCHAR} and materialization_id = #{materializationId,jdbcType=BIGINT} - + insert into s2_materialization_element (id, type, materialization_id, element_type, default_value, outlier, frequency, created_at, created_by, @@ -113,7 +113,7 @@ #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{depends,jdbcType=LONGVARCHAR}, #{description,jdbcType=LONGVARCHAR}) - + insert into s2_materialization_element @@ -204,13 +204,13 @@ - select count(*) from s2_materialization_element - + update s2_materialization_element @@ -251,7 +251,7 @@ and type = #{type,jdbcType=VARCHAR} and materialization_id = #{materializationId,jdbcType=BIGINT} - + update s2_materialization_element set element_type = #{elementType,jdbcType=VARCHAR}, default_value = #{defaultValue,jdbcType=VARCHAR}, @@ -268,7 +268,7 @@ and type = #{type,jdbcType=VARCHAR} and materialization_id = #{materializationId,jdbcType=BIGINT} - + update s2_materialization_element set element_type = #{elementType,jdbcType=VARCHAR}, default_value = #{defaultValue,jdbcType=VARCHAR}, diff --git a/semantic/materialization/src/main/resources/mapper/MaterializationRecordDOMapper.xml b/headless/materialization/src/main/resources/mapper/MaterializationRecordDOMapper.xml similarity index 93% rename from semantic/materialization/src/main/resources/mapper/MaterializationRecordDOMapper.xml rename to headless/materialization/src/main/resources/mapper/MaterializationRecordDOMapper.xml index c32cfdc68..428506000 100644 --- a/semantic/materialization/src/main/resources/mapper/MaterializationRecordDOMapper.xml +++ b/headless/materialization/src/main/resources/mapper/MaterializationRecordDOMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ - + @@ -58,7 +58,7 @@ message - select distinct @@ -74,7 +74,7 @@ order by ${orderByClause} - select distinct @@ -100,7 +100,7 @@ delete from s2_materialization_record where id = #{id,jdbcType=BIGINT} - + insert into s2_materialization_record (id, materialization_id, element_type, element_id, element_name, data_time, state, task_id, created_at, @@ -116,7 +116,7 @@ ON DUPLICATE KEY UPDATE updated_at = #{updatedAt}, retry_count = retry_count + 1 - + insert into s2_materialization_record @@ -219,13 +219,13 @@ - select count(*) from s2_materialization_record - + update s2_materialization_record @@ -276,7 +276,7 @@ where id = #{id,jdbcType=BIGINT} - + update s2_materialization_record set materialization_id = #{materializationId,jdbcType=BIGINT}, element_type = #{elementType,jdbcType=VARCHAR}, @@ -296,7 +296,7 @@ where id = #{id,jdbcType=BIGINT} - + update s2_materialization_record set element_id = #{elementId,jdbcType=BIGINT}, @@ -315,7 +315,7 @@ AND data_time = #{dataTime} - + update s2_materialization_record set materialization_id = #{materializationId,jdbcType=BIGINT}, element_type = #{elementType,jdbcType=VARCHAR}, diff --git a/semantic/model/pom.xml b/headless/model/pom.xml similarity index 96% rename from semantic/model/pom.xml rename to headless/model/pom.xml index a2b83eb14..a2f693b72 100644 --- a/semantic/model/pom.xml +++ b/headless/model/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - semantic + headless com.tencent.supersonic ${revision} 4.0.0 - semantic-model + headless-model 8 @@ -42,7 +42,7 @@ com.tencent.supersonic - semantic-api + headless-api ${project.version} compile diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java similarity index 78% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java index 6b837b658..c1290f423 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CatalogImpl.java @@ -1,23 +1,23 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.model.domain.DatabaseService; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelRelaService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.model.domain.DatabaseService; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelRelaService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CollectServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CollectServiceImpl.java similarity index 86% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CollectServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CollectServiceImpl.java index 693a3f12f..25d8c09a5 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CollectServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/CollectServiceImpl.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.model.domain.CollectService; -import com.tencent.supersonic.semantic.model.domain.dataobject.CollectDO; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.CollectMapper; +import com.tencent.supersonic.headless.model.domain.CollectService; +import com.tencent.supersonic.headless.model.infrastructure.mapper.CollectMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.CollectDO; import java.util.List; import javax.annotation.Resource; import lombok.extern.slf4j.Slf4j; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java similarity index 86% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java index f91724a9b..7432d3b30 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DatabaseServiceImpl.java @@ -1,21 +1,21 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.model.request.DatabaseReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.model.domain.DatabaseService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptor; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptorFactory; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDO; -import com.tencent.supersonic.semantic.model.domain.pojo.Database; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; -import com.tencent.supersonic.semantic.model.domain.repository.DatabaseRepository; -import com.tencent.supersonic.semantic.model.domain.utils.DatabaseConverter; -import com.tencent.supersonic.semantic.model.domain.utils.JdbcDataSourceUtils; -import com.tencent.supersonic.semantic.model.domain.utils.SqlUtils; +import com.tencent.supersonic.headless.api.model.request.DatabaseReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.DatabaseService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptorFactory; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDO; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.model.domain.utils.DatabaseConverter; +import com.tencent.supersonic.headless.model.domain.pojo.Database; +import com.tencent.supersonic.headless.model.domain.repository.DatabaseRepository; +import com.tencent.supersonic.headless.model.domain.utils.JdbcDataSourceUtils; +import com.tencent.supersonic.headless.model.domain.utils.SqlUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java similarity index 92% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java index cfc13253b..ab4717506 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DimensionServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DimensionServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -15,25 +15,25 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.ChatGptHelper; -import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.request.DimensionReq; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.model.domain.DatabaseService; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.ModelRelaService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.dataobject.DimensionDO; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.model.domain.repository.DimensionRepository; -import com.tencent.supersonic.semantic.model.domain.utils.DimensionConverter; -import com.tencent.supersonic.semantic.model.domain.utils.NameCheckUtils; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.request.DimensionReq; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.DatabaseService; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.ModelRelaService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.model.domain.repository.DimensionRepository; +import com.tencent.supersonic.headless.model.domain.utils.DimensionConverter; +import com.tencent.supersonic.headless.model.domain.utils.NameCheckUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java similarity index 94% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java index de3d2cba4..08788a95f 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/DomainServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -6,15 +6,15 @@ 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.semantic.api.model.request.DomainReq; -import com.tencent.supersonic.semantic.api.model.request.DomainUpdateReq; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.model.domain.DomainService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO; -import com.tencent.supersonic.semantic.model.domain.repository.DomainRepository; -import com.tencent.supersonic.semantic.model.domain.utils.DomainConvert; +import com.tencent.supersonic.headless.api.model.request.DomainReq; +import com.tencent.supersonic.headless.api.model.request.DomainUpdateReq; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.model.domain.DomainService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; +import com.tencent.supersonic.headless.model.domain.repository.DomainRepository; +import com.tencent.supersonic.headless.model.domain.utils.DomainConvert; import lombok.extern.slf4j.Slf4j; import org.assertj.core.util.Sets; import org.springframework.context.annotation.Lazy; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/MetricServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java similarity index 92% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/MetricServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java index d8de16a2b..52cbacb3d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/MetricServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/MetricServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -15,28 +15,28 @@ import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.ChatGptHelper; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.MetricReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.model.domain.CollectService; -import com.tencent.supersonic.semantic.model.domain.DomainService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.dataobject.CollectDO; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricQueryDefaultConfigDO; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.MetricFilter; -import com.tencent.supersonic.semantic.model.domain.repository.MetricRepository; -import com.tencent.supersonic.semantic.model.domain.utils.MetricConverter; -import com.tencent.supersonic.semantic.model.domain.utils.NameCheckUtils; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.MetricQueryDefaultConfig; +import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.MetricReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.model.domain.CollectService; +import com.tencent.supersonic.headless.model.domain.DomainService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricQueryDefaultConfigDO; +import com.tencent.supersonic.headless.model.domain.pojo.MetricFilter; +import com.tencent.supersonic.headless.model.domain.utils.MetricConverter; +import com.tencent.supersonic.headless.model.domain.utils.NameCheckUtils; +import com.tencent.supersonic.headless.model.domain.dataobject.CollectDO; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.model.domain.repository.MetricRepository; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelRelaServiceImpl.java similarity index 91% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelRelaServiceImpl.java index 4d42e9d3d..fd9b07235 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelRelaServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelRelaServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -8,9 +8,9 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.JoinCondition; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.semantic.model.domain.ModelRelaService; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelRelaDO; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.ModelRelaDOMapper; +import com.tencent.supersonic.headless.model.domain.ModelRelaService; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelRelaDO; +import com.tencent.supersonic.headless.model.infrastructure.mapper.ModelRelaDOMapper; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java index 77953dda4..cf79bf68c 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ModelServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; @@ -10,49 +10,49 @@ import com.tencent.supersonic.common.pojo.enums.EventType; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.Identify; -import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension; -import com.tencent.supersonic.semantic.api.model.request.DateInfoReq; -import com.tencent.supersonic.semantic.api.model.request.DimensionReq; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.MetricReq; -import com.tencent.supersonic.semantic.api.model.request.ModelReq; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MeasureResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; -import com.tencent.supersonic.semantic.model.domain.DatabaseService; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.DomainService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelRelaService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.dataobject.DateInfoDO; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; -import com.tencent.supersonic.semantic.model.domain.manager.DatasourceYamlManager; -import com.tencent.supersonic.semantic.model.domain.manager.DimensionYamlManager; -import com.tencent.supersonic.semantic.model.domain.manager.MetricYamlManager; -import com.tencent.supersonic.semantic.model.domain.pojo.Datasource; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; -import com.tencent.supersonic.semantic.model.domain.repository.DateInfoRepository; -import com.tencent.supersonic.semantic.model.domain.repository.ModelRepository; -import com.tencent.supersonic.semantic.model.domain.utils.DimensionConverter; -import com.tencent.supersonic.semantic.model.domain.utils.MetricConverter; -import com.tencent.supersonic.semantic.model.domain.utils.ModelConverter; -import com.tencent.supersonic.semantic.model.domain.utils.NameCheckUtils; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.Identify; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.model.request.DateInfoReq; +import com.tencent.supersonic.headless.api.model.request.DimensionReq; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.MetricReq; +import com.tencent.supersonic.headless.api.model.request.ModelReq; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MeasureResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.model.domain.DatabaseService; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.DomainService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelRelaService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.model.domain.manager.DatasourceYamlManager; +import com.tencent.supersonic.headless.model.domain.manager.DimensionYamlManager; +import com.tencent.supersonic.headless.model.domain.manager.MetricYamlManager; +import com.tencent.supersonic.headless.model.domain.pojo.Datasource; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.model.domain.repository.DateInfoRepository; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.model.domain.repository.ModelRepository; +import com.tencent.supersonic.headless.model.domain.utils.DimensionConverter; +import com.tencent.supersonic.headless.model.domain.utils.MetricConverter; +import com.tencent.supersonic.headless.model.domain.utils.ModelConverter; +import com.tencent.supersonic.headless.model.domain.utils.NameCheckUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java similarity index 80% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java index cc109cfaa..573a95a14 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ViewInfoServiceImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/application/ViewInfoServiceImpl.java @@ -1,20 +1,20 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; 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.semantic.api.model.request.ViewInfoReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaRelaResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.dataobject.ViewInfoDO; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.model.domain.repository.ViewInfoRepository; +import com.tencent.supersonic.headless.api.model.request.ViewInfoReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaRelaResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.dataobject.ViewInfoDO; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.model.domain.repository.ViewInfoRepository; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java similarity index 65% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java index 12c7b6813..80a681d9d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/Catalog.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/Catalog.java @@ -1,15 +1,15 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; import java.util.List; import java.util.Map; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/CollectService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/CollectService.java similarity index 74% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/CollectService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/CollectService.java index d549e8696..e104beee4 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/CollectService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/CollectService.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.model.domain.dataobject.CollectDO; +import com.tencent.supersonic.headless.model.domain.dataobject.CollectDO; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatabaseService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java similarity index 76% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatabaseService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java index 11d0546cf..3ba55310d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DatabaseService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DatabaseService.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.model.request.DatabaseReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.model.request.DatabaseReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DimensionService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java similarity index 74% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DimensionService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java index 0b67f441c..bfa00f8c3 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DimensionService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DimensionService.java @@ -1,15 +1,15 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.enums.EventType; -import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.request.DimensionReq; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.request.DimensionReq; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DomainService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java similarity index 76% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DomainService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java index 6a72d2adf..ff41f625e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DomainService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/DomainService.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.semantic.api.model.request.DomainReq; -import com.tencent.supersonic.semantic.api.model.request.DomainUpdateReq; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.request.DomainReq; +import com.tencent.supersonic.headless.api.model.request.DomainUpdateReq; +import com.tencent.supersonic.headless.api.model.response.DomainResp; import java.util.List; import java.util.Map; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/MetricService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java similarity index 74% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/MetricService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java index e58e37d06..2d6ea40ab 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/MetricService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/MetricService.java @@ -1,16 +1,16 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.enums.EventType; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.MetricReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.MetricQueryDefaultConfig; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.MetricReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import java.util.List; import java.util.Set; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelRelaService.java similarity index 88% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelRelaService.java index 54a763309..054cb79cd 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelRelaService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelRelaService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelService.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java similarity index 66% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelService.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java index f77e80914..95d9856f6 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelService.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/ModelService.java @@ -1,20 +1,20 @@ -package com.tencent.supersonic.semantic.model.domain; +package com.tencent.supersonic.headless.model.domain; 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.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.ModelReq; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.MeasureResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.ModelReq; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.MeasureResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; import java.util.List; import java.util.Map; import java.util.Set; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/ClickHouseAdaptor.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/ClickHouseAdaptor.java similarity index 97% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/ClickHouseAdaptor.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/ClickHouseAdaptor.java index 67b7165b4..8739ad0c9 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/ClickHouseAdaptor.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/ClickHouseAdaptor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter; +package com.tencent.supersonic.headless.model.domain.adaptor.engineadapter; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/EngineAdaptor.java similarity index 85% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/EngineAdaptor.java index 69d641569..b0d47621d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptor.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/EngineAdaptor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter; +package com.tencent.supersonic.headless.model.domain.adaptor.engineadapter; public abstract class EngineAdaptor { diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java similarity index 82% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java index 6f6cf3cdf..22ca6d737 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/EngineAdaptorFactory.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter; +package com.tencent.supersonic.headless.model.domain.adaptor.engineadapter; -import com.tencent.supersonic.semantic.model.domain.pojo.EngineTypeEnum; +import com.tencent.supersonic.headless.model.domain.pojo.EngineTypeEnum; import java.util.HashMap; import java.util.Map; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/H2Adaptor.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/H2Adaptor.java similarity index 97% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/H2Adaptor.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/H2Adaptor.java index be0889947..0b0628a04 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/H2Adaptor.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/H2Adaptor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter; +package com.tencent.supersonic.headless.model.domain.adaptor.engineadapter; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/MysqlAdaptor.java similarity index 97% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/MysqlAdaptor.java index e39d3d7c4..e6e1558cd 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/adaptor/engineadapter/MysqlAdaptor.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/adaptor/engineadapter/MysqlAdaptor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter; +package com.tencent.supersonic.headless.model.domain.adaptor.engineadapter; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.pojo.Constants; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/CollectDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/CollectDO.java similarity index 95% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/CollectDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/CollectDO.java index 491bb61ad..efae73350 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/CollectDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/CollectDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DatabaseDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DatabaseDO.java similarity index 98% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DatabaseDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DatabaseDO.java index 7086861ae..c22f7baa0 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DatabaseDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DatabaseDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import java.util.Date; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DatabaseDOExample.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DatabaseDOExample.java similarity index 99% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DatabaseDOExample.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DatabaseDOExample.java index 59959af7d..1090cafd3 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DatabaseDOExample.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DatabaseDOExample.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import java.util.ArrayList; import java.util.Date; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DateInfoDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DateInfoDO.java similarity index 84% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DateInfoDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DateInfoDO.java index e05be7b61..a21d7ce80 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DateInfoDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DateInfoDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import lombok.Data; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DimensionDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DimensionDO.java similarity index 93% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DimensionDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DimensionDO.java index d52e64ac1..c471e643e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DimensionDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DimensionDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DomainDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DomainDO.java similarity index 95% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DomainDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DomainDO.java index f45aa7305..86c8cc7e9 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DomainDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DomainDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DomainDOExample.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DomainDOExample.java similarity index 99% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DomainDOExample.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DomainDOExample.java index 63aa4d4ad..4c12cb19c 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/DomainDOExample.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/DomainDOExample.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import java.util.ArrayList; import java.util.Date; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/MetricDO.java similarity index 95% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/MetricDO.java index 021115a07..831d04f94 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/MetricDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricQueryDefaultConfigDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/MetricQueryDefaultConfigDO.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricQueryDefaultConfigDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/MetricQueryDefaultConfigDO.java index 8063033a6..74abf0b40 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricQueryDefaultConfigDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/MetricQueryDefaultConfigDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ModelDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ModelDO.java similarity index 93% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ModelDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ModelDO.java index dfb2495c9..cf04e79bf 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ModelDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ModelDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ModelRelaDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ModelRelaDO.java similarity index 87% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ModelRelaDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ModelRelaDO.java index b9a074274..aa2271f95 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ModelRelaDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ModelRelaDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ViewInfoDO.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ViewInfoDO.java similarity index 91% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ViewInfoDO.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ViewInfoDO.java index fc11d3ff8..1d41c8f88 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ViewInfoDO.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ViewInfoDO.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ViewInfoDOExample.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ViewInfoDOExample.java similarity index 99% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ViewInfoDOExample.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ViewInfoDOExample.java index 180247475..db1120678 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/ViewInfoDOExample.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/dataobject/ViewInfoDOExample.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.dataobject; +package com.tencent.supersonic.headless.model.domain.dataobject; import java.util.ArrayList; import java.util.Date; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/listener/MetaEmbeddingListener.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/listener/MetaEmbeddingListener.java similarity index 97% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/listener/MetaEmbeddingListener.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/listener/MetaEmbeddingListener.java index 402bff338..51e492fdc 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/listener/MetaEmbeddingListener.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/listener/MetaEmbeddingListener.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.listener; +package com.tencent.supersonic.headless.model.domain.listener; import com.alibaba.fastjson.JSONObject; import com.tencent.supersonic.common.pojo.DataEvent; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java similarity index 78% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java index db7c8eae4..e5e6292b4 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DatasourceYamlManager.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DatasourceYamlManager.java @@ -1,21 +1,21 @@ -package com.tencent.supersonic.semantic.model.domain.manager; +package com.tencent.supersonic.headless.model.domain.manager; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.Identify; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionTimeTypeParamsTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.IdentifyYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MeasureYamlTpl; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptor; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptorFactory; -import com.tencent.supersonic.semantic.model.domain.pojo.Datasource; -import com.tencent.supersonic.semantic.model.domain.pojo.DatasourceQueryEnum; -import com.tencent.supersonic.semantic.model.domain.utils.SysTimeDimensionBuilder; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.Identify; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionTimeTypeParamsTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.IdentifyYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MeasureYamlTpl; +import com.tencent.supersonic.headless.model.domain.pojo.Datasource; +import com.tencent.supersonic.headless.model.domain.pojo.DatasourceQueryEnum; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptorFactory; +import com.tencent.supersonic.headless.model.domain.utils.SysTimeDimensionBuilder; import java.util.Objects; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java similarity index 75% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java index c9c7a659b..e2981abd5 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/DimensionYamlManager.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/DimensionYamlManager.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.domain.manager; +package com.tencent.supersonic.headless.model.domain.manager; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.model.domain.pojo.Dimension; -import com.tencent.supersonic.semantic.model.domain.utils.DimensionConverter; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.model.domain.pojo.Dimension; +import com.tencent.supersonic.headless.model.domain.utils.DimensionConverter; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java similarity index 69% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java index 6e461f433..ca4376a92 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/manager/MetricYamlManager.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/manager/MetricYamlManager.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.model.domain.manager; +package com.tencent.supersonic.headless.model.domain.manager; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; -import com.tencent.supersonic.semantic.model.domain.pojo.Metric; -import com.tencent.supersonic.semantic.model.domain.utils.MetricConverter; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.model.domain.pojo.Metric; +import com.tencent.supersonic.headless.model.domain.utils.MetricConverter; import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ConnectInfo.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/ConnectInfo.java similarity index 74% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ConnectInfo.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/ConnectInfo.java index c2fd080d5..6dfa20032 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ConnectInfo.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/ConnectInfo.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import lombok.Data; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Database.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Database.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Database.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Database.java index e7c387336..492d27439 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Database.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Database.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import com.google.common.collect.Lists; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Datasource.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java similarity index 53% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Datasource.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java index 3d52fa1a1..98cd60ff4 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Datasource.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Datasource.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DatasourceQueryEnum.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/DatasourceQueryEnum.java similarity index 81% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DatasourceQueryEnum.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/DatasourceQueryEnum.java index 1314a890e..adb0058fd 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DatasourceQueryEnum.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/DatasourceQueryEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; public enum DatasourceQueryEnum { diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Dimension.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java similarity index 72% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Dimension.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java index 972ba9bb6..b27ffec1e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Dimension.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Dimension.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/DimensionFilter.java similarity index 65% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/DimensionFilter.java index f0b570bbb..f4afda3cb 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/DimensionFilter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/DimensionFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import lombok.Data; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java similarity index 72% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java index 7190c004d..1b84f2c9c 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Domain.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Domain.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; -import com.tencent.supersonic.semantic.api.model.pojo.Entity; -import com.tencent.supersonic.semantic.api.model.request.DomainReq; +import com.tencent.supersonic.headless.api.model.pojo.Entity; +import com.tencent.supersonic.headless.api.model.request.DomainReq; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import java.util.List; import lombok.Data; import org.springframework.beans.BeanUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/EngineTypeEnum.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/EngineTypeEnum.java similarity index 88% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/EngineTypeEnum.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/EngineTypeEnum.java index 91eeac39b..ce77e0217 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/EngineTypeEnum.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/EngineTypeEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; public enum EngineTypeEnum { diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java similarity index 97% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java index a376db1d6..e40c00170 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/JdbcDataSource.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/JdbcDataSource.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import static com.tencent.supersonic.common.pojo.Constants.STATISTIC; @@ -6,9 +6,9 @@ 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.semantic.api.model.enums.DataTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.model.domain.utils.JdbcDataSourceUtils; +import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.model.domain.utils.JdbcDataSourceUtils; import java.util.Arrays; import java.util.Map; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/MetaFilter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/MetaFilter.java similarity index 89% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/MetaFilter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/MetaFilter.java index 0ed3c9e35..baf721a84 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/MetaFilter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/MetaFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Metric.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java similarity index 66% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Metric.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java index c5c1c9524..40e0c2ba6 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Metric.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Metric.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/MetricFilter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/MetricFilter.java similarity index 63% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/MetricFilter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/MetricFilter.java index 334f2f453..0862f4741 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/MetricFilter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/MetricFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import lombok.Data; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Model.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java similarity index 62% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Model.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java index 1a1e8fb4b..30470b518 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Model.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/Model.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.Entity; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.Entity; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ModelFilter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/ModelFilter.java similarity index 73% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ModelFilter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/ModelFilter.java index 172942925..a06b64f67 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/ModelFilter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/pojo/ModelFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.pojo; +package com.tencent.supersonic.headless.model.domain.pojo; import lombok.Data; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DatabaseRepository.java similarity index 69% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DatabaseRepository.java index b899c3c5b..1f4ffcbd8 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DatabaseRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DatabaseRepository.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.model.domain.repository; +package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDO; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDO; import java.util.List; public interface DatabaseRepository { diff --git a/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java new file mode 100644 index 000000000..10004770a --- /dev/null +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DateInfoRepository.java @@ -0,0 +1,16 @@ +package com.tencent.supersonic.headless.model.domain.repository; + + +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.request.DateInfoReq; +import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; + +import java.util.List; + +public interface DateInfoRepository { + + Integer upsertDateInfo(List dateInfoReqs); + + List getDateInfos(ItemDateFilter itemDateFilter); + +} diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DimensionRepository.java similarity index 69% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DimensionRepository.java index dac6cda83..c6ed68e92 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DimensionRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DimensionRepository.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.domain.repository; +package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.DimensionDO; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; import java.util.List; public interface DimensionRepository { diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DomainRepository.java similarity index 68% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DomainRepository.java index 9ed6d3e46..7a9c76686 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/DomainRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/DomainRepository.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.domain.repository; +package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO; +import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/MetricRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/MetricRepository.java similarity index 71% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/MetricRepository.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/MetricRepository.java index be9c267b7..e9acf652d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/MetricRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/MetricRepository.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.domain.repository; +package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricQueryDefaultConfigDO; -import com.tencent.supersonic.semantic.model.domain.pojo.MetricFilter; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricQueryDefaultConfigDO; +import com.tencent.supersonic.headless.model.domain.pojo.MetricFilter; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/ModelRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/ModelRepository.java similarity index 60% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/ModelRepository.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/ModelRepository.java index 21ef1a134..d82c8ddd6 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/ModelRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/ModelRepository.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.model.domain.repository; +package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/ViewInfoRepository.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/ViewInfoRepository.java similarity index 70% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/ViewInfoRepository.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/ViewInfoRepository.java index 0b79932af..9f19cb4b2 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/repository/ViewInfoRepository.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/repository/ViewInfoRepository.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.model.domain.repository; +package com.tencent.supersonic.headless.model.domain.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.ViewInfoDO; +import com.tencent.supersonic.headless.model.domain.dataobject.ViewInfoDO; import java.util.List; public interface ViewInfoRepository { diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java similarity index 87% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java index 6696b7380..82688174c 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DatabaseConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DatabaseConverter.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import com.alibaba.fastjson.JSONObject; -import com.tencent.supersonic.semantic.api.model.request.DatabaseReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDO; -import com.tencent.supersonic.semantic.model.domain.pojo.ConnectInfo; -import com.tencent.supersonic.semantic.model.domain.pojo.Database; +import com.tencent.supersonic.headless.api.model.request.DatabaseReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDO; +import com.tencent.supersonic.headless.model.domain.pojo.ConnectInfo; +import com.tencent.supersonic.headless.model.domain.pojo.Database; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import java.util.Arrays; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java similarity index 89% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java index d94424914..82562d37d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DimensionConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DimensionConverter.java @@ -1,17 +1,17 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import com.alibaba.fastjson.JSONObject; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; 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.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.request.DimensionReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.model.domain.dataobject.DimensionDO; -import com.tencent.supersonic.semantic.model.domain.pojo.Dimension; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.request.DimensionReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; +import com.tencent.supersonic.headless.model.domain.pojo.Dimension; import org.apache.logging.log4j.util.Strings; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java similarity index 86% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java index 043256250..fae1cbd0b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/DomainConvert.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/DomainConvert.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.model.request.DomainReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO; +import com.tencent.supersonic.headless.api.model.request.DomainReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java similarity index 95% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java index 9b3fc51dc..bea3a117e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/JdbcDataSourceUtils.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/JdbcDataSourceUtils.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import static com.tencent.supersonic.common.pojo.Constants.AT_SYMBOL; import static com.tencent.supersonic.common.pojo.Constants.COLON; @@ -10,11 +10,11 @@ import static com.tencent.supersonic.common.pojo.Constants.PATTERN_JDBC_TYPE; import static com.tencent.supersonic.common.pojo.Constants.SPACE; import com.alibaba.druid.util.StringUtils; -import com.tencent.supersonic.semantic.api.model.enums.DataTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; import com.tencent.supersonic.common.util.MD5Util; -import com.tencent.supersonic.semantic.model.domain.pojo.Database; -import com.tencent.supersonic.semantic.model.domain.pojo.JdbcDataSource; +import com.tencent.supersonic.headless.model.domain.pojo.Database; +import com.tencent.supersonic.headless.model.domain.pojo.JdbcDataSource; import java.sql.Connection; import java.sql.DriverManager; import java.sql.ResultSet; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/MetricConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java similarity index 85% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/MetricConverter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java index af6a111ed..4c0e88372 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/MetricConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/MetricConverter.java @@ -1,21 +1,21 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.DataFormat; import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.semantic.api.model.pojo.RelateDimension; -import com.tencent.supersonic.semantic.api.model.request.MetricReq; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.yaml.MeasureYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricTypeParamsYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO; -import com.tencent.supersonic.semantic.model.domain.pojo.Metric; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.model.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.model.request.MetricReq; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.yaml.MeasureYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricTypeParamsYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.pojo.Metric; import org.springframework.beans.BeanUtils; import java.util.ArrayList; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java index a8c0bcd15..c264fd086 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/ModelConverter.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/ModelConverter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; @@ -6,20 +6,20 @@ 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.semantic.api.model.enums.MetricTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.Identify; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.request.DimensionReq; -import com.tencent.supersonic.semantic.api.model.request.MetricReq; -import com.tencent.supersonic.semantic.api.model.request.ModelReq; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MeasureResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.api.model.enums.MetricTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.Identify; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.request.DimensionReq; +import com.tencent.supersonic.headless.api.model.request.MetricReq; +import com.tencent.supersonic.headless.api.model.request.ModelReq; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MeasureResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.util.CollectionUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/NameCheckUtils.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/NameCheckUtils.java similarity index 84% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/NameCheckUtils.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/NameCheckUtils.java index 0af05cf5b..c813da324 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/NameCheckUtils.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/NameCheckUtils.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; import java.util.regex.Pattern; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java similarity index 96% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java index f858095fb..54a670737 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SqlUtils.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SqlUtils.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; 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.semantic.api.model.enums.DataTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.model.domain.pojo.JdbcDataSource; +import com.tencent.supersonic.headless.api.model.enums.DataTypeEnum; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.pojo.JdbcDataSource; import java.rmi.ServerException; import java.sql.Connection; import java.sql.ResultSet; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java similarity index 91% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java index 2388f1398..bbcb53cfe 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/SysTimeDimensionBuilder.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/domain/utils/SysTimeDimensionBuilder.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.model.domain.utils; +package com.tencent.supersonic.headless.model.domain.utils; -import com.tencent.supersonic.semantic.api.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.DimensionTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.DimensionTimeTypeParams; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptor; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/CollectMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/CollectMapper.java similarity index 69% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/CollectMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/CollectMapper.java index 8ba3e15ad..0980c7232 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/CollectMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/CollectMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.CollectDO; +import com.tencent.supersonic.headless.model.domain.dataobject.CollectDO; import org.apache.ibatis.annotations.Mapper; /** diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DatabaseDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DatabaseDOMapper.java similarity index 85% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DatabaseDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DatabaseDOMapper.java index 8f0df9a85..444a71885 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DatabaseDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DatabaseDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDO; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDOExample; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDO; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDOExample; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DateInfoMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java similarity index 57% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DateInfoMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java index 57617967f..c22ee4d90 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DateInfoMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DateInfoMapper.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; -import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.model.domain.dataobject.DateInfoDO; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DimensionDOCustomMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DimensionDOCustomMapper.java similarity index 66% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DimensionDOCustomMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DimensionDOCustomMapper.java index 312dfb150..2e2197431 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DimensionDOCustomMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DimensionDOCustomMapper.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.DimensionDO; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; import java.util.List; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DimensionDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DimensionDOMapper.java similarity index 60% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DimensionDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DimensionDOMapper.java index 1ec00edba..ddd4a889e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DimensionDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DimensionDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.DimensionDO; +import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DomainDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DomainDOMapper.java similarity index 59% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DomainDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DomainDOMapper.java index 2db653f95..8713bd334 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/DomainDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/DomainDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO; +import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricDOCustomMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricDOCustomMapper.java similarity index 64% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricDOCustomMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricDOCustomMapper.java index d593bc03b..fdef9fbd6 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricDOCustomMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricDOCustomMapper.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.pojo.MetricFilter; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; import java.util.List; -import com.tencent.supersonic.semantic.model.domain.pojo.MetricFilter; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricDOMapper.java similarity index 59% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricDOMapper.java index 205a9a77b..9b8b15c34 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricQueryDefaultConfigDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricQueryDefaultConfigDOMapper.java similarity index 65% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricQueryDefaultConfigDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricQueryDefaultConfigDOMapper.java index 36f81f655..0948d37de 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/MetricQueryDefaultConfigDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/MetricQueryDefaultConfigDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricQueryDefaultConfigDO; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricQueryDefaultConfigDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelDOCustomMapper.java similarity index 59% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelDOCustomMapper.java index eed177996..ab982f0de 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOCustomMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelDOCustomMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelDOMapper.java similarity index 59% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelDOMapper.java index 201f49337..6a09054ff 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelRelaDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelRelaDOMapper.java similarity index 61% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelRelaDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelRelaDOMapper.java index 1690e7598..5fd733635 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ModelRelaDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ModelRelaDOMapper.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelRelaDO; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelRelaDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ViewInfoDOMapper.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ViewInfoDOMapper.java similarity index 60% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ViewInfoDOMapper.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ViewInfoDOMapper.java index d276618ab..62a5c6948 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/mapper/ViewInfoDOMapper.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/mapper/ViewInfoDOMapper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.model.infrastructure.mapper; +package com.tencent.supersonic.headless.model.infrastructure.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.ViewInfoDO; +import com.tencent.supersonic.headless.model.domain.dataobject.ViewInfoDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DatabaseRepositoryImpl.java similarity index 76% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DatabaseRepositoryImpl.java index 13fd2c14f..120a753ef 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DatabaseRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DatabaseRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDO; -import com.tencent.supersonic.semantic.model.domain.dataobject.DatabaseDOExample; -import com.tencent.supersonic.semantic.model.domain.repository.DatabaseRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.DatabaseDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDO; +import com.tencent.supersonic.headless.model.infrastructure.mapper.DatabaseDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.DatabaseDOExample; +import com.tencent.supersonic.headless.model.domain.repository.DatabaseRepository; import java.util.List; import org.springframework.stereotype.Component; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java similarity index 86% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java index b98f36b40..e1482a61d 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DateInfoRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DateInfoRepositoryImpl.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Stopwatch; -import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.api.model.request.DateInfoReq; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.request.DateInfoReq; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.semantic.model.domain.dataobject.DateInfoDO; -import com.tencent.supersonic.semantic.model.domain.repository.DateInfoRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.DateInfoMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO; +import com.tencent.supersonic.headless.model.domain.repository.DateInfoRepository; +import com.tencent.supersonic.headless.model.infrastructure.mapper.DateInfoMapper; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DimensionRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DimensionRepositoryImpl.java similarity index 79% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DimensionRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DimensionRepositoryImpl.java index da36f1390..5319ede02 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DimensionRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DimensionRepositoryImpl.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; -import com.tencent.supersonic.semantic.model.domain.dataobject.DimensionDO; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; -import com.tencent.supersonic.semantic.model.domain.repository.DimensionRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.DimensionDOCustomMapper; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.DimensionDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.DimensionDO; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.infrastructure.mapper.DimensionDOCustomMapper; +import com.tencent.supersonic.headless.model.infrastructure.mapper.DimensionDOMapper; +import com.tencent.supersonic.headless.model.domain.repository.DimensionRepository; import org.springframework.stereotype.Service; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DomainRepositoryImpl.java similarity index 80% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DomainRepositoryImpl.java index 174bcbc0e..69dc2b679 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/DomainRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/DomainRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.tencent.supersonic.semantic.model.domain.dataobject.DomainDO; -import com.tencent.supersonic.semantic.model.domain.repository.DomainRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.DomainDOMapper; +import com.tencent.supersonic.headless.model.infrastructure.mapper.DomainDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.DomainDO; +import com.tencent.supersonic.headless.model.domain.repository.DomainRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/MetricRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/MetricRepositoryImpl.java similarity index 83% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/MetricRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/MetricRepositoryImpl.java index e9b9f9fbd..c07a8e92b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/MetricRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/MetricRepositoryImpl.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO; -import com.tencent.supersonic.semantic.model.domain.dataobject.MetricQueryDefaultConfigDO; -import com.tencent.supersonic.semantic.model.domain.pojo.MetricFilter; -import com.tencent.supersonic.semantic.model.domain.repository.MetricRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.MetricDOCustomMapper; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.MetricDOMapper; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.MetricQueryDefaultConfigDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricDO; +import com.tencent.supersonic.headless.model.domain.pojo.MetricFilter; +import com.tencent.supersonic.headless.model.infrastructure.mapper.MetricDOCustomMapper; +import com.tencent.supersonic.headless.model.infrastructure.mapper.MetricDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.MetricQueryDefaultConfigDO; +import com.tencent.supersonic.headless.model.domain.repository.MetricRepository; +import com.tencent.supersonic.headless.model.infrastructure.mapper.MetricQueryDefaultConfigDOMapper; import org.springframework.stereotype.Component; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/ModelRepositoryImpl.java similarity index 83% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/ModelRepositoryImpl.java index 1430c8ad5..6ca7ee747 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ModelRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/ModelRepositoryImpl.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; -import com.tencent.supersonic.semantic.model.domain.repository.ModelRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.ModelDOCustomMapper; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.ModelDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.model.infrastructure.mapper.ModelDOCustomMapper; +import com.tencent.supersonic.headless.model.infrastructure.mapper.ModelDOMapper; +import com.tencent.supersonic.headless.model.domain.repository.ModelRepository; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/ViewInfoRepositoryImpl.java similarity index 82% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/ViewInfoRepositoryImpl.java index 46819ff56..f893d3f43 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/infrastructure/repository/ViewInfoRepositoryImpl.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/infrastructure/repository/ViewInfoRepositoryImpl.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.infrastructure.repository; +package com.tencent.supersonic.headless.model.infrastructure.repository; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.tencent.supersonic.semantic.model.domain.dataobject.ViewInfoDO; -import com.tencent.supersonic.semantic.model.domain.repository.ViewInfoRepository; -import com.tencent.supersonic.semantic.model.infrastructure.mapper.ViewInfoDOMapper; +import com.tencent.supersonic.headless.model.domain.dataobject.ViewInfoDO; +import com.tencent.supersonic.headless.model.infrastructure.mapper.ViewInfoDOMapper; +import com.tencent.supersonic.headless.model.domain.repository.ViewInfoRepository; import org.springframework.stereotype.Component; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/CollectController.java similarity index 89% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/CollectController.java index aec6fd190..d9af9fe4b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/CollectController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/CollectController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.semantic.model.domain.CollectService; -import com.tencent.supersonic.semantic.model.domain.dataobject.CollectDO; +import com.tencent.supersonic.headless.model.domain.CollectService; +import com.tencent.supersonic.headless.model.domain.dataobject.CollectDO; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DatabaseController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DatabaseController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java index 6ec8152fa..943cbbd8e 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DatabaseController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DatabaseController.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.semantic.api.model.request.DatabaseReq; -import com.tencent.supersonic.semantic.api.model.request.SqlExecuteReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.model.domain.DatabaseService; +import com.tencent.supersonic.headless.api.model.request.DatabaseReq; +import com.tencent.supersonic.headless.api.model.request.SqlExecuteReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.DatabaseService; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java index 4c3ebc550..b0ed7cfa0 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DimensionController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DimensionController.java @@ -1,18 +1,18 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; 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.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.request.DimensionReq; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.pojo.DimensionFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.request.DimensionReq; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.pojo.DimensionFilter; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DomainController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java similarity index 89% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DomainController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java index 003def3ee..786f8389b 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/DomainController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/DomainController.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.semantic.api.model.request.DomainReq; -import com.tencent.supersonic.semantic.api.model.request.DomainUpdateReq; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.model.domain.DomainService; +import com.tencent.supersonic.headless.api.model.request.DomainReq; +import com.tencent.supersonic.headless.api.model.request.DomainUpdateReq; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.model.domain.DomainService; import java.util.Arrays; import java.util.List; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java similarity index 90% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java index aeb2d1e15..8d2f7e9c4 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/MetricController.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.github.pagehelper.PageInfo; @@ -6,15 +6,15 @@ import com.google.common.collect.Lists; 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.semantic.api.model.pojo.DrillDownDimension; -import com.tencent.supersonic.semantic.api.model.pojo.MetricQueryDefaultConfig; -import com.tencent.supersonic.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.MetricReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.MetricFilter; +import com.tencent.supersonic.headless.api.model.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.model.pojo.MetricQueryDefaultConfig; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.MetricReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.pojo.MetricFilter; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java similarity index 89% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java index 9552d2b4b..69ff2fed3 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelController.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.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.semantic.api.model.request.MetaBatchReq; -import com.tencent.supersonic.semantic.api.model.request.ModelReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.api.model.request.MetaBatchReq; +import com.tencent.supersonic.headless.api.model.request.ModelReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelRelaController.java similarity index 92% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelRelaController.java index 56540dbbe..77e16b2f0 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelRelaController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ModelRelaController.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.semantic.model.domain.ModelRelaService; +import com.tencent.supersonic.headless.model.domain.ModelRelaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java similarity index 87% rename from semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java rename to headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java index 97089978b..1d14c6f62 100644 --- a/semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ViewInfoController.java +++ b/headless/model/src/main/java/com/tencent/supersonic/headless/model/rest/ViewInfoController.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.semantic.model.rest; +package com.tencent.supersonic.headless.model.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; -import com.tencent.supersonic.semantic.api.model.request.ViewInfoReq; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaRelaResp; -import com.tencent.supersonic.semantic.model.application.ViewInfoServiceImpl; -import com.tencent.supersonic.semantic.model.domain.dataobject.ViewInfoDO; +import com.tencent.supersonic.headless.api.model.request.ViewInfoReq; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaRelaResp; +import com.tencent.supersonic.headless.model.domain.dataobject.ViewInfoDO; +import com.tencent.supersonic.headless.model.application.ViewInfoServiceImpl; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/semantic/model/src/main/resources/mapper/DatabaseDOMapper.xml b/headless/model/src/main/resources/mapper/DatabaseDOMapper.xml similarity index 92% rename from semantic/model/src/main/resources/mapper/DatabaseDOMapper.xml rename to headless/model/src/main/resources/mapper/DatabaseDOMapper.xml index f3fe6f9b8..cf99469d7 100644 --- a/semantic/model/src/main/resources/mapper/DatabaseDOMapper.xml +++ b/headless/model/src/main/resources/mapper/DatabaseDOMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -14,7 +14,7 @@ - + @@ -53,7 +53,7 @@ config - select distinct @@ -69,7 +69,7 @@ order by ${orderByClause} - select distinct @@ -98,7 +98,7 @@ delete from s2_database where id = #{id,jdbcType=BIGINT} - + insert into s2_database (id, name, description, version, type, created_at, created_by, updated_at, updated_by, @@ -110,7 +110,7 @@ #{admin,jdbcType=VARCHAR}, #{viewer,jdbcType=VARCHAR}, #{config,jdbcType=LONGVARCHAR} ) - + insert into s2_database @@ -189,13 +189,13 @@ - select count(*) from s2_database - + update s2_database @@ -234,7 +234,7 @@ where id = #{id,jdbcType=BIGINT} - + update s2_database set name = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, @@ -249,7 +249,7 @@ config = #{config,jdbcType=LONGVARCHAR} where id = #{id,jdbcType=BIGINT} - + update s2_database set name = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, diff --git a/semantic/model/src/main/resources/mapper/custom/DateInfoMapper.xml b/headless/model/src/main/resources/mapper/custom/DateInfoMapper.xml similarity index 94% rename from semantic/model/src/main/resources/mapper/custom/DateInfoMapper.xml rename to headless/model/src/main/resources/mapper/custom/DateInfoMapper.xml index 6ff811b16..538ef2cd9 100644 --- a/semantic/model/src/main/resources/mapper/custom/DateInfoMapper.xml +++ b/headless/model/src/main/resources/mapper/custom/DateInfoMapper.xml @@ -1,10 +1,10 @@ - + + type="com.tencent.supersonic.headless.model.domain.dataobject.DateInfoDO"> diff --git a/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml b/headless/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml similarity index 97% rename from semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml rename to headless/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml index b118cf481..75dd500a1 100644 --- a/semantic/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml +++ b/headless/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -20,7 +20,7 @@ - + diff --git a/semantic/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml b/headless/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml similarity index 97% rename from semantic/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml rename to headless/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml index 466ba6ab3..0bab71263 100644 --- a/semantic/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml +++ b/headless/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -20,7 +20,7 @@ - + diff --git a/semantic/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml b/headless/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml similarity index 90% rename from semantic/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml rename to headless/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml index b79cbfda7..56ee61c95 100644 --- a/semantic/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml +++ b/headless/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java b/headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java similarity index 89% rename from semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java rename to headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java index 0d735c288..486c6b5c8 100644 --- a/semantic/model/src/test/java/com/tencent/supersonic/semantic/model/application/ModelServiceImplTest.java +++ b/headless/model/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java @@ -1,28 +1,28 @@ -package com.tencent.supersonic.semantic.model.application; +package com.tencent.supersonic.headless.model.application; import com.google.common.collect.Lists; 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.semantic.api.model.enums.DimensionTypeEnum; -import com.tencent.supersonic.semantic.api.model.enums.IdentifyTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.pojo.DimensionTimeTypeParams; -import com.tencent.supersonic.semantic.api.model.pojo.Identify; -import com.tencent.supersonic.semantic.api.model.pojo.Measure; -import com.tencent.supersonic.semantic.api.model.pojo.ModelDetail; -import com.tencent.supersonic.semantic.api.model.request.ModelReq; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.model.domain.DatabaseService; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.DomainService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelRelaService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO; -import com.tencent.supersonic.semantic.model.domain.repository.DateInfoRepository; -import com.tencent.supersonic.semantic.model.domain.repository.ModelRepository; -import com.tencent.supersonic.semantic.model.domain.utils.ModelConverter; +import com.tencent.supersonic.headless.api.model.enums.DimensionTypeEnum; +import com.tencent.supersonic.headless.api.model.enums.IdentifyTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.api.model.pojo.Identify; +import com.tencent.supersonic.headless.api.model.pojo.Measure; +import com.tencent.supersonic.headless.api.model.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.model.request.ModelReq; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.DomainService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.repository.DateInfoRepository; +import com.tencent.supersonic.headless.model.domain.DatabaseService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelRelaService; +import com.tencent.supersonic.headless.model.domain.dataobject.ModelDO; +import com.tencent.supersonic.headless.model.domain.repository.ModelRepository; +import com.tencent.supersonic.headless.model.domain.utils.ModelConverter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/semantic/pom.xml b/headless/pom.xml similarity index 94% rename from semantic/pom.xml rename to headless/pom.xml index 3627ba509..be458539c 100644 --- a/semantic/pom.xml +++ b/headless/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - semantic + headless pom diff --git a/semantic/query/pom.xml b/headless/query/pom.xml similarity index 93% rename from semantic/query/pom.xml rename to headless/query/pom.xml index 95e933433..30d7d8b1c 100644 --- a/semantic/query/pom.xml +++ b/headless/query/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - semantic + headless com.tencent.supersonic ${revision} 4.0.0 - semantic-query + headless-query 8 @@ -38,7 +38,7 @@ com.tencent.supersonic - semantic-api + headless-api ${project.version} @@ -62,13 +62,13 @@ com.tencent.supersonic - semantic-model + headless-model ${project.version} compile com.tencent.supersonic - semantic-materialization + headless-materialization ${project.version} compile diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/executor/JdbcExecutor.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java similarity index 76% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/executor/JdbcExecutor.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java index d029c01fc..1f1db78ed 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/executor/JdbcExecutor.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/JdbcExecutor.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.query.executor; +package com.tencent.supersonic.headless.query.executor; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.model.domain.utils.SqlUtils; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.model.domain.utils.SqlUtils; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import lombok.extern.slf4j.Slf4j; import org.apache.logging.log4j.util.Strings; import org.springframework.stereotype.Component; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java new file mode 100644 index 000000000..a9a217aa3 --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/executor/QueryExecutor.java @@ -0,0 +1,12 @@ +package com.tencent.supersonic.headless.query.executor; + +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; + +public interface QueryExecutor { + + boolean accept(QueryStatement queryStatement); + + QueryResultWithSchemaResp execute(Catalog catalog, QueryStatement queryStatement); +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/optimizer/DetailQuery.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java similarity index 88% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/optimizer/DetailQuery.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java index ae17c14ef..81d7d725b 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/optimizer/DetailQuery.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/DetailQuery.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.optimizer; +package com.tencent.supersonic.headless.query.optimizer; import com.google.common.base.Strings; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.Objects; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java new file mode 100644 index 000000000..8734849e3 --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/optimizer/QueryOptimizer.java @@ -0,0 +1,8 @@ +package com.tencent.supersonic.headless.query.optimizer; + +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; + +public interface QueryOptimizer { + void rewrite(QueryStructReq queryStructCmd, QueryStatement queryStatement); +} diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/HeadlessConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/HeadlessConverter.java new file mode 100644 index 000000000..16b90cc9b --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/HeadlessConverter.java @@ -0,0 +1,16 @@ +package com.tencent.supersonic.headless.query.parser; + +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; + +public interface HeadlessConverter { + + boolean accept(QueryStatement queryStatement); + + void converter(Catalog catalog, QueryStructReq queryStructCmd, ParseSqlReq sqlCommend, MetricReq metricCommand) + throws Exception; + +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java similarity index 86% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java index e6821cd0e..c0c21068e 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/QueryParser.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.query.parser; +package com.tencent.supersonic.headless.query.parser; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.semantic.api.query.enums.AggOption; -import com.tencent.supersonic.semantic.api.query.pojo.MetricTable; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.utils.ComponentFactory; +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.pojo.MetricTable; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.utils.ComponentFactory; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -40,10 +40,10 @@ public class QueryParser { queryStatement.setMetricReq(new MetricReq()); } log.info("SemanticConverter before [{}]", queryStructReq); - for (SemanticConverter semanticConverter : ComponentFactory.getSemanticConverters()) { - if (semanticConverter.accept(queryStatement)) { - log.info("SemanticConverter accept [{}]", semanticConverter.getClass().getName()); - semanticConverter.converter(catalog, queryStructReq, queryStatement.getParseSqlReq(), + for (HeadlessConverter headlessConverter : ComponentFactory.getSemanticConverters()) { + if (headlessConverter.accept(queryStatement)) { + log.info("SemanticConverter accept [{}]", headlessConverter.getClass().getName()); + headlessConverter.converter(catalog, queryStructReq, queryStatement.getParseSqlReq(), queryStatement.getMetricReq()); } } diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java new file mode 100644 index 000000000..b7b282b27 --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/SqlParser.java @@ -0,0 +1,10 @@ +package com.tencent.supersonic.headless.query.parser; + +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; + +public interface SqlParser { + + QueryStatement explain(QueryStatement queryStatement, AggOption aggOption, Catalog catalog) throws Exception; +} diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java new file mode 100644 index 000000000..7813e9b62 --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/CalciteSqlParser.java @@ -0,0 +1,47 @@ +package com.tencent.supersonic.headless.query.parser.calcite; + +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.parser.SqlParser; +import com.tencent.supersonic.headless.query.parser.calcite.planner.AggPlanner; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.HeadlessModel; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; +import org.springframework.stereotype.Component; + +@Component("CalciteSqlParser") +public class CalciteSqlParser implements SqlParser { + private final HeadlessSchemaManager headlessSchemaManager; + + public CalciteSqlParser( + HeadlessSchemaManager headlessSchemaManager) { + this.headlessSchemaManager = headlessSchemaManager; + } + + @Override + public QueryStatement explain(QueryStatement queryStatement, AggOption isAgg, Catalog catalog) throws Exception { + MetricReq metricReq = queryStatement.getMetricReq(); + HeadlessModel headlessModel = headlessSchemaManager.get(metricReq.getRootPath()); + if (headlessModel == null) { + queryStatement.setErrMsg("semanticSchema not found"); + return queryStatement; + } + queryStatement.setMetricReq(metricReq); + HeadlessSchema headlessSchema = getSemanticSchema(headlessModel); + AggPlanner aggBuilder = new AggPlanner(headlessSchema); + aggBuilder.explain(queryStatement, isAgg); + queryStatement.setSql(aggBuilder.getSql()); + queryStatement.setSourceId(aggBuilder.getSourceId()); + return queryStatement; + } + + private HeadlessSchema getSemanticSchema(HeadlessModel headlessModel) { + HeadlessSchema headlessSchema = HeadlessSchema.newBuilder(headlessModel.getRootPath()).build(); + headlessSchema.setDatasource(headlessModel.getDatasourceMap()); + headlessSchema.setDimension(headlessModel.getDimensionMap()); + headlessSchema.setMetric(headlessModel.getMetrics()); + headlessSchema.setJoinRelations(headlessModel.getJoinRelations()); + return headlessSchema; + } +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/Configuration.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/Configuration.java similarity index 97% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/Configuration.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/Configuration.java index a234ad202..8fbfd5dca 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/Configuration.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/Configuration.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.query.parser.calcite; +package com.tencent.supersonic.headless.query.parser.calcite; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSqlDialect; +import com.tencent.supersonic.headless.query.parser.calcite.schema.SemanticSqlDialect; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java similarity index 82% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java index 645800092..a3b28ac74 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/SemanticSchemaManager.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/HeadlessSchemaManager.java @@ -1,31 +1,31 @@ -package com.tencent.supersonic.semantic.query.parser.calcite; +package com.tencent.supersonic.headless.query.parser.calcite; import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; 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.semantic.api.model.yaml.DataModelYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionTimeTypeParamsTpl; -import com.tencent.supersonic.semantic.api.model.yaml.DimensionYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.IdentifyYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MeasureYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricTypeParamsYamlTpl; -import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataType; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DimensionTimeTypeParams; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.JoinRelation; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization.TimePartType; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Measure; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.MetricTypeParams; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.SemanticModel; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; +import com.tencent.supersonic.headless.api.model.yaml.DataModelYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionTimeTypeParamsTpl; +import com.tencent.supersonic.headless.api.model.yaml.DimensionYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.IdentifyYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MeasureYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricTypeParamsYamlTpl; +import com.tencent.supersonic.headless.api.model.yaml.MetricYamlTpl; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataType; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.JoinRelation; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization.TimePartType; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Measure; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.MetricTypeParams; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.HeadlessModel; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -50,24 +50,24 @@ import org.springframework.util.CollectionUtils; @Slf4j @Service -public class SemanticSchemaManager { +public class HeadlessSchemaManager { @Autowired - private LoadingCache loadingCache; + private LoadingCache loadingCache; private final Catalog catalog; - public SemanticSchemaManager(Catalog catalog) { + public HeadlessSchemaManager(Catalog catalog) { this.catalog = catalog; } - public SemanticModel reload(String rootPath) { - SemanticModel semanticModel = new SemanticModel(); - semanticModel.setRootPath(rootPath); + public HeadlessModel reload(String rootPath) { + HeadlessModel headlessModel = new HeadlessModel(); + headlessModel.setRootPath(rootPath); Set modelIds = Arrays.stream(rootPath.split(",")).map(s -> Long.parseLong(s.trim())) .collect(Collectors.toSet()); if (modelIds.isEmpty()) { log.error("get modelIds empty {}", rootPath); - return semanticModel; + return headlessModel; } Map> dimensionYamlTpls = new HashMap<>(); List dataModelYamlTpls = new ArrayList<>(); @@ -76,30 +76,30 @@ public class SemanticSchemaManager { catalog.getModelYamlTplByModelIds(modelIds, dimensionYamlTpls, dataModelYamlTpls, metricYamlTpls, modelIdName); List modelRelas = catalog.getModelRela(new ArrayList<>(modelIds)); if (!CollectionUtils.isEmpty(modelRelas)) { - semanticModel.setJoinRelations(getJoinRelation(modelRelas, modelIdName)); + headlessModel.setJoinRelations(getJoinRelation(modelRelas, modelIdName)); } if (!dataModelYamlTpls.isEmpty()) { Map dataSourceMap = dataModelYamlTpls.stream().map(d -> getDatasource(d)) .collect(Collectors.toMap(DataSource::getName, item -> item, (k1, k2) -> k1)); - semanticModel.setDatasourceMap(dataSourceMap); + headlessModel.setDatasourceMap(dataSourceMap); } if (!dimensionYamlTpls.isEmpty()) { Map> dimensionMap = new HashMap<>(); for (Map.Entry> entry : dimensionYamlTpls.entrySet()) { dimensionMap.put(entry.getKey(), getDimensions(entry.getValue())); } - semanticModel.setDimensionMap(dimensionMap); + headlessModel.setDimensionMap(dimensionMap); } if (!metricYamlTpls.isEmpty()) { - semanticModel.setMetrics(getMetrics(metricYamlTpls)); + headlessModel.setMetrics(getMetrics(metricYamlTpls)); } - return semanticModel; + return headlessModel; } //private Map semanticSchemaMap = new HashMap<>(); - public SemanticModel get(String rootPath) throws Exception { + public HeadlessModel get(String rootPath) throws Exception { rootPath = formatKey(rootPath); - SemanticModel schema = loadingCache.get(rootPath); + HeadlessModel schema = loadingCache.get(rootPath); if (schema == null) { return null; } @@ -229,13 +229,13 @@ public class SemanticSchemaManager { return joinRelations; } - public static void update(SemanticSchema schema, List metric) throws Exception { + public static void update(HeadlessSchema schema, List metric) throws Exception { if (schema != null) { updateMetric(metric, schema.getMetrics()); } } - public static void update(SemanticSchema schema, DataSource datasourceYamlTpl) throws Exception { + public static void update(HeadlessSchema schema, DataSource datasourceYamlTpl) throws Exception { if (schema != null) { String dataSourceName = datasourceYamlTpl.getName(); Optional> datasourceYamlTplMap = schema.getDatasource().entrySet().stream() @@ -248,7 +248,7 @@ public class SemanticSchemaManager { } } - public static void update(SemanticSchema schema, String datasourceBizName, List dimensionYamlTpls) + public static void update(HeadlessSchema schema, String datasourceBizName, List dimensionYamlTpls) throws Exception { if (schema != null) { Optional>> datasourceYamlTplMap = schema.getDimension().entrySet() @@ -314,17 +314,17 @@ public class SemanticSchemaManager { private Integer maximumSize = 1000; @Bean - public LoadingCache getCache() { - LoadingCache cache + public LoadingCache getCache() { + LoadingCache cache = CacheBuilder.newBuilder() .expireAfterWrite(saveMinutes, TimeUnit.MINUTES) .initialCapacity(10) .maximumSize(maximumSize).build( - new CacheLoader() { + new CacheLoader() { @Override - public SemanticModel load(String key) { + public HeadlessModel load(String key) { log.info("load SemanticSchema [{}]", key); - return SemanticSchemaManager.this.reload(key); + return HeadlessSchemaManager.this.reload(key); } } ); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java similarity index 76% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java index 87c760007..1f78053f3 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/AggPlanner.java @@ -1,20 +1,20 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.planner; +package com.tencent.supersonic.headless.query.parser.calcite.planner; -import com.tencent.supersonic.semantic.api.query.enums.AggOption; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SchemaBuilder; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.Renderer; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.TableView; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.DataSourceNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.SemanticNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.render.FilterRender; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.render.OutputRender; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.render.SourceRender; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.schema.SchemaBuilder; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; +import com.tencent.supersonic.headless.query.parser.calcite.sql.Renderer; +import com.tencent.supersonic.headless.query.parser.calcite.sql.TableView; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.DataSourceNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.render.FilterRender; +import com.tencent.supersonic.headless.query.parser.calcite.sql.render.OutputRender; +import com.tencent.supersonic.headless.query.parser.calcite.sql.render.SourceRender; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.validate.SqlValidatorScope; @@ -28,7 +28,7 @@ import java.util.Stack; public class AggPlanner implements Planner { private MetricReq metricReq; - private SemanticSchema schema; + private HeadlessSchema schema; private SqlValidatorScope scope; private Stack dataSets = new Stack<>(); private SqlNode parserNode; @@ -36,7 +36,7 @@ public class AggPlanner implements Planner { private boolean isAgg = false; private AggOption aggOption = AggOption.DEFAULT; - public AggPlanner(SemanticSchema schema) { + public AggPlanner(HeadlessSchema schema) { this.schema = schema; } @@ -120,7 +120,7 @@ public class AggPlanner implements Planner { } @Override - public SemanticSchema findBest() { + public HeadlessSchema findBest() { return schema; } } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java similarity index 93% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java index 798ffb471..a6cf604f1 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/MaterializationPlanner.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/MaterializationPlanner.java @@ -1,21 +1,21 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.planner; +package com.tencent.supersonic.headless.query.parser.calcite.planner; import com.tencent.supersonic.common.util.calcite.SqlParseUtils; -import com.tencent.supersonic.semantic.api.query.enums.AggOption; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.Configuration; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization.TimePartType; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.MaterializationElement; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Measure; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.TimeRange; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SchemaBuilder; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.parser.calcite.Configuration; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization.TimePartType; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.MaterializationElement; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Measure; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.TimeRange; +import com.tencent.supersonic.headless.query.parser.calcite.schema.SchemaBuilder; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; @@ -59,7 +59,7 @@ import org.springframework.util.CollectionUtils; @Slf4j public class MaterializationPlanner implements Planner { - protected SemanticSchema schema; + protected HeadlessSchema schema; protected CalciteSchema viewSchema; protected HepProgramBuilder hepProgramBuilder; protected RelOptPlanner relOptPlanner; @@ -83,7 +83,7 @@ public class MaterializationPlanner implements Planner { } }; - public MaterializationPlanner(SemanticSchema schema) { + public MaterializationPlanner(HeadlessSchema schema) { this.schema = schema; init(); } @@ -220,7 +220,7 @@ public class MaterializationPlanner implements Planner { } @Override - public SemanticSchema findBest() { + public HeadlessSchema findBest() { return schema; } diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java new file mode 100644 index 000000000..190727468 --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/planner/Planner.java @@ -0,0 +1,17 @@ +package com.tencent.supersonic.headless.query.parser.calcite.planner; + + +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; + +public interface Planner { + + public void explain(QueryStatement queryStatement, AggOption aggOption) throws Exception; + + public String getSql(); + + public String getSourceId(); + + public HeadlessSchema findBest(); +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Constants.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Constants.java similarity index 92% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Constants.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Constants.java index 811b42bab..97ff70f38 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Constants.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Constants.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; public class Constants { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DataSource.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DataSource.java similarity index 78% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DataSource.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DataSource.java index 85bd23e1e..9ec3cb649 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DataSource.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DataSource.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization.TimePartType; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization.TimePartType; import java.util.List; import lombok.Builder; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DataType.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DataType.java similarity index 93% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DataType.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DataType.java index ac3865176..751fb0f37 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DataType.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DataType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import java.util.Arrays; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Dimension.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Dimension.java similarity index 76% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Dimension.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Dimension.java index d04cd610e..3822d53c5 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Dimension.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Dimension.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticItem; +import com.tencent.supersonic.headless.query.parser.calcite.schema.SemanticItem; import lombok.Builder; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DimensionTimeTypeParams.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DimensionTimeTypeParams.java similarity index 68% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DimensionTimeTypeParams.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DimensionTimeTypeParams.java index f0d201484..03699c5a4 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/DimensionTimeTypeParams.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/DimensionTimeTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/SemanticModel.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/HeadlessModel.java similarity index 83% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/SemanticModel.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/HeadlessModel.java index 43c3c0b79..fa1722167 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/SemanticModel.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/HeadlessModel.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import java.util.ArrayList; import java.util.HashMap; @@ -7,7 +7,7 @@ import java.util.Map; import lombok.Data; @Data -public class SemanticModel { +public class HeadlessModel { private String rootPath; private List metrics = new ArrayList<>(); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Identify.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Identify.java similarity index 82% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Identify.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Identify.java index 61a9f6027..b7446178e 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Identify.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Identify.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/JoinRelation.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/JoinRelation.java similarity index 82% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/JoinRelation.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/JoinRelation.java index a374a2747..798647bf8 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/JoinRelation.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/JoinRelation.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import java.util.List; import lombok.Builder; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Materialization.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Materialization.java similarity index 95% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Materialization.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Materialization.java index 6eb8a2499..7dfabfd04 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Materialization.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Materialization.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import java.util.ArrayList; import java.util.List; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/MaterializationElement.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/MaterializationElement.java similarity index 75% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/MaterializationElement.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/MaterializationElement.java index 8c8f19c43..606f65b11 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/MaterializationElement.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/MaterializationElement.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import java.util.List; import lombok.Builder; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Measure.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Measure.java similarity index 86% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Measure.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Measure.java index ed03a29d2..971e03cac 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Measure.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Measure.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Metric.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Metric.java similarity index 71% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Metric.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Metric.java index 13d65eeb7..1fd07fb35 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/Metric.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/Metric.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticItem; +import com.tencent.supersonic.headless.query.parser.calcite.schema.SemanticItem; import java.util.List; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/MetricTypeParams.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/MetricTypeParams.java similarity index 70% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/MetricTypeParams.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/MetricTypeParams.java index 92b1abfd0..9012b7cef 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/MetricTypeParams.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/MetricTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import java.util.List; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/TimeRange.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/TimeRange.java similarity index 68% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/TimeRange.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/TimeRange.java index bff7d66ae..25b7065a6 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/s2sql/TimeRange.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/s2sql/TimeRange.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.s2sql; +package com.tencent.supersonic.headless.query.parser.calcite.s2sql; import lombok.Builder; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/DataSourceTable.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/DataSourceTable.java similarity index 98% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/DataSourceTable.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/DataSourceTable.java index 26f22f37a..074d601f1 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/DataSourceTable.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/DataSourceTable.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.schema; +package com.tencent.supersonic.headless.query.parser.calcite.schema; import java.util.ArrayList; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/HeadlessSchema.java similarity index 64% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/HeadlessSchema.java index ccc392c74..9347da5ea 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSchema.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/HeadlessSchema.java @@ -1,12 +1,12 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.schema; +package com.tencent.supersonic.headless.query.parser.calcite.schema; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.JoinRelation; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.SemanticModel; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.JoinRelation; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.HeadlessModel; import org.apache.calcite.schema.Schema; import org.apache.calcite.schema.SchemaVersion; import org.apache.calcite.schema.Table; @@ -16,17 +16,17 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -public class SemanticSchema extends AbstractSchema { +public class HeadlessSchema extends AbstractSchema { private final String rootPath; private final Map tableMap; - private SemanticModel semanticModel = new SemanticModel(); + private HeadlessModel headlessModel = new HeadlessModel(); private List joinRelations; - private SemanticSchema(String rootPath, Map tableMap) { + private HeadlessSchema(String rootPath, Map tableMap) { this.rootPath = rootPath; this.tableMap = tableMap; } @@ -39,12 +39,12 @@ public class SemanticSchema extends AbstractSchema { return rootPath; } - public void setSemanticModel(SemanticModel semanticModel) { - this.semanticModel = semanticModel; + public void setSemanticModel(HeadlessModel headlessModel) { + this.headlessModel = headlessModel; } - public SemanticModel getSemanticModel() { - return semanticModel; + public HeadlessModel getSemanticModel() { + return headlessModel; } @Override @@ -58,35 +58,35 @@ public class SemanticSchema extends AbstractSchema { } public Map getDatasource() { - return semanticModel.getDatasourceMap(); + return headlessModel.getDatasourceMap(); } public void setDatasource(Map datasource) { - semanticModel.setDatasourceMap(datasource); + headlessModel.setDatasourceMap(datasource); } public Map> getDimension() { - return semanticModel.getDimensionMap(); + return headlessModel.getDimensionMap(); } public void setDimension(Map> dimensions) { - semanticModel.setDimensionMap(dimensions); + headlessModel.setDimensionMap(dimensions); } public List getMetrics() { - return semanticModel.getMetrics(); + return headlessModel.getMetrics(); } public void setMetric(List metric) { - semanticModel.setMetrics(metric); + headlessModel.setMetrics(metric); } public void setMaterializationList(List materializationList) { - semanticModel.setMaterializationList(materializationList); + headlessModel.setMaterializationList(materializationList); } public List getMaterializationList() { - return semanticModel.getMaterializationList(); + return headlessModel.getMaterializationList(); } public void setJoinRelations(List joinRelations) { @@ -121,8 +121,8 @@ public class SemanticSchema extends AbstractSchema { return this; } - public SemanticSchema build() { - return new SemanticSchema(rootPath, tableMap); + public HeadlessSchema build() { + return new HeadlessSchema(rootPath, tableMap); } } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSqlConformance.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/HeadlessSqlConformance.java similarity index 96% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSqlConformance.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/HeadlessSqlConformance.java index 9c557c566..17e74529c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSqlConformance.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/HeadlessSqlConformance.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.schema; +package com.tencent.supersonic.headless.query.parser.calcite.schema; import org.apache.calcite.sql.fun.SqlLibrary; import org.apache.calcite.sql.validate.SqlConformance; import org.apache.calcite.sql.validate.SqlConformanceEnum; -public class SemanticSqlConformance implements SqlConformance { +public class HeadlessSqlConformance implements SqlConformance { @Override public boolean isLiberal() { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SchemaBuilder.java similarity index 91% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SchemaBuilder.java index 2dcb0077f..7906e3633 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SchemaBuilder.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SchemaBuilder.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.schema; +package com.tencent.supersonic.headless.query.parser.calcite.schema; -import com.tencent.supersonic.semantic.query.parser.calcite.Configuration; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.S2SQLSqlValidatorImpl; +import com.tencent.supersonic.headless.query.parser.calcite.Configuration; +import com.tencent.supersonic.headless.query.parser.calcite.sql.S2SQLSqlValidatorImpl; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -24,7 +24,7 @@ public class SchemaBuilder { public static final String MATERIALIZATION_SYS_FIELD_DATE = "C1"; public static final String MATERIALIZATION_SYS_FIELD_DATA = "C2"; - public static SqlValidatorScope getScope(SemanticSchema schema) throws Exception { + public static SqlValidatorScope getScope(HeadlessSchema schema) throws Exception { Map nameToTypeMap = new HashMap<>(); CalciteSchema rootSchema = CalciteSchema.createRootSchema(true, false); rootSchema.add(schema.getRootPath(), schema); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticItem.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SemanticItem.java similarity index 52% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticItem.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SemanticItem.java index 887600da3..0523724ab 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticItem.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SemanticItem.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.schema; +package com.tencent.supersonic.headless.query.parser.calcite.schema; public interface SemanticItem { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSqlDialect.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SemanticSqlDialect.java similarity index 96% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSqlDialect.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SemanticSqlDialect.java index 979cda2d7..8fea0571a 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/schema/SemanticSqlDialect.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/schema/SemanticSqlDialect.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.schema; +package com.tencent.supersonic.headless.query.parser.calcite.schema; import com.google.common.base.Preconditions; import org.apache.calcite.avatica.util.Casing; @@ -22,7 +22,7 @@ public class SemanticSqlDialect extends SqlDialect { .withQuotedCasing(Casing.UNCHANGED) .withCaseSensitive(false); public static final SqlDialect DEFAULT = new SemanticSqlDialect(DEFAULT_CONTEXT); - private static final SqlConformance tagTdwSqlConformance = new SemanticSqlConformance(); + private static final SqlConformance tagTdwSqlConformance = new HeadlessSqlConformance(); public SemanticSqlDialect(Context context) { super(context); diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Optimization.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Optimization.java new file mode 100644 index 000000000..8a4bb093e --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Optimization.java @@ -0,0 +1,9 @@ +package com.tencent.supersonic.headless.query.parser.calcite.sql; + + +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; + +public interface Optimization { + + public void visit(SemanticNode semanticNode); +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/Renderer.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java similarity index 82% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/Renderer.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java index b123a90fc..c3855398e 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/Renderer.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/Renderer.java @@ -1,16 +1,16 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql; +package com.tencent.supersonic.headless.query.parser.calcite.sql; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.MeasureNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.MetricNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.SemanticNode; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Measure; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Measure; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.MeasureNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.MetricNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; import java.util.HashSet; import java.util.List; import java.util.Optional; @@ -33,7 +33,7 @@ public abstract class Renderer { return datasource.getMeasures().stream().filter(mm -> mm.getName().equalsIgnoreCase(name)).findFirst(); } - public static Optional getMetricByName(String name, SemanticSchema schema) { + public static Optional getMetricByName(String name, HeadlessSchema schema) { Optional metric = schema.getMetrics().stream().filter(m -> m.getName().equalsIgnoreCase(name)) .findFirst(); return metric; @@ -44,7 +44,7 @@ public abstract class Renderer { } public static MetricNode buildMetricNode(String metric, DataSource datasource, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg, String alias) throws Exception { + HeadlessSchema schema, boolean nonAgg, String alias) throws Exception { Optional metricOpt = getMetricByName(metric, schema); MetricNode metricNode = new MetricNode(); if (metricOpt.isPresent()) { @@ -102,5 +102,5 @@ public abstract class Renderer { } public abstract void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg) throws Exception; + HeadlessSchema schema, boolean nonAgg) throws Exception; } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/S2SQLSqlValidatorImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/S2SQLSqlValidatorImpl.java similarity index 89% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/S2SQLSqlValidatorImpl.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/S2SQLSqlValidatorImpl.java index 4343eef91..f7c68360d 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/S2SQLSqlValidatorImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/S2SQLSqlValidatorImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql; +package com.tencent.supersonic.headless.query.parser.calcite.sql; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.sql.SqlOperatorTable; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/TableView.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/TableView.java similarity index 92% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/TableView.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/TableView.java index eb72c4cfd..58e343b04 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/TableView.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/TableView.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql; +package com.tencent.supersonic.headless.query.parser.calcite.sql; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/AggFunctionNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/AggFunctionNode.java similarity index 91% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/AggFunctionNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/AggFunctionNode.java index b1eda105d..f9100eac9 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/AggFunctionNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/AggFunctionNode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.validate.SqlValidatorScope; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java similarity index 94% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java index 16017a463..5a366902d 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DataSourceNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DataSourceNode.java @@ -1,15 +1,15 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; import com.google.common.collect.Lists; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.Configuration; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.JoinRelation; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.extend.LateralViewExplodeNode; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.parser.calcite.Configuration; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.extend.LateralViewExplodeNode; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.JoinRelation; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; import lombok.extern.slf4j.Slf4j; import org.apache.calcite.sql.SqlBasicCall; import org.apache.calcite.sql.SqlDataTypeSpec; @@ -82,7 +82,7 @@ public class DataSourceNode extends SemanticNode { return dataSourceList.stream().map(d -> d.getName()).collect(Collectors.joining("_")); } - public static void getQueryDimensionMeasure(SemanticSchema schema, MetricReq metricCommand, + public static void getQueryDimensionMeasure(HeadlessSchema schema, MetricReq metricCommand, Set queryDimension, List measures) { queryDimension.addAll(metricCommand.getDimensions().stream() .map(d -> d.contains(Constants.DIMENSION_IDENTIFY) ? d.split(Constants.DIMENSION_IDENTIFY)[1] : d) @@ -94,7 +94,7 @@ public class DataSourceNode extends SemanticNode { } - public static void mergeQueryFilterDimensionMeasure(SemanticSchema schema, MetricReq metricCommand, + public static void mergeQueryFilterDimensionMeasure(HeadlessSchema schema, MetricReq metricCommand, Set queryDimension, List measures, SqlValidatorScope scope) throws Exception { if (Objects.nonNull(metricCommand.getWhere()) && !metricCommand.getWhere().isEmpty()) { @@ -117,7 +117,7 @@ public class DataSourceNode extends SemanticNode { } } - public static List getMatchDataSources(SqlValidatorScope scope, SemanticSchema schema, + public static List getMatchDataSources(SqlValidatorScope scope, HeadlessSchema schema, MetricReq metricCommand) throws Exception { List dataSources = new ArrayList<>(); @@ -216,7 +216,7 @@ public class DataSourceNode extends SemanticNode { } private static List getLinkDataSourcesByJoinRelation(Set queryDimension, List measures, - DataSource baseDataSource, SemanticSchema schema) { + DataSource baseDataSource, HeadlessSchema schema) { Set linkDataSourceName = new HashSet<>(); List linkDataSources = new ArrayList<>(); Set before = new HashSet<>(); @@ -282,7 +282,7 @@ public class DataSourceNode extends SemanticNode { Set queryDimension, List measures, DataSource baseDataSource, - SemanticSchema schema) { + HeadlessSchema schema) { Set linkDataSourceName = new HashSet<>(); List linkDataSources = new ArrayList<>(); for (Map.Entry entry : schema.getDatasource().entrySet()) { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DimensionNode.java similarity index 92% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DimensionNode.java index b351110e9..0acd5038d 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/DimensionNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/DimensionNode.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/ExtendNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/ExtendNode.java similarity index 95% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/ExtendNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/ExtendNode.java index 9cfef3fc3..9cce8ac9f 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/ExtendNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/ExtendNode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; import org.apache.calcite.sql.SqlCall; import org.apache.calcite.sql.SqlInternalOperator; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/FilterNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/FilterNode.java similarity index 93% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/FilterNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/FilterNode.java index 12709dceb..ec870f92e 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/FilterNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/FilterNode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; import java.util.Set; import org.apache.calcite.sql.SqlBasicCall; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/IdentifyNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/IdentifyNode.java similarity index 88% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/IdentifyNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/IdentifyNode.java index 8b80254c7..f2eaa7c29 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/IdentifyNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/IdentifyNode.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify.Type; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify.Type; import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/JoinNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/JoinNode.java similarity index 77% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/JoinNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/JoinNode.java index 0dddc1de7..73d0dd9ac 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/JoinNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/JoinNode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; import lombok.Data; import org.apache.calcite.sql.SqlNode; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/MeasureNode.java similarity index 93% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/MeasureNode.java index 5db3b95be..5fcda2f15 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MeasureNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/MeasureNode.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Measure; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Measure; import org.apache.calcite.sql.SqlNode; import org.apache.calcite.sql.validate.SqlValidatorScope; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MetricNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/MetricNode.java similarity index 88% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MetricNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/MetricNode.java index 8bea4779d..994e5e58d 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/MetricNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/MetricNode.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; import java.util.HashMap; import java.util.Map; import lombok.Data; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/SemanticNode.java similarity index 96% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/SemanticNode.java index 2e8eab4e7..f178d5d54 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/SemanticNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/SemanticNode.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node; -import com.tencent.supersonic.semantic.query.parser.calcite.Configuration; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSqlDialect; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.Optimization; +import com.tencent.supersonic.headless.query.parser.calcite.Configuration; +import com.tencent.supersonic.headless.query.parser.calcite.schema.SemanticSqlDialect; +import com.tencent.supersonic.headless.query.parser.calcite.sql.Optimization; import org.apache.calcite.jdbc.CalciteSchema; import org.apache.calcite.rel.RelNode; import org.apache.calcite.sql.JoinType; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/extend/LateralViewExplodeNode.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/extend/LateralViewExplodeNode.java similarity index 94% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/extend/LateralViewExplodeNode.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/extend/LateralViewExplodeNode.java index 6375bd8bd..961ed7040 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/node/extend/LateralViewExplodeNode.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/node/extend/LateralViewExplodeNode.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.node.extend; +package com.tencent.supersonic.headless.query.parser.calcite.sql.node.extend; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.ExtendNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.ExtendNode; import java.util.Iterator; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.sql.SqlCall; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/FilterRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java similarity index 77% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/FilterRender.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java index 107826ab1..df357774c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/FilterRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/FilterRender.java @@ -1,16 +1,16 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.render; +package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.Renderer; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.FilterNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.MetricNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.TableView; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.FilterNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.MetricNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.Renderer; +import com.tencent.supersonic.headless.query.parser.calcite.sql.TableView; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -26,7 +26,7 @@ public class FilterRender extends Renderer { @Override public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg) throws Exception { + HeadlessSchema schema, boolean nonAgg) throws Exception { TableView tableView = super.tableView; SqlNode filterNode = null; List queryMetrics = new ArrayList<>(metricCommand.getMetrics()); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java similarity index 92% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java index c31da113f..f8535df12 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/JoinRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/JoinRender.java @@ -1,22 +1,22 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.render; +package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.JoinRelation; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization.TimePartType; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.Renderer; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.TableView; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.AggFunctionNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.DataSourceNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.FilterNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.IdentifyNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.MetricNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization.TimePartType; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.AggFunctionNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.DataSourceNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.FilterNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.IdentifyNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.MetricNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.JoinRelation; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; +import com.tencent.supersonic.headless.query.parser.calcite.sql.Renderer; +import com.tencent.supersonic.headless.query.parser.calcite.sql.TableView; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -45,7 +45,7 @@ public class JoinRender extends Renderer { @Override public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg) throws Exception { + HeadlessSchema schema, boolean nonAgg) throws Exception { String queryWhere = metricCommand.getWhere(); //dataSources = getOrderSource(dataSources); Set whereFields = new HashSet<>(); @@ -137,7 +137,7 @@ public class JoinRender extends Renderer { private void doMetric(Map innerSelect, TableView filterView, List queryMetrics, List reqMetrics, DataSource dataSource, Set sourceMeasure, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg) throws Exception { + HeadlessSchema schema, boolean nonAgg) throws Exception { String alias = Constants.JOIN_TABLE_PREFIX + dataSource.getName(); for (String m : reqMetrics) { if (getMatchMetric(schema, sourceMeasure, m, queryMetrics)) { @@ -171,7 +171,7 @@ public class JoinRender extends Renderer { private void doDimension(Map innerSelect, Set filterDimension, List queryDimension, List reqDimensions, DataSource dataSource, Set dimension, SqlValidatorScope scope, - SemanticSchema schema) throws Exception { + HeadlessSchema schema) throws Exception { String alias = Constants.JOIN_TABLE_PREFIX + dataSource.getName(); for (String d : reqDimensions) { if (getMatchDimension(schema, dimension, dataSource, d, queryDimension)) { @@ -194,7 +194,7 @@ public class JoinRender extends Renderer { Collectors.toSet()); } - private boolean getMatchMetric(SemanticSchema schema, Set sourceMeasure, String m, + private boolean getMatchMetric(HeadlessSchema schema, Set sourceMeasure, String m, List queryMetrics) { Optional metric = schema.getMetrics().stream().filter(mm -> mm.getName().equalsIgnoreCase(m)) .findFirst(); @@ -215,7 +215,7 @@ public class JoinRender extends Renderer { return isAdd; } - private boolean getMatchDimension(SemanticSchema schema, Set sourceDimension, DataSource dataSource, + private boolean getMatchDimension(HeadlessSchema schema, Set sourceDimension, DataSource dataSource, String d, List queryDimension) { String oriDimension = d; boolean isAdd = false; @@ -250,7 +250,7 @@ public class JoinRender extends Renderer { private SqlNode buildJoin(SqlNode left, TableView leftTable, TableView tableView, Map before, DataSource dataSource, - SemanticSchema schema, SqlValidatorScope scope) + HeadlessSchema schema, SqlValidatorScope scope) throws Exception { SqlNode condition = getCondition(leftTable, tableView, dataSource, schema, scope); SqlLiteral sqlLiteral = SemanticNode.getJoinSqlLiteral(""); @@ -285,7 +285,7 @@ public class JoinRender extends Renderer { ); } - private JoinRelation getMatchJoinRelation(Map before, TableView tableView, SemanticSchema schema) { + private JoinRelation getMatchJoinRelation(Map before, TableView tableView, HeadlessSchema schema) { JoinRelation matchJoinRelation = JoinRelation.builder().build(); if (!CollectionUtils.isEmpty(schema.getJoinRelations())) { for (JoinRelation joinRelation : schema.getJoinRelations()) { @@ -329,7 +329,7 @@ public class JoinRender extends Renderer { return condition; } - private SqlNode getCondition(TableView left, TableView right, DataSource dataSource, SemanticSchema schema, + private SqlNode getCondition(TableView left, TableView right, DataSource dataSource, HeadlessSchema schema, SqlValidatorScope scope) throws Exception { Set selectLeft = SemanticNode.getSelect(left.getTable()); @@ -409,7 +409,7 @@ public class JoinRender extends Renderer { } } - private SqlNode getZipperCondition(TableView left, TableView right, DataSource dataSource, SemanticSchema schema, + private SqlNode getZipperCondition(TableView left, TableView right, DataSource dataSource, HeadlessSchema schema, SqlValidatorScope scope) throws Exception { if (TimePartType.ZIPPER.equals(left.getDataSource().getTimePartType()) && TimePartType.ZIPPER.equals( right.getDataSource().getTimePartType())) { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/OutputRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java similarity index 78% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/OutputRender.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java index 67df830fd..0500601c0 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/OutputRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/OutputRender.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.render; +package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.MetricReq; import com.tencent.supersonic.common.pojo.ColumnOrder; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.Renderer; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.TableView; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.Renderer; +import com.tencent.supersonic.headless.query.parser.calcite.sql.TableView; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; import java.util.ArrayList; import java.util.List; import org.apache.calcite.sql.SqlNode; @@ -21,7 +21,7 @@ public class OutputRender extends Renderer { @Override public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg) throws Exception { + HeadlessSchema schema, boolean nonAgg) throws Exception { TableView selectDataSet = super.tableView; for (String dimension : metricCommand.getDimensions()) { selectDataSet.getMeasure().add(SemanticNode.parse(dimension, scope)); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java similarity index 90% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java index a156ff3bf..1d78a4c57 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/sql/render/SourceRender.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/calcite/sql/render/SourceRender.java @@ -1,23 +1,23 @@ -package com.tencent.supersonic.semantic.query.parser.calcite.sql.render; +package com.tencent.supersonic.headless.query.parser.calcite.sql.render; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Constants; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.DataSource; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Dimension; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Identify; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Materialization.TimePartType; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Measure; -import com.tencent.supersonic.semantic.query.parser.calcite.s2sql.Metric; -import com.tencent.supersonic.semantic.query.parser.calcite.schema.SemanticSchema; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.Renderer; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.TableView; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.DataSourceNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.DimensionNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.FilterNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.IdentifyNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.MetricNode; -import com.tencent.supersonic.semantic.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Materialization.TimePartType; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Measure; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.DataSourceNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.DimensionNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.FilterNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.IdentifyNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.MetricNode; +import com.tencent.supersonic.headless.query.parser.calcite.sql.node.SemanticNode; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Constants; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.DataSource; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Dimension; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Identify; +import com.tencent.supersonic.headless.query.parser.calcite.s2sql.Metric; +import com.tencent.supersonic.headless.query.parser.calcite.schema.HeadlessSchema; +import com.tencent.supersonic.headless.query.parser.calcite.sql.Renderer; +import com.tencent.supersonic.headless.query.parser.calcite.sql.TableView; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -36,7 +36,7 @@ public class SourceRender extends Renderer { public static TableView renderOne(String alias, List fieldWheres, List reqMetrics, List reqDimensions, String queryWhere, DataSource datasource, - SqlValidatorScope scope, SemanticSchema schema, boolean nonAgg) throws Exception { + SqlValidatorScope scope, HeadlessSchema schema, boolean nonAgg) throws Exception { TableView dataSet = new TableView(); TableView output = new TableView(); @@ -88,7 +88,7 @@ public class SourceRender extends Renderer { return output; } - private static void buildDimension(String alias, String dimension, DataSource datasource, SemanticSchema schema, + private static void buildDimension(String alias, String dimension, DataSource datasource, HeadlessSchema schema, boolean nonAgg, Set extendFields, TableView dataSet, TableView output, SqlValidatorScope scope) throws Exception { List dimensionList = schema.getDimension().get(datasource.getName()); @@ -156,7 +156,7 @@ public class SourceRender extends Renderer { private static List getWhereMeasure(List fields, List queryMetrics, List queryDimensions, Set extendFields, DataSource datasource, SqlValidatorScope scope, - SemanticSchema schema, + HeadlessSchema schema, boolean nonAgg) throws Exception { Iterator iterator = fields.iterator(); List whereNode = new ArrayList<>(); @@ -200,7 +200,7 @@ public class SourceRender extends Renderer { private static void mergeWhere(List fields, TableView dataSet, TableView outputSet, List queryMetrics, List queryDimensions, Set extendFields, DataSource datasource, SqlValidatorScope scope, - SemanticSchema schema, + HeadlessSchema schema, boolean nonAgg) throws Exception { List whereNode = getWhereMeasure(fields, queryMetrics, queryDimensions, extendFields, datasource, scope, schema, @@ -210,7 +210,7 @@ public class SourceRender extends Renderer { } public static void whereDimMetric(List fields, List queryMetrics, - List queryDimensions, DataSource datasource, SemanticSchema schema, Set dimensions, + List queryDimensions, DataSource datasource, HeadlessSchema schema, Set dimensions, Set metrics) { for (String field : fields) { if (queryDimensions.contains(field) || queryMetrics.contains(field)) { @@ -224,7 +224,7 @@ public class SourceRender extends Renderer { } } - private static void addField(String field, String oriField, DataSource datasource, SemanticSchema schema, + private static void addField(String field, String oriField, DataSource datasource, HeadlessSchema schema, Set dimensions, Set metrics) { Optional dimension = datasource.getDimensions().stream() @@ -267,7 +267,7 @@ public class SourceRender extends Renderer { } } - public static boolean isDimension(String name, DataSource datasource, SemanticSchema schema) { + public static boolean isDimension(String name, DataSource datasource, HeadlessSchema schema) { Optional dimension = datasource.getDimensions().stream() .filter(d -> d.getName().equalsIgnoreCase(name)).findFirst(); if (dimension.isPresent()) { @@ -312,7 +312,7 @@ public class SourceRender extends Renderer { } public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - SemanticSchema schema, boolean nonAgg) throws Exception { + HeadlessSchema schema, boolean nonAgg) throws Exception { String queryWhere = metricCommand.getWhere(); Set whereFields = new HashSet<>(); List fieldWhere = new ArrayList<>(); diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java similarity index 95% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java index 9b151ab82..5aece9736 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/CalculateAggConverter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.convert; +package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.Aggregator; @@ -6,19 +6,19 @@ 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.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.query.enums.AggOption; -import com.tencent.supersonic.semantic.api.query.pojo.MetricTable; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.model.domain.pojo.EngineTypeEnum; -import com.tencent.supersonic.semantic.query.parser.SemanticConverter; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.service.SemanticQueryEngine; -import com.tencent.supersonic.semantic.query.utils.QueryStructUtils; -import com.tencent.supersonic.semantic.query.utils.SqlGenerateUtils; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.pojo.MetricTable; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.model.domain.pojo.EngineTypeEnum; +import com.tencent.supersonic.headless.query.parser.HeadlessConverter; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.service.HeadlessQueryEngine; +import com.tencent.supersonic.headless.query.utils.QueryStructUtils; +import com.tencent.supersonic.headless.query.utils.SqlGenerateUtils; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -33,10 +33,10 @@ import org.springframework.util.CollectionUtils; @Component("CalculateAggConverter") @Slf4j -public class CalculateAggConverter implements SemanticConverter { +public class CalculateAggConverter implements HeadlessConverter { - private final SemanticQueryEngine parserService; + private final HeadlessQueryEngine parserService; private final QueryStructUtils queryStructUtils; private final SqlGenerateUtils sqlGenerateUtils; private final Catalog catalog; @@ -46,7 +46,7 @@ public class CalculateAggConverter implements SemanticConverter { public CalculateAggConverter( - SemanticQueryEngine parserService, + HeadlessQueryEngine parserService, @Lazy QueryStructUtils queryStructUtils, SqlGenerateUtils sqlGenerateUtils, Catalog catalog) { this.parserService = parserService; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/DefaultDimValueConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java similarity index 78% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/DefaultDimValueConverter.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java index 3a22462af..99aeec3ab 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/DefaultDimValueConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/DefaultDimValueConverter.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.query.parser.convert; +package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.parser.SemanticConverter; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.parser.HeadlessConverter; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -18,7 +18,7 @@ import org.springframework.util.CollectionUtils; @Slf4j @Component("DefaultDimValueConverter") -public class DefaultDimValueConverter implements SemanticConverter { +public class DefaultDimValueConverter implements HeadlessConverter { @Override public boolean accept(QueryStatement queryStatement) { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/MetricCheckConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java similarity index 84% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/MetricCheckConverter.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java index 0f23abb5e..5c896f8ed 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/MetricCheckConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/MetricCheckConverter.java @@ -1,15 +1,15 @@ -package com.tencent.supersonic.semantic.query.parser.convert; +package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.parser.SemanticConverter; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.parser.HeadlessConverter; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.List; import java.util.Map; import java.util.Objects; @@ -22,7 +22,7 @@ import org.springframework.util.CollectionUtils; @Component("MetricCheckConverter") @Slf4j -public class MetricCheckConverter implements SemanticConverter { +public class MetricCheckConverter implements HeadlessConverter { @Override public boolean accept(QueryStatement queryStatement) { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java similarity index 81% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java index 5857a7374..71fb392b7 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ParserDefaultConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ParserDefaultConverter.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.query.parser.convert; +package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.ColumnOrder; -import com.tencent.supersonic.semantic.api.query.pojo.Param; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.parser.SemanticConverter; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.utils.QueryStructUtils; +import com.tencent.supersonic.headless.api.query.pojo.Param; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.parser.HeadlessConverter; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.utils.QueryStructUtils; import java.util.Objects; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; @@ -18,7 +18,7 @@ import org.springframework.util.CollectionUtils; @Component("ParserDefaultConverter") @Slf4j -public class ParserDefaultConverter implements SemanticConverter { +public class ParserDefaultConverter implements HeadlessConverter { private final CalculateAggConverter calculateCoverterAgg; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java similarity index 89% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java index 1407630c6..4c4721355 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/QueryReqConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/QueryReqConverter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.parser.convert; +package com.tencent.supersonic.headless.query.parser.convert; import com.tencent.supersonic.common.pojo.Aggregator; @@ -9,23 +9,23 @@ 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.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.request.SqlExecuteReq; -import com.tencent.supersonic.semantic.api.model.response.DatabaseResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.query.enums.AggOption; -import com.tencent.supersonic.semantic.api.query.pojo.MetricTable; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptor; -import com.tencent.supersonic.semantic.model.domain.adaptor.engineadapter.EngineAdaptorFactory; -import com.tencent.supersonic.semantic.model.domain.pojo.EngineTypeEnum; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.service.SemanticQueryEngine; -import com.tencent.supersonic.semantic.query.utils.QueryStructUtils; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.request.SqlExecuteReq; +import com.tencent.supersonic.headless.api.model.response.DatabaseResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.query.enums.AggOption; +import com.tencent.supersonic.headless.api.query.pojo.MetricTable; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptor; +import com.tencent.supersonic.headless.model.domain.adaptor.engineadapter.EngineAdaptorFactory; +import com.tencent.supersonic.headless.model.domain.pojo.EngineTypeEnum; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.service.HeadlessQueryEngine; +import com.tencent.supersonic.headless.query.utils.QueryStructUtils; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -49,7 +49,7 @@ public class QueryReqConverter { @Autowired private ModelService domainService; @Autowired - private SemanticQueryEngine parserService; + private HeadlessQueryEngine parserService; @Autowired private QueryStructUtils queryStructUtils; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ZipperModelConverter.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java similarity index 77% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ZipperModelConverter.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java index a2c7f83fe..fc1362610 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/ZipperModelConverter.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/parser/convert/ZipperModelConverter.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.semantic.query.parser.convert; +package com.tencent.supersonic.headless.query.parser.convert; -import com.tencent.supersonic.semantic.api.model.enums.ModelSourceTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.parser.SemanticConverter; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.utils.QueryStructUtils; +import com.tencent.supersonic.headless.api.model.enums.ModelSourceTypeEnum; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.parser.HeadlessConverter; +import com.tencent.supersonic.headless.query.utils.QueryStructUtils; import java.util.List; import java.util.Objects; import lombok.extern.slf4j.Slf4j; @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; */ @Component("ZipperModelConverter") @Slf4j -public class ZipperModelConverter implements SemanticConverter { +public class ZipperModelConverter implements HeadlessConverter { private final QueryStructUtils queryStructUtils; private final Catalog catalog; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/mapper/StatMapper.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java similarity index 54% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/mapper/StatMapper.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java index e7507e8a0..e26a4633c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/mapper/StatMapper.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/mapper/StatMapper.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.persistence.mapper; +package com.tencent.supersonic.headless.query.persistence.mapper; -import com.tencent.supersonic.semantic.api.model.pojo.QueryStat; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.model.pojo.QueryStat; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/ParserSvrResponse.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/ParserSvrResponse.java similarity index 88% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/ParserSvrResponse.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/ParserSvrResponse.java index c9c3f4385..337ce14ae 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/ParserSvrResponse.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/ParserSvrResponse.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.persistence.pojo; +package com.tencent.supersonic.headless.query.persistence.pojo; public class ParserSvrResponse { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java similarity index 74% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java index 1d9691186..628f761a0 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/pojo/QueryStatement.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/pojo/QueryStatement.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.persistence.pojo; +package com.tencent.supersonic.headless.query.persistence.pojo; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import lombok.Data; import org.apache.commons.lang3.tuple.ImmutablePair; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/repository/StatRepository.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java similarity index 51% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/repository/StatRepository.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java index 00ff644c7..327fb0c1c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/repository/StatRepository.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepository.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.persistence.repository; +package com.tencent.supersonic.headless.query.persistence.repository; -import com.tencent.supersonic.semantic.api.model.pojo.QueryStat; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.api.model.pojo.QueryStat; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; import java.util.List; public interface StatRepository { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/repository/StatRepositoryImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java similarity index 91% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/repository/StatRepositoryImpl.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java index f236c9421..ce95650c0 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/persistence/repository/StatRepositoryImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/persistence/repository/StatRepositoryImpl.java @@ -1,13 +1,13 @@ -package com.tencent.supersonic.semantic.query.persistence.repository; +package com.tencent.supersonic.headless.query.persistence.repository; import static com.tencent.supersonic.common.pojo.Constants.AT_SYMBOL; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import com.tencent.supersonic.semantic.api.model.pojo.QueryStat; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.api.model.pojo.QueryStat; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.query.persistence.mapper.StatMapper; +import com.tencent.supersonic.headless.query.persistence.mapper.StatMapper; import java.util.ArrayList; import java.util.Comparator; import java.util.List; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java similarity index 81% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java index 86f17e311..725351898 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/QueryController.java @@ -1,26 +1,26 @@ -package com.tencent.supersonic.semantic.query.rest; +package com.tencent.supersonic.headless.query.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.semantic.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.SqlParserResp; -import com.tencent.supersonic.semantic.api.query.request.BatchDownloadReq; -import com.tencent.supersonic.semantic.api.query.request.DownloadStructReq; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.service.DownloadService; -import com.tencent.supersonic.semantic.query.service.QueryService; -import com.tencent.supersonic.semantic.query.service.SemanticQueryEngine; +import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.model.response.SqlParserResp; +import com.tencent.supersonic.headless.api.query.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.query.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.service.DownloadService; +import com.tencent.supersonic.headless.query.service.QueryService; +import com.tencent.supersonic.headless.query.service.HeadlessQueryEngine; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -41,7 +41,7 @@ public class QueryController { @Autowired private QueryService queryService; @Autowired - private SemanticQueryEngine semanticQueryEngine; + private HeadlessQueryEngine headlessQueryEngine; @Autowired private DownloadService downloadService; @@ -90,7 +90,7 @@ public class QueryController { HttpServletRequest request, HttpServletResponse response) throws Exception { QueryStructReq queryStructCmd = new QueryStructReq(); - QueryStatement queryStatement = semanticQueryEngine.physicalSql(queryStructCmd, parseSqlReq); + QueryStatement queryStatement = headlessQueryEngine.physicalSql(queryStructCmd, parseSqlReq); SqlParserResp sqlParserResp = new SqlParserResp(); BeanUtils.copyProperties(queryStatement, sqlParserResp); return sqlParserResp; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/SchemaController.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java similarity index 81% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/SchemaController.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java index 83794e839..a1c449aad 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/SchemaController.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/rest/SchemaController.java @@ -1,18 +1,18 @@ -package com.tencent.supersonic.semantic.query.rest; +package com.tencent.supersonic.headless.query.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.common.pojo.enums.AuthType; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.query.service.SchemaService; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.query.service.SchemaService; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/AuthCommonService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java similarity index 95% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/AuthCommonService.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java index cda58a41a..6fe835b11 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/AuthCommonService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/AuthCommonService.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; @@ -16,14 +16,14 @@ 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.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DataPermission.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DataPermission.java similarity index 84% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DataPermission.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DataPermission.java index bf99309f8..5219920b3 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DataPermission.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DataPermission.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DownloadService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java similarity index 70% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DownloadService.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java index b85b81514..ff8cdb698 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DownloadService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadService.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.query.request.BatchDownloadReq; -import com.tencent.supersonic.semantic.api.query.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.query.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.query.request.DownloadStructReq; import javax.servlet.http.HttpServletResponse; public interface DownloadService { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java similarity index 93% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImpl.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java index 49ee72e28..f0e33bb94 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/DownloadServiceImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/DownloadServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -12,19 +12,19 @@ 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.semantic.api.model.enums.SemanticTypeEnum; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.pojo.DataDownload; -import com.tencent.supersonic.semantic.api.query.request.BatchDownloadReq; -import com.tencent.supersonic.semantic.api.query.request.DownloadStructReq; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.query.utils.DataTransformUtils; +import com.tencent.supersonic.headless.api.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.pojo.DataDownload; +import com.tencent.supersonic.headless.api.query.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.query.request.DownloadStructReq; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.query.utils.DataTransformUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.springframework.stereotype.Service; diff --git a/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java new file mode 100644 index 000000000..080b50c68 --- /dev/null +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngine.java @@ -0,0 +1,21 @@ +package com.tencent.supersonic.headless.query.service; + +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.executor.QueryExecutor; + +public interface HeadlessQueryEngine { + + QueryStatement plan(QueryStatement queryStatement) throws Exception; + + QueryExecutor route(QueryStatement queryStatement); + + QueryResultWithSchemaResp execute(QueryStatement queryStatement); + + QueryStatement physicalSql(QueryStructReq queryStructCmd, ParseSqlReq sqlCommend) throws Exception; + + QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricReq sqlCommend) throws Exception; +} diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java similarity index 77% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java index 40429f906..795730724 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SemanticQueryEngineImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/HeadlessQueryEngineImpl.java @@ -1,29 +1,29 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.executor.QueryExecutor; -import com.tencent.supersonic.semantic.query.optimizer.QueryOptimizer; -import com.tencent.supersonic.semantic.query.parser.QueryParser; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.utils.ComponentFactory; -import com.tencent.supersonic.semantic.query.utils.QueryUtils; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.executor.QueryExecutor; +import com.tencent.supersonic.headless.query.optimizer.QueryOptimizer; +import com.tencent.supersonic.headless.query.parser.QueryParser; +import com.tencent.supersonic.headless.query.utils.ComponentFactory; +import com.tencent.supersonic.headless.query.utils.QueryUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; @Slf4j @Component -public class SemanticQueryEngineImpl implements SemanticQueryEngine { +public class HeadlessQueryEngineImpl implements HeadlessQueryEngine { private final QueryParser queryParser; private final Catalog catalog; private final QueryUtils queryUtils; - public SemanticQueryEngineImpl(QueryParser queryParser, Catalog catalog, + public HeadlessQueryEngineImpl(QueryParser queryParser, Catalog catalog, QueryUtils queryUtils) { this.queryParser = queryParser; this.catalog = catalog; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java similarity index 57% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java index c5f6252b6..803beb0e5 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryService.java @@ -1,17 +1,17 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.List; public interface QueryService { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java similarity index 84% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java index 05717ec2c..c30d962bc 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/QueryServiceImpl.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.service; import com.google.common.cache.CacheBuilder; import com.google.common.collect.Lists; @@ -9,30 +9,30 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.cache.CacheUtils; -import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.Dim; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.ExplainResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.pojo.Cache; -import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.request.MetricReq; -import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.executor.QueryExecutor; -import com.tencent.supersonic.semantic.query.parser.convert.QueryReqConverter; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -import com.tencent.supersonic.semantic.query.utils.QueryUtils; -import com.tencent.supersonic.semantic.query.utils.S2SQLPermissionAnnotation; -import com.tencent.supersonic.semantic.query.utils.StatUtils; +import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.Dim; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.ExplainResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.pojo.Cache; +import com.tencent.supersonic.headless.api.query.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.request.MetricReq; +import com.tencent.supersonic.headless.api.query.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; +import com.tencent.supersonic.headless.query.executor.QueryExecutor; +import com.tencent.supersonic.headless.query.parser.convert.QueryReqConverter; +import com.tencent.supersonic.headless.query.utils.QueryUtils; +import com.tencent.supersonic.headless.query.utils.S2SQLPermissionAnnotation; +import com.tencent.supersonic.headless.query.utils.StatUtils; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; @@ -62,20 +62,20 @@ public class QueryServiceImpl implements QueryService { @Value("${query.cache.enable:true}") private Boolean cacheEnable; - private final SemanticQueryEngine semanticQueryEngine; + private final HeadlessQueryEngine headlessQueryEngine; public QueryServiceImpl( StatUtils statUtils, CacheUtils cacheUtils, QueryUtils queryUtils, QueryReqConverter queryReqConverter, - SemanticQueryEngine semanticQueryEngine, + HeadlessQueryEngine headlessQueryEngine, Catalog catalog) { this.statUtils = statUtils; this.cacheUtils = cacheUtils; this.queryUtils = queryUtils; this.queryReqConverter = queryReqConverter; - this.semanticQueryEngine = semanticQueryEngine; + this.headlessQueryEngine = headlessQueryEngine; this.catalog = catalog; } @@ -91,13 +91,13 @@ public class QueryServiceImpl implements QueryService { log.info("convertToQueryStatement has a exception:", e); } log.info("queryStatement:{}", queryStatement); - QueryResultWithSchemaResp results = semanticQueryEngine.execute(queryStatement); + QueryResultWithSchemaResp results = headlessQueryEngine.execute(queryStatement); statUtils.statInfo2DbAsync(TaskStatusEnum.SUCCESS); return results; } public Object queryByQueryStatement(QueryStatement queryStatement) { - return semanticQueryEngine.execute(queryStatement); + return headlessQueryEngine.execute(queryStatement); } private QueryStatement convertToQueryStatement(QueryS2SQLReq querySqlCmd, User user) throws Exception { @@ -131,10 +131,10 @@ public class QueryServiceImpl implements QueryService { QueryStatement queryStatement = new QueryStatement(); queryStatement.setQueryStructReq(queryStructCmd); queryStatement.setIsS2SQL(false); - queryStatement = semanticQueryEngine.plan(queryStatement); - QueryExecutor queryExecutor = semanticQueryEngine.route(queryStatement); + queryStatement = headlessQueryEngine.plan(queryStatement); + QueryExecutor queryExecutor = headlessQueryEngine.route(queryStatement); if (queryExecutor != null) { - queryResultWithColumns = semanticQueryEngine.execute(queryStatement); + queryResultWithColumns = headlessQueryEngine.execute(queryStatement); if (isCache) { // if queryResultWithColumns is not null, update cache data queryUtils.cacheResultLogic(cacheKey, queryResultWithColumns); @@ -175,7 +175,7 @@ public class QueryServiceImpl implements QueryService { log.info("stat queryByStructWithoutCache, queryMultiStructReq:{}", queryMultiStructReq); try { QueryStatement sqlParser = getQueryStatementByMultiStruct(queryMultiStructReq); - queryResultWithColumns = semanticQueryEngine.execute(sqlParser); + queryResultWithColumns = headlessQueryEngine.execute(sqlParser); if (queryResultWithColumns != null) { statUtils.statInfo2DbAsync(TaskStatusEnum.SUCCESS); queryUtils.fillItemNameInfo(queryResultWithColumns, queryMultiStructReq); @@ -194,7 +194,7 @@ public class QueryServiceImpl implements QueryService { QueryStatement queryStatement = new QueryStatement(); queryStatement.setQueryStructReq(queryStructCmd); queryStatement.setIsS2SQL(false); - queryStatement = semanticQueryEngine.plan(queryStatement); + queryStatement = headlessQueryEngine.plan(queryStatement); queryUtils.checkSqlParse(queryStatement); sqlParsers.add(queryStatement); } @@ -243,7 +243,7 @@ public class QueryServiceImpl implements QueryService { QueryStatement queryStatement = new QueryStatement(); queryStatement.setQueryStructReq((QueryStructReq) queryReq); queryStatement.setIsS2SQL(false); - queryStatement = semanticQueryEngine.plan(queryStatement); + queryStatement = headlessQueryEngine.plan(queryStatement); return getExplainResp(queryStatement); } if (QueryTypeEnum.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryMultiStructReq) { @@ -265,7 +265,7 @@ public class QueryServiceImpl implements QueryService { public QueryStatement parseMetricReq(MetricReq metricReq) throws Exception { QueryStructReq queryStructCmd = new QueryStructReq(); - return semanticQueryEngine.physicalSql(queryStructCmd, metricReq); + return headlessQueryEngine.physicalSql(queryStructCmd, metricReq); } private boolean isCache(QueryStructReq queryStructCmd) { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaService.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java similarity index 54% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaService.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java index 69e0a34c6..b3b0efe9d 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaService.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaService.java @@ -1,16 +1,16 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.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.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; import java.util.List; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java similarity index 81% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java index 2e91006be..5f3314279 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/service/SchemaServiceImpl.java @@ -1,25 +1,25 @@ -package com.tencent.supersonic.semantic.query.service; +package com.tencent.supersonic.headless.query.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.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq; -import com.tencent.supersonic.semantic.api.model.request.PageMetricReq; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.DomainResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.DomainService; -import com.tencent.supersonic.semantic.model.domain.MetricService; -import com.tencent.supersonic.semantic.model.domain.ModelService; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.model.request.PageMetricReq; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.DomainResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.DomainService; +import com.tencent.supersonic.headless.model.domain.MetricService; +import com.tencent.supersonic.headless.model.domain.ModelService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/ComponentFactory.java similarity index 62% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/ComponentFactory.java index 8205738c3..02a243365 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/ComponentFactory.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/ComponentFactory.java @@ -1,18 +1,18 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.semantic.query.executor.JdbcExecutor; -import com.tencent.supersonic.semantic.query.executor.QueryExecutor; -import com.tencent.supersonic.semantic.query.optimizer.DetailQuery; -import com.tencent.supersonic.semantic.query.optimizer.QueryOptimizer; -import com.tencent.supersonic.semantic.query.parser.SemanticConverter; -import com.tencent.supersonic.semantic.query.parser.SqlParser; -import com.tencent.supersonic.semantic.query.parser.calcite.CalciteSqlParser; -import com.tencent.supersonic.semantic.query.parser.convert.CalculateAggConverter; -import com.tencent.supersonic.semantic.query.parser.convert.DefaultDimValueConverter; -import com.tencent.supersonic.semantic.query.parser.convert.MetricCheckConverter; -import com.tencent.supersonic.semantic.query.parser.convert.ParserDefaultConverter; -import com.tencent.supersonic.semantic.query.parser.convert.ZipperModelConverter; +import com.tencent.supersonic.headless.query.parser.calcite.CalciteSqlParser; +import com.tencent.supersonic.headless.query.parser.convert.DefaultDimValueConverter; +import com.tencent.supersonic.headless.query.parser.convert.ZipperModelConverter; +import com.tencent.supersonic.headless.query.executor.JdbcExecutor; +import com.tencent.supersonic.headless.query.executor.QueryExecutor; +import com.tencent.supersonic.headless.query.optimizer.DetailQuery; +import com.tencent.supersonic.headless.query.optimizer.QueryOptimizer; +import com.tencent.supersonic.headless.query.parser.HeadlessConverter; +import com.tencent.supersonic.headless.query.parser.SqlParser; +import com.tencent.supersonic.headless.query.parser.convert.CalculateAggConverter; +import com.tencent.supersonic.headless.query.parser.convert.MetricCheckConverter; +import com.tencent.supersonic.headless.query.parser.convert.ParserDefaultConverter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -21,7 +21,7 @@ import java.util.stream.Collectors; public class ComponentFactory { - private static List semanticConverters = new ArrayList<>(); + private static List headlessConverters = new ArrayList<>(); private static List queryExecutors = new ArrayList<>(); private static Map queryOptimizers = new HashMap<>(); private static SqlParser sqlParser; @@ -32,11 +32,11 @@ public class ComponentFactory { initQueryOptimizer(); } - public static List getSemanticConverters() { - if (semanticConverters.isEmpty()) { + public static List getSemanticConverters() { + if (headlessConverters.isEmpty()) { initSemanticConverter(); } - return semanticConverters; + return headlessConverters; } public static List getQueryExecutors() { @@ -77,11 +77,11 @@ public class ComponentFactory { } private static void initSemanticConverter() { - semanticConverters.add(getBean("MetricCheckConverter", MetricCheckConverter.class)); - semanticConverters.add(getBean("DefaultDimValueConverter", DefaultDimValueConverter.class)); - semanticConverters.add(getBean("CalculateAggConverter", CalculateAggConverter.class)); - semanticConverters.add(getBean("ParserDefaultConverter", ParserDefaultConverter.class)); - semanticConverters.add(getBean("ZipperModelConverter", ZipperModelConverter.class)); + headlessConverters.add(getBean("MetricCheckConverter", MetricCheckConverter.class)); + headlessConverters.add(getBean("DefaultDimValueConverter", DefaultDimValueConverter.class)); + headlessConverters.add(getBean("CalculateAggConverter", CalculateAggConverter.class)); + headlessConverters.add(getBean("ParserDefaultConverter", ParserDefaultConverter.class)); + headlessConverters.add(getBean("ZipperModelConverter", ZipperModelConverter.class)); } private static void initQueryExecutors() { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataPermissionAOP.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DataPermissionAOP.java similarity index 92% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataPermissionAOP.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DataPermissionAOP.java index be9d626a2..c99cc6cff 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataPermissionAOP.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DataPermissionAOP.java @@ -1,4 +1,6 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; + +import static com.tencent.supersonic.common.pojo.Constants.MINUS; import com.google.common.base.Strings; import com.google.common.collect.Lists; @@ -7,14 +9,22 @@ 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.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.query.service.AuthCommonService; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.query.service.AuthCommonService; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.StringJoiner; +import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -26,17 +36,6 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.StringJoiner; -import java.util.stream.Collectors; - -import static com.tencent.supersonic.common.pojo.Constants.MINUS; - @Component @Aspect @Slf4j @@ -52,7 +51,7 @@ public class DataPermissionAOP { @Value("${permission.data.enable:true}") private Boolean permissionDataEnable; - @Pointcut("@annotation(com.tencent.supersonic.semantic.query.service.DataPermission)") + @Pointcut("@annotation(com.tencent.supersonic.headless.query.service.DataPermission)") public void dataPermissionAOP() { } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DataTransformUtils.java similarity index 98% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtils.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DataTransformUtils.java index b6de8dcdc..57a44c10b 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataTransformUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DataTransformUtils.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Constants; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java similarity index 94% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java index a950bbdbf..fca0ba2a0 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DimValueAspect.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/DimValueAspect.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Filter; @@ -8,13 +8,13 @@ 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.semantic.api.model.pojo.DimValueMap; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.api.model.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; @@ -47,7 +47,7 @@ public class DimValueAspect { @Autowired private DimensionService dimensionService; - @Around("execution(* com.tencent.supersonic.semantic.query.service.QueryServiceImpl.queryBySql(..))") + @Around("execution(* com.tencent.supersonic.headless.query.service.QueryServiceImpl.queryBySql(..))") public Object handleSqlDimValue(ProceedingJoinPoint joinPoint) throws Throwable { if (!dimensionValueMapSqlEnable) { log.debug("sql dimensionValueMapEnable is false, skip dimensionValueMap"); @@ -133,9 +133,9 @@ public class DimValueAspect { filedNameToValueMap.put(fieldName, map); } - @Around("execution(* com.tencent.supersonic.semantic.query.rest.QueryController.queryByStruct(..))" - + " || execution(* com.tencent.supersonic.semantic.query.service.QueryService.queryByStruct(..))" - + " || execution(* com.tencent.supersonic.semantic.query.service.QueryService.queryByStructWithAuth(..))") + @Around("execution(* com.tencent.supersonic.headless.query.rest.QueryController.queryByStruct(..))" + + " || execution(* com.tencent.supersonic.headless.query.service.QueryService.queryByStruct(..))" + + " || execution(* com.tencent.supersonic.headless.query.service.QueryService.queryByStructWithAuth(..))") public Object handleDimValue(ProceedingJoinPoint joinPoint) throws Throwable { if (!dimensionValueMapEnable) { diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java similarity index 95% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java index cc973cf3e..7ac9b8c12 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryStructUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryStructUtils.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import static com.tencent.supersonic.common.pojo.Constants.DAY; import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT; @@ -20,20 +20,20 @@ import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserRemoveHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.semantic.api.model.pojo.ItemDateFilter; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq; -import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.model.domain.pojo.EngineTypeEnum; -import com.tencent.supersonic.semantic.query.service.SchemaService; +import com.tencent.supersonic.headless.api.model.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.model.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.model.domain.pojo.EngineTypeEnum; +import com.tencent.supersonic.headless.query.service.SchemaService; import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.util.ArrayList; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java similarity index 95% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java index 1c873056e..93624adc0 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/QueryUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/QueryUtils.java @@ -1,24 +1,20 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.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.common.util.cache.CacheUtils; -import com.tencent.supersonic.semantic.api.model.enums.SemanticTypeEnum; -import com.tencent.supersonic.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.MetricResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq; -import com.tencent.supersonic.semantic.model.domain.Catalog; -import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement; -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; - -import javax.annotation.PostConstruct; +import com.tencent.supersonic.headless.api.model.enums.SemanticTypeEnum; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.MetricResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.model.domain.Catalog; +import com.tencent.supersonic.headless.query.persistence.pojo.QueryStatement; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; @@ -30,9 +26,12 @@ import java.util.concurrent.CompletableFuture; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; - -import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE; -import static com.tencent.supersonic.common.pojo.Constants.UNIONALL; +import javax.annotation.PostConstruct; +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 diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/S2SQLDataAspect.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/S2SQLDataAspect.java similarity index 92% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/S2SQLDataAspect.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/S2SQLDataAspect.java index 6d322b0bf..91758de04 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/S2SQLDataAspect.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/S2SQLDataAspect.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import com.google.common.base.Strings; import com.google.common.collect.Lists; @@ -7,15 +7,15 @@ 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.semantic.api.model.response.DimensionResp; -import com.tencent.supersonic.semantic.api.model.response.ModelResp; -import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.model.domain.DimensionService; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.model.domain.pojo.MetaFilter; -import com.tencent.supersonic.semantic.model.domain.pojo.ModelFilter; -import com.tencent.supersonic.semantic.query.service.AuthCommonService; +import com.tencent.supersonic.headless.api.model.response.DimensionResp; +import com.tencent.supersonic.headless.api.model.response.ModelResp; +import com.tencent.supersonic.headless.api.model.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.model.domain.DimensionService; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.model.domain.pojo.MetaFilter; +import com.tencent.supersonic.headless.model.domain.pojo.ModelFilter; +import com.tencent.supersonic.headless.query.service.AuthCommonService; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; @@ -58,7 +58,7 @@ public class S2SQLDataAspect { @Value("${permission.data.enable:true}") private Boolean permissionDataEnable; - @Pointcut("@annotation(com.tencent.supersonic.semantic.query.utils.S2SQLPermissionAnnotation)") + @Pointcut("@annotation(com.tencent.supersonic.headless.query.utils.S2SQLPermissionAnnotation)") private void s2SQLPermissionCheck() { } diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/S2SQLPermissionAnnotation.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/S2SQLPermissionAnnotation.java similarity index 86% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/S2SQLPermissionAnnotation.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/S2SQLPermissionAnnotation.java index 28b279a76..fe5b7a980 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/S2SQLPermissionAnnotation.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/S2SQLPermissionAnnotation.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import java.lang.annotation.Target; import java.lang.annotation.RetentionPolicy; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java similarity index 96% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java index eecd0414c..4d2d19c80 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/SqlGenerateUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/SqlGenerateUtils.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import static com.tencent.supersonic.common.pojo.Constants.JOIN_UNDERLINE; import com.tencent.supersonic.common.pojo.Aggregator; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java similarity index 89% rename from semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java rename to headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java index e5e2c2fc8..baf3ff48c 100644 --- a/semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java +++ b/headless/query/src/main/java/com/tencent/supersonic/headless/query/utils/StatUtils.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.semantic.query.utils; +package com.tencent.supersonic.headless.query.utils; import com.alibaba.ttl.TransmittableThreadLocal; import com.fasterxml.jackson.core.JsonProcessingException; @@ -7,18 +7,18 @@ 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.semantic.api.model.enums.QueryOptMode; -import com.tencent.supersonic.semantic.api.model.enums.QueryTypeBackEnum; -import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum; -import com.tencent.supersonic.semantic.api.model.pojo.QueryStat; -import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem; -import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp; -import com.tencent.supersonic.semantic.api.query.request.ItemUseReq; -import com.tencent.supersonic.semantic.api.query.request.QueryS2SQLReq; -import com.tencent.supersonic.semantic.api.query.request.QueryStructReq; -import com.tencent.supersonic.semantic.api.query.response.ItemUseResp; -import com.tencent.supersonic.semantic.model.domain.ModelService; -import com.tencent.supersonic.semantic.query.persistence.repository.StatRepository; +import com.tencent.supersonic.headless.api.model.enums.QueryOptMode; +import com.tencent.supersonic.headless.api.model.enums.QueryTypeBackEnum; +import com.tencent.supersonic.headless.api.model.enums.QueryTypeEnum; +import com.tencent.supersonic.headless.api.model.pojo.QueryStat; +import com.tencent.supersonic.headless.api.model.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.model.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.query.request.ItemUseReq; +import com.tencent.supersonic.headless.api.query.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.query.request.QueryStructReq; +import com.tencent.supersonic.headless.api.query.response.ItemUseResp; +import com.tencent.supersonic.headless.model.domain.ModelService; +import com.tencent.supersonic.headless.query.persistence.repository.StatRepository; import lombok.extern.slf4j.Slf4j; import org.apache.commons.codec.digest.DigestUtils; import org.apache.logging.log4j.util.Strings; diff --git a/semantic/query/src/main/resources/mapper/StatMapper.xml b/headless/query/src/main/resources/mapper/StatMapper.xml similarity index 95% rename from semantic/query/src/main/resources/mapper/StatMapper.xml rename to headless/query/src/main/resources/mapper/StatMapper.xml index 70d4cb00f..3f41c3ac2 100644 --- a/semantic/query/src/main/resources/mapper/StatMapper.xml +++ b/headless/query/src/main/resources/mapper/StatMapper.xml @@ -2,10 +2,10 @@ - + + type="com.tencent.supersonic.headless.api.model.pojo.QueryStat"> @@ -55,7 +55,7 @@