From 52fea5311d2f143222756f9d74965a8e9aa3409a Mon Sep 17 00:00:00 2001 From: LXW <1264174498@qq.com> Date: Tue, 2 Jan 2024 20:08:23 +0800 Subject: [PATCH] (improvement)(headless) Merge server and core in headless-api (#590) (improvement)(headless) Merge server and core in headless-api --------- Co-authored-by: jolunoluo --- .../api/component/SemanticInterpreter.java | 28 +++++------ .../chat/config/EntityInternalDetail.java | 4 +- .../parser/sql/llm/LLMRequestService.java | 4 +- .../chat/query/BaseSemanticQuery.java | 10 ++-- .../llm/analytics/MetricAnalyzeQuery.java | 4 +- .../chat/query/llm/s2sql/LLMSqlQuery.java | 4 +- .../chat/query/rule/RuleSemanticQuery.java | 6 +-- .../query/rule/metric/MetricFilterQuery.java | 4 +- .../rule/metric/MetricSemanticQuery.java | 2 +- .../query/rule/metric/MetricTagQuery.java | 4 +- .../chat/rest/ChatConfigController.java | 12 ++--- .../chat/service/SemanticService.java | 4 +- .../chat/service/impl/ConfigServiceImpl.java | 6 +-- .../chat/service/impl/PluginServiceImpl.java | 2 +- .../chat/service/impl/QueryServiceImpl.java | 4 +- .../supersonic/chat/utils/DictMetaHelper.java | 4 +- .../chat/utils/DictQueryHelper.java | 4 +- .../chat/utils/QueryReqBuilder.java | 6 +-- .../test/context/MockBeansConfiguration.java | 10 ++-- .../chat/utils/QueryReqBuilderTest.java | 4 +- .../semantic/BaseSemanticInterpreter.java | 2 +- .../semantic/LocalSemanticInterpreter.java | 30 ++++++------ .../semantic/ModelSchemaBuilder.java | 12 ++--- .../semantic/RemoteSemanticInterpreter.java | 30 ++++++------ .../{common/core => api}/enums/AggOption.java | 2 +- .../server => api}/enums/AppStatus.java | 2 +- .../server => api}/enums/DataType.java | 2 +- .../headless/api/enums/DimensionType.java | 9 ++++ .../headless/api/enums/IdentifyType.java | 8 ++++ .../headless/api/enums/MetricType.java | 9 ++++ .../server => api}/enums/ModelSourceType.java | 2 +- .../core => api}/enums/QueryOptMode.java | 2 +- .../server => api}/enums/QueryType.java | 2 +- .../core => api}/enums/QueryTypeBack.java | 2 +- .../server => api}/enums/SemanticType.java | 2 +- .../server => api}/pojo/AppConfig.java | 2 +- .../{common/core => api}/pojo/Cache.java | 2 +- .../{common/server => api}/pojo/Dim.java | 2 +- .../server => api}/pojo/DimValueMap.java | 2 +- .../pojo/DimensionTimeTypeParams.java | 2 +- .../pojo/DrillDownDimension.java | 2 +- .../{common/server => api}/pojo/Entity.java | 2 +- .../{common/server => api}/pojo/Identify.java | 2 +- .../{common/server => api}/pojo/Item.java | 2 +- .../server => api}/pojo/ItemDateFilter.java | 2 +- .../{common/server => api}/pojo/Measure.java | 2 +- .../pojo/MetricQueryDefaultConfig.java | 2 +- .../core => api}/pojo/MetricTable.java | 4 +- .../server => api}/pojo/MetricTypeParams.java | 2 +- .../server => api}/pojo/ModelDetail.java | 4 +- .../{common/core => api}/pojo/Param.java | 2 +- .../server => api}/pojo/QueryResult.java | 2 +- .../server => api}/pojo/QueryStat.java | 2 +- .../server => api}/pojo/RelateDimension.java | 2 +- .../server => api}/pojo/SchemaItem.java | 2 +- .../api/pojo/SingleItemQueryResult.java | 14 ++++++ .../server => api}/request/AppQueryReq.java | 4 +- .../server => api}/request/AppReq.java | 4 +- .../request/BatchDownloadReq.java | 2 +- .../server => api}/request/DatabaseReq.java | 4 +- .../server => api}/request/DateInfoReq.java | 2 +- .../server => api}/request/DimensionReq.java | 6 +-- .../server => api}/request/DomainReq.java | 4 +- .../request/DomainUpdateReq.java | 2 +- .../request/DownloadStructReq.java | 2 +- .../core => api}/request/ExplainSqlReq.java | 4 +- .../core => api}/request/ItemUseReq.java | 2 +- .../server => api}/request/MetaBatchReq.java | 2 +- .../server => api}/request/MetricBaseReq.java | 6 +-- .../request/MetricQueryReq.java} | 9 ++-- .../server => api}/request/MetricReq.java | 8 ++-- .../server => api}/request/ModelReq.java | 10 ++-- .../request/ModelSchemaFilterReq.java | 2 +- .../request/PageDimensionReq.java | 2 +- .../server => api}/request/PageMetricReq.java | 2 +- .../request/PageSchemaItemReq.java | 2 +- .../core => api}/request/ParseSqlReq.java | 4 +- .../request/QueryDimValueReq.java | 2 +- .../core => api}/request/QueryItemReq.java | 2 +- .../request/QueryMultiStructReq.java | 2 +- .../core => api}/request/QueryS2SQLReq.java | 2 +- .../core => api}/request/QueryStructReq.java | 6 +-- .../server => api}/request/SqlExecuteReq.java | 2 +- .../server => api}/request/ViewInfoReq.java | 2 +- .../response/AppDetailResp.java | 2 +- .../server => api}/response/AppResp.java | 6 +-- .../server => api}/response/DatabaseResp.java | 2 +- .../response/DimSchemaResp.java | 2 +- .../response/DimensionResp.java | 6 +-- .../server => api}/response/DomainResp.java | 6 +-- .../server => api}/response/ExplainResp.java | 2 +- .../response/ItemQueryResultResp.java | 4 +- .../core => api}/response/ItemUseResp.java | 2 +- .../server => api}/response/MeasureResp.java | 2 +- .../server => api}/response/MetricResp.java | 12 ++--- .../response/MetricSchemaResp.java | 2 +- .../server => api}/response/ModelResp.java | 12 ++--- .../response/ModelSchemaRelaResp.java | 2 +- .../response/ModelSchemaResp.java | 4 +- .../response/QueryResultWithSchemaResp.java | 6 +-- .../core => api}/response/SqlParserResp.java | 2 +- .../core/pojo/SingleItemQueryResult.java | 15 ------ .../common/core/request/MetaQueryApiReq.java | 17 ------- .../common/server/enums/DimensionType.java | 9 ---- .../common/server/enums/IdentifyType.java | 8 ---- .../common/server/enums/MetricType.java | 9 ---- .../core/aspect/ApiHeaderCheckAspect.java | 4 +- .../core/aspect/AuthCheckBaseAspect.java | 8 ++-- .../headless/core/aspect/DimValueAspect.java | 10 ++-- .../headless/core/aspect/S2SQLDataAspect.java | 8 ++-- .../core/aspect/StructDataAspect.java | 8 ++-- .../headless/core/executor/JdbcExecutor.java | 4 +- .../headless/core/executor/QueryExecutor.java | 2 +- .../headless/core/optimizer/DetailQuery.java | 2 +- .../core/optimizer/QueryOptimizer.java | 2 +- .../headless/core/parser/QueryParser.java | 16 +++---- .../headless/core/parser/SqlParser.java | 2 +- .../core/parser/calcite/CalciteSqlParser.java | 6 +-- .../parser/calcite/planner/AggPlanner.java | 6 +-- .../planner/MaterializationPlanner.java | 8 ++-- .../core/parser/calcite/planner/Planner.java | 2 +- .../core/parser/calcite/sql/Renderer.java | 6 +-- .../calcite/sql/node/DataSourceNode.java | 10 ++-- .../calcite/sql/render/FilterRender.java | 12 ++--- .../parser/calcite/sql/render/JoinRender.java | 4 +- .../calcite/sql/render/OutputRender.java | 4 +- .../calcite/sql/render/SourceRender.java | 6 +-- .../parser/convert/CalculateAggConverter.java | 10 ++-- .../convert/DefaultDimValueConverter.java | 4 +- .../parser/convert/MetricCheckConverter.java | 6 +-- .../convert/ParserDefaultConverter.java | 14 +++--- .../parser/convert/QueryReqConverter.java | 24 +++++----- .../parser/convert/ZipperModelConverter.java | 14 +++--- .../core/persistence/mapper/StatMapper.java | 4 +- .../core/persistence/pojo/QueryStatement.java | 8 ++-- .../repository/StatRepository.java | 6 +-- .../repository/StatRepositoryImpl.java | 6 +-- .../headless/core/rest/QueryController.java | 32 ++++++------- .../headless/core/rest/SchemaController.java | 16 +++---- .../core/service/DownloadService.java | 4 +- .../core/service/HeadlessQueryEngine.java | 10 ++-- .../headless/core/service/QueryService.java | 26 +++++----- .../headless/core/service/SchemaService.java | 16 +++---- .../service/impl/DownloadServiceImpl.java | 20 ++++---- .../service/impl/HeadlessQueryEngineImpl.java | 10 ++-- .../core/service/impl/QueryServiceImpl.java | 48 +++++++++---------- .../core/service/impl/SchemaServiceImpl.java | 24 +++++----- .../headless/core/utils/QueryStructUtils.java | 22 ++++----- .../headless/core/utils/QueryUtils.java | 10 ++-- .../headless/core/utils/SqlGenerateUtils.java | 2 +- .../headless/core/utils/StatUtils.java | 20 ++++---- .../src/main/resources/mapper/StatMapper.xml | 4 +- .../calcite/HeadlessParserServiceTest.java | 12 ++--- .../calcite/MaterializationQueryTest.java | 2 +- .../service/DownloadServiceImplTest.java | 14 +++--- .../db}/ClickHouseAdaptor.java | 4 +- .../db/DbAdaptor.java} | 4 +- .../server/adaptor/db/DbAdaptorFactory.java | 24 ++++++++++ .../db}/H2Adaptor.java | 4 +- .../db}/MysqlAdaptor.java | 4 +- .../engineadapter/EngineAdaptorFactory.java | 24 ---------- .../server/manager/DimensionYamlManager.java | 4 +- .../server/manager/MetricYamlManager.java | 2 +- .../server/manager/ModelYamlManager.java | 20 ++++---- .../persistence/mapper/DateInfoMapper.java | 2 +- .../repository/DateInfoRepository.java | 4 +- .../impl/DateInfoRepositoryImpl.java | 4 +- .../headless/server/pojo/JdbcDataSource.java | 4 +- .../server/pojo/yaml/DataModelYamlTpl.java | 2 +- .../headless/server/rest/AppController.java | 8 ++-- .../server/rest/DatabaseController.java | 8 ++-- .../server/rest/DimensionController.java | 10 ++-- .../server/rest/DomainController.java | 6 +-- .../server/rest/MetricController.java | 12 ++--- .../headless/server/rest/ModelController.java | 8 ++-- .../server/rest/ViewInfoController.java | 4 +- .../headless/server/service/AppService.java | 8 ++-- .../headless/server/service/Catalog.java | 10 ++-- .../server/service/DatabaseService.java | 6 +-- .../server/service/DimensionService.java | 10 ++-- .../server/service/DomainService.java | 6 +-- .../server/service/MetricService.java | 12 ++--- .../headless/server/service/ModelService.java | 16 +++---- .../server/service/impl/AppServiceImpl.java | 16 +++---- .../server/service/impl/CatalogImpl.java | 10 ++-- .../service/impl/DatabaseServiceImpl.java | 18 +++---- .../service/impl/DimensionServiceImpl.java | 18 +++---- .../service/impl/DomainServiceImpl.java | 8 ++-- .../service/impl/MetricServiceImpl.java | 20 ++++---- .../server/service/impl/ModelServiceImpl.java | 40 ++++++++-------- .../service/impl/ViewInfoServiceImpl.java | 10 ++-- .../server/utils/DatabaseConverter.java | 4 +- .../server/utils/DimensionConverter.java | 8 ++-- .../headless/server/utils/DomainConvert.java | 8 ++-- .../server/utils/JdbcDataSourceUtils.java | 4 +- .../server/utils/MetricConverter.java | 12 ++--- .../headless/server/utils/ModelConverter.java | 32 ++++++------- .../headless/server/utils/SqlUtils.java | 6 +-- .../server/utils/SysTimeDimensionBuilder.java | 18 +++---- .../resources/mapper/DatabaseDOMapper.xml | 22 ++++----- .../mapper/custom/DateInfoMapper.xml | 4 +- .../mapper/custom/DimensionDOCustomMapper.xml | 6 +-- .../mapper/custom/MetricDOCustomMapper.xml | 6 +-- .../mapper/custom/ModelDOCustomMapper.xml | 2 +- .../application/ModelServiceImplTest.java | 18 +++---- .../supersonic/BenchMarkDemoDataLoader.java | 18 +++---- .../supersonic/ModelDemoDataLoader.java | 30 ++++++------ .../integration/MetricInterpretTest.java | 34 ------------- .../model/MetricServiceImplTest.java | 4 +- 209 files changed, 803 insertions(+), 854 deletions(-) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/enums/AggOption.java (84%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/enums/AppStatus.java (89%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/enums/DataType.java (98%) create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/enums/ModelSourceType.java (92%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/enums/QueryOptMode.java (51%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/enums/QueryType.java (88%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/enums/QueryTypeBack.java (91%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/enums/SemanticType.java (54%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/AppConfig.java (88%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/pojo/Cache.java (84%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/Dim.java (96%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/DimValueMap.java (86%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/DimensionTimeTypeParams.java (81%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/DrillDownDimension.java (84%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/Entity.java (86%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/Identify.java (90%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/Item.java (87%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/ItemDateFilter.java (81%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/Measure.java (91%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/MetricQueryDefaultConfig.java (82%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/pojo/MetricTable.java (67%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/MetricTypeParams.java (77%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/ModelDetail.java (88%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/pojo/Param.java (92%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/QueryResult.java (85%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/QueryStat.java (98%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/RelateDimension.java (84%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/pojo/SchemaItem.java (96%) create mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/AppQueryReq.java (82%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/AppReq.java (81%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/BatchDownloadReq.java (80%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/DatabaseReq.java (90%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/DateInfoReq.java (94%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/DimensionReq.java (73%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/DomainReq.java (84%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/DomainUpdateReq.java (62%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/DownloadStructReq.java (78%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/ExplainSqlReq.java (69%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/ItemUseReq.java (90%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/MetaBatchReq.java (68%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/MetricBaseReq.java (77%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core/request/MetricReq.java => api/request/MetricQueryReq.java} (82%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/MetricReq.java (71%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/ModelReq.java (79%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/ModelSchemaFilterReq.java (75%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/PageDimensionReq.java (65%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/PageMetricReq.java (64%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/PageSchemaItemReq.java (89%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/ParseSqlReq.java (79%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/QueryDimValueReq.java (81%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/QueryItemReq.java (85%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/QueryMultiStructReq.java (88%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/QueryS2SQLReq.java (89%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/request/QueryStructReq.java (98%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/SqlExecuteReq.java (91%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/request/ViewInfoReq.java (82%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/AppDetailResp.java (62%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/AppResp.java (79%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/DatabaseResp.java (95%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/DimSchemaResp.java (78%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/DimensionResp.java (76%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/DomainResp.java (83%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/ExplainResp.java (82%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/response/ItemQueryResultResp.java (54%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/response/ItemUseResp.java (88%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/MeasureResp.java (86%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/MetricResp.java (84%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/MetricSchemaResp.java (71%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/ModelResp.java (78%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/ModelSchemaRelaResp.java (78%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/ModelSchemaResp.java (86%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/server => api}/response/QueryResultWithSchemaResp.java (82%) rename headless/api/src/main/java/com/tencent/supersonic/headless/{common/core => api}/response/SqlParserResp.java (89%) delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/SingleItemQueryResult.java delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetaQueryApiReq.java delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DimensionType.java delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/IdentifyType.java delete mode 100644 headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/MetricType.java rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{engineadapter => adaptor/db}/ClickHouseAdaptor.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{engineadapter/EngineAdaptor.java => adaptor/db/DbAdaptor.java} (75%) create mode 100644 headless/server/src/main/java/com/tencent/supersonic/headless/server/adaptor/db/DbAdaptorFactory.java rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{engineadapter => adaptor/db}/H2Adaptor.java (95%) rename headless/server/src/main/java/com/tencent/supersonic/headless/server/{engineadapter => adaptor/db}/MysqlAdaptor.java (95%) delete mode 100644 headless/server/src/main/java/com/tencent/supersonic/headless/server/engineadapter/EngineAdaptorFactory.java rename headless/{model => server}/src/main/resources/mapper/DatabaseDOMapper.xml (91%) rename headless/{model => server}/src/main/resources/mapper/custom/DateInfoMapper.xml (92%) rename headless/{model => server}/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml (97%) rename headless/{model => server}/src/main/resources/mapper/custom/MetricDOCustomMapper.xml (97%) rename headless/{model => server}/src/main/resources/mapper/custom/ModelDOCustomMapper.xml (85%) delete mode 100644 launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java 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 feca6d6fd..bdc398271 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.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.DomainResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import java.util.List; 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 867bdd642..93acef915 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.headless.common.server.response.DimSchemaResp; -import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.response.MetricSchemaResp; import java.util.List; import lombok.Data; 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 326847340..e0d64ecb2 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.headless.common.server.pojo.SchemaItem; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.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/query/BaseSemanticQuery.java b/chat/core/src/main/java/com/tencent/supersonic/chat/query/BaseSemanticQuery.java index 8eb24d30b..9f3e08008 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.headless.common.server.enums.QueryType; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.enums.QueryType; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.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 eefb7d413..c7e9e2712 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.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.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 cf95a3ad4..11795a761 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.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.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 1ba521ea1..98f523c27 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.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.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 f9e838b9c..a40d0dcc2 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.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.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 bde524c21..e72997715 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 @@ -18,7 +18,7 @@ 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.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import java.time.LocalDate; import java.util.List; import java.util.Objects; 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 b86422b52..04339e908 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.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.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 928b765e2..405ed5d9f 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.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.DomainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; import 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 b18c5183d..fdfa1a8ff 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 @@ -41,8 +41,8 @@ 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.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.knowledge.service.SchemaService; import java.text.DecimalFormat; import java.time.DayOfWeek; 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 79168e383..f9f65308b 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,9 +31,9 @@ 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.headless.common.server.pojo.SchemaItem; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.MetricService; 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 ca6582a8e..144b4f46e 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.headless.common.server.response.ModelResp; +import com.tencent.supersonic.headless.api.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 6979bf62f..9385e777c 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 @@ -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.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.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/utils/DictMetaHelper.java b/chat/core/src/main/java/com/tencent/supersonic/chat/utils/DictMetaHelper.java index 5dbbaaeeb..b0bd9c9f6 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.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.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 30839342b..34deac2ab 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.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.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 8e85117f7..ab46acd72 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.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.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/MockBeansConfiguration.java b/chat/core/src/test/java/com/tencent/supersonic/chat/test/context/MockBeansConfiguration.java index ff7a17745..cd26389d7 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 @@ -11,11 +11,11 @@ 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.headless.common.server.response.DimSchemaResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import com.tencent.supersonic.headless.server.pojo.DimensionFilter; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; 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 f2c9283e6..990860788 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.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import java.util.ArrayList; import java.util.Arrays; import java.util.List; 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 1943cc0b7..432b00a26 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.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.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 8022a70b3..72a70856f 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,21 +5,21 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.DomainResp; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.service.QueryService; import com.tencent.supersonic.headless.core.service.SchemaService; import com.tencent.supersonic.headless.server.service.DimensionService; 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 7b79b1c14..51372183b 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.headless.common.server.pojo.DimValueMap; -import com.tencent.supersonic.headless.common.server.pojo.RelateDimension; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; -import com.tencent.supersonic.headless.common.server.response.DimSchemaResp; -import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import 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 c230b247a..f89f09e83 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 @@ -19,21 +19,21 @@ import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.S2ThreadContext; import com.tencent.supersonic.common.util.ThreadContext; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.DomainResp; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import java.net.URI; import java.net.URL; import java.util.HashMap; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/AggOption.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/AggOption.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java index 748d36c12..c022105d4 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/AggOption.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AggOption.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.enums; +package com.tencent.supersonic.headless.api.enums; public enum AggOption { NATIVE, diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/AppStatus.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/AppStatus.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java index a8792ad26..41d2ad3d7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/AppStatus.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/AppStatus.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.enums; +package com.tencent.supersonic.headless.api.enums; public enum AppStatus { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DataType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DataType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java index 9cb07f5bc..099109369 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DataType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DataType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.enums; +package com.tencent.supersonic.headless.api.enums; import com.tencent.supersonic.common.pojo.Constants; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java new file mode 100644 index 000000000..611069992 --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/DimensionType.java @@ -0,0 +1,9 @@ +package com.tencent.supersonic.headless.api.enums; + + +public enum DimensionType { + + categorical, + time + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java new file mode 100644 index 000000000..b113cdf66 --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/IdentifyType.java @@ -0,0 +1,8 @@ +package com.tencent.supersonic.headless.api.enums; + +public enum IdentifyType { + + primary, + foreign, + +} \ No newline at end of file diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java new file mode 100644 index 000000000..47d38b941 --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/MetricType.java @@ -0,0 +1,9 @@ +package com.tencent.supersonic.headless.api.enums; + + +public enum MetricType { + + ATOMIC, + DERIVED + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/ModelSourceType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java similarity index 92% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/ModelSourceType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java index d045e76fa..746747c4a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/ModelSourceType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/ModelSourceType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.enums; +package com.tencent.supersonic.headless.api.enums; import java.util.Objects; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/QueryOptMode.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java similarity index 51% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/QueryOptMode.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java index 4138a3b15..602058abc 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/QueryOptMode.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryOptMode.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.enums; +package com.tencent.supersonic.headless.api.enums; public enum QueryOptMode { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/QueryType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/QueryType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java index 6dd0e8406..b49be8508 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/QueryType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.enums; +package com.tencent.supersonic.headless.api.enums; public enum QueryType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/QueryTypeBack.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/QueryTypeBack.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java index 61a4069e0..e847eedea 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/enums/QueryTypeBack.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/QueryTypeBack.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.enums; +package com.tencent.supersonic.headless.api.enums; public enum QueryTypeBack { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/SemanticType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java similarity index 54% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/SemanticType.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java index b575ddb83..cae66da82 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/SemanticType.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/enums/SemanticType.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.enums; +package com.tencent.supersonic.headless.api.enums; public enum SemanticType { diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/AppConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/AppConfig.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/AppConfig.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/AppConfig.java index e14d9109d..8b8eb2671 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/AppConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/AppConfig.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.google.common.collect.Lists; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/Cache.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Cache.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/Cache.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Cache.java index acd7018d8..cbc01f824 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/Cache.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Cache.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Dim.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dim.java similarity index 96% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Dim.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dim.java index 8dee1013c..4bd8e4e39 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Dim.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dim.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.tencent.supersonic.common.pojo.Constants; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DimValueMap.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimValueMap.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DimValueMap.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimValueMap.java index cbf69f5ae..a21240bce 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DimValueMap.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimValueMap.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DimensionTimeTypeParams.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimensionTimeTypeParams.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DimensionTimeTypeParams.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimensionTimeTypeParams.java index 999225fc0..a29cb7a56 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DimensionTimeTypeParams.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DimensionTimeTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DrillDownDimension.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DrillDownDimension.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DrillDownDimension.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DrillDownDimension.java index f40da0019..c545ebd89 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/DrillDownDimension.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DrillDownDimension.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Entity.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Entity.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Entity.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Entity.java index 1f07500e0..ac9c3e3b2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Entity.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Entity.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Identify.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Identify.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Identify.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Identify.java index 301be9acb..f6d68f48d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Identify.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Identify.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Item.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Item.java similarity index 87% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Item.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Item.java index 4ed343919..9b9c4d824 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Item.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Item.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.ApiItemType; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/ItemDateFilter.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ItemDateFilter.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/ItemDateFilter.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ItemDateFilter.java index 9c0ed5b90..642025f47 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/ItemDateFilter.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ItemDateFilter.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import java.util.List; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Measure.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Measure.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Measure.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Measure.java index a2a086b77..551293e86 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/Measure.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Measure.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/MetricQueryDefaultConfig.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricQueryDefaultConfig.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/MetricQueryDefaultConfig.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricQueryDefaultConfig.java index 2b2d7943f..5e4ce8abf 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/MetricQueryDefaultConfig.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricQueryDefaultConfig.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.tencent.supersonic.common.pojo.RecordInfo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/MetricTable.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java similarity index 67% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/MetricTable.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java index 49829618c..41dd6cfa1 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/MetricTable.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTable.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.common.core.pojo; +package com.tencent.supersonic.headless.api.pojo; -import com.tencent.supersonic.headless.common.core.enums.AggOption; +import com.tencent.supersonic.headless.api.enums.AggOption; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/MetricTypeParams.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeParams.java similarity index 77% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/MetricTypeParams.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeParams.java index d2ed32703..8bebe8cbb 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/MetricTypeParams.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeParams.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import java.util.List; import com.google.common.collect.Lists; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/ModelDetail.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/ModelDetail.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java index f07e03355..b35c403f6 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/ModelDetail.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/ModelDetail.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.common.server.enums.DimensionType; +import com.tencent.supersonic.headless.api.enums.DimensionType; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/Param.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java similarity index 92% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/Param.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java index 3dcedde15..6dec090f5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/Param.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Param.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/QueryResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryResult.java similarity index 85% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/QueryResult.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryResult.java index f7fa77dcf..54cc6af76 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/QueryResult.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryResult.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/QueryStat.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryStat.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/QueryStat.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryStat.java index eb17d4720..82965f8f2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/QueryStat.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryStat.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.Lists; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/RelateDimension.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/RelateDimension.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/RelateDimension.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/RelateDimension.java index 0b3e9c594..4ecb1c468 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/RelateDimension.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/RelateDimension.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.google.common.collect.Lists; import lombok.AllArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/SchemaItem.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SchemaItem.java similarity index 96% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/SchemaItem.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SchemaItem.java index a856e5733..cb14afc74 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/pojo/SchemaItem.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SchemaItem.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.pojo; +package com.tencent.supersonic.headless.api.pojo; import com.google.common.base.Objects; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java new file mode 100644 index 000000000..1d10f90cf --- /dev/null +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SingleItemQueryResult.java @@ -0,0 +1,14 @@ +package com.tencent.supersonic.headless.api.pojo; + + +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import lombok.Data; + +@Data +public class SingleItemQueryResult { + + private Item item; + + private QueryResultWithSchemaResp result; + +} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/AppQueryReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/AppQueryReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java index 3add85d28..9ea81df1f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/AppQueryReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppQueryReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; -import com.tencent.supersonic.headless.common.server.enums.AppStatus; +import com.tencent.supersonic.headless.api.enums.AppStatus; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/AppReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/AppReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java index 452455dd3..40b238f42 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/AppReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/AppReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.headless.common.server.pojo.AppConfig; +import com.tencent.supersonic.headless.api.pojo.AppConfig; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/BatchDownloadReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java similarity index 80% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/BatchDownloadReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java index 215a7e268..0f42c50e7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/BatchDownloadReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/BatchDownloadReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DatabaseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DatabaseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java index b34b89e96..1f13a88be 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DatabaseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DatabaseReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.common.server.enums.DataType; +import com.tencent.supersonic.headless.api.enums.DataType; import lombok.Data; import org.apache.commons.lang3.StringUtils; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DateInfoReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java similarity index 94% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DateInfoReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java index d0ff1fb84..874beaec4 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DateInfoReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DateInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import java.util.ArrayList; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java similarity index 73% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DimensionReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java index 8101fd978..b5abf021e 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DimensionReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DimensionReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.headless.common.server.pojo.DimValueMap; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import javax.validation.constraints.NotNull; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DomainReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DomainReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java index 48341045a..574ca30ba 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DomainReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainReq.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import java.util.ArrayList; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DomainUpdateReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java similarity index 62% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DomainUpdateReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java index baafeb637..1324b606c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/DomainUpdateReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DomainUpdateReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/DownloadStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/DownloadStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java index 949ecb4f6..00019ca94 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/DownloadStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/DownloadStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ExplainSqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java similarity index 69% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ExplainSqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java index 0f041933b..9f7c74507 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ExplainSqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ExplainSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; -import com.tencent.supersonic.headless.common.server.enums.QueryType; +import com.tencent.supersonic.headless.api.enums.QueryType; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ItemUseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java similarity index 90% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ItemUseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java index 3c768d9b6..1b63ecf19 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ItemUseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ItemUseReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import java.util.List; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetaBatchReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java similarity index 68% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetaBatchReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java index ea01ea029..398e9421d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetaBatchReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetaBatchReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetricBaseReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java similarity index 77% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetricBaseReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java index 9e373e240..50f314904 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetricBaseReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricBaseReq.java @@ -1,8 +1,8 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.headless.common.server.pojo.RelateDimension; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java index 2e508a0ea..fe00a64d6 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricQueryReq.java @@ -1,12 +1,13 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.ColumnOrder; -import java.util.List; -import java.util.Map; import lombok.Data; +import java.util.List; +import java.util.Map; + @Data -public class MetricReq { +public class MetricQueryReq { private List metrics; private List dimensions; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java index 108bbb727..cf2355c17 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/MetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/MetricReq.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; -import com.tencent.supersonic.headless.common.server.enums.MetricType; -import com.tencent.supersonic.headless.common.server.pojo.Measure; -import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.enums.MetricType; +import com.tencent.supersonic.headless.api.pojo.Measure; +import com.tencent.supersonic.headless.api.pojo.MetricTypeParams; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ModelReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ModelReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java index 082c521ee..691f72a3a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ModelReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelReq.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.common.server.pojo.Dim; -import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.common.server.pojo.ModelDetail; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.pojo.Dim; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ModelSchemaFilterReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java similarity index 75% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ModelSchemaFilterReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java index 1febd843d..e34419eff 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ModelSchemaFilterReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ModelSchemaFilterReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageDimensionReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java similarity index 65% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageDimensionReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java index 1abd9f6f9..1afae7c49 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageDimensionReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageDimensionReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageMetricReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java similarity index 64% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageMetricReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java index 6e362762a..2a0740f5a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageMetricReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageMetricReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageSchemaItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageSchemaItemReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java index 49df72767..f219dcfa7 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/PageSchemaItemReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/PageSchemaItemReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.PageBaseReq; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ParseSqlReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ParseSqlReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java index ea9fc2491..98ea15d7d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/ParseSqlReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ParseSqlReq.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; -import com.tencent.supersonic.headless.common.core.pojo.MetricTable; +import com.tencent.supersonic.headless.api.pojo.MetricTable; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryDimValueReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java similarity index 81% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryDimValueReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java index ea28dd6d4..a34e5512d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryDimValueReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryDimValueReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryItemReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java similarity index 85% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryItemReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java index 4a904f982..939da96de 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryItemReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryItemReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import com.tencent.supersonic.common.pojo.DateConf; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryMultiStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryMultiStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java index 1c415772e..f8b8bf376 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryMultiStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryMultiStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import com.alibaba.fastjson.JSONObject; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryS2SQLReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryS2SQLReq.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryS2SQLReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryS2SQLReq.java index 9d5bbcfa1..cd8bce535 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryS2SQLReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryS2SQLReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.request; import com.google.common.collect.Lists; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java similarity index 98% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryStructReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java index 2c125a8d3..8979b458f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/QueryStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/QueryStructReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.request; +package com.tencent.supersonic.headless.api.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.headless.common.core.pojo.Cache; -import com.tencent.supersonic.headless.common.core.pojo.Param; +import com.tencent.supersonic.headless.api.pojo.Cache; +import com.tencent.supersonic.headless.api.pojo.Param; import lombok.Data; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.JSQLParserException; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/SqlExecuteReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java similarity index 91% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/SqlExecuteReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java index 4da5d6927..a23a38b49 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/SqlExecuteReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/SqlExecuteReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import javax.validation.constraints.NotBlank; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ViewInfoReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ViewInfoReq.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java index 9cb687d33..3a631703f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/request/ViewInfoReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/request/ViewInfoReq.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.request; +package com.tencent.supersonic.headless.api.request; import java.util.Date; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/AppDetailResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java similarity index 62% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/AppDetailResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java index 707f89550..2202cbb29 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/AppDetailResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppDetailResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/AppResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java similarity index 79% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/AppResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java index 4a22d4bb1..cd6db8fea 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/AppResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/AppResp.java @@ -1,10 +1,10 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.RecordInfo; -import com.tencent.supersonic.headless.common.server.enums.AppStatus; -import com.tencent.supersonic.headless.common.server.pojo.AppConfig; +import com.tencent.supersonic.headless.api.enums.AppStatus; +import com.tencent.supersonic.headless.api.pojo.AppConfig; import lombok.Data; import org.apache.commons.lang3.StringUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DatabaseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java similarity index 95% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DatabaseResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java index 58282a56f..eac9eb903 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DatabaseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DatabaseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.RecordInfo; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DimSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DimSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java index 5e89b9c22..598d4114a 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DimSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DimensionResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java similarity index 76% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DimensionResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java index 850cbeba9..1ade9e5e8 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DimensionResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DimensionResp.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.tencent.supersonic.common.pojo.enums.DataTypeEnums; -import com.tencent.supersonic.headless.common.server.pojo.DimValueMap; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DomainResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java similarity index 83% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DomainResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java index 631bf3538..5a1573736 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/DomainResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/DomainResp.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; -import com.tencent.supersonic.headless.common.server.pojo.Entity; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.Entity; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ExplainResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ExplainResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java index 2f887023c..d7198ba24 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ExplainResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ExplainResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/ItemQueryResultResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java similarity index 54% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/ItemQueryResultResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java index 5ac5af28f..88513343f 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/ItemQueryResultResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemQueryResultResp.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.headless.common.core.response; +package com.tencent.supersonic.headless.api.response; -import com.tencent.supersonic.headless.common.core.pojo.SingleItemQueryResult; +import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult; import lombok.Builder; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/ItemUseResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java similarity index 88% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/ItemUseResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java index 2a9e7d4d2..a78f0b904 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/ItemUseResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ItemUseResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.response; +package com.tencent.supersonic.headless.api.response; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MeasureResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MeasureResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java index 6e972a380..77e6673c2 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MeasureResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MeasureResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MetricResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java similarity index 84% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MetricResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java index 073dd97cd..7ceb1d843 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MetricResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricResp.java @@ -1,14 +1,14 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.tencent.supersonic.common.pojo.DataFormat; -import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.common.server.pojo.Measure; -import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.common.server.pojo.RelateDimension; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.pojo.Measure; +import com.tencent.supersonic.headless.api.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.pojo.RelateDimension; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; import lombok.Data; import lombok.ToString; import org.apache.commons.collections.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MetricSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java similarity index 71% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MetricSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java index 980e58da5..7707f9e88 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/MetricSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/MetricSchemaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import lombok.Data; import lombok.ToString; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java index 73c758b04..18d4c6e62 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelResp.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.common.server.pojo.Dim; -import com.tencent.supersonic.headless.common.server.pojo.DrillDownDimension; -import com.tencent.supersonic.headless.common.server.pojo.Identify; -import com.tencent.supersonic.headless.common.server.pojo.ModelDetail; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.Dim; +import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; +import com.tencent.supersonic.headless.api.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.pojo.Identify; import lombok.Data; import org.springframework.util.CollectionUtils; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelSchemaRelaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java similarity index 78% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelSchemaRelaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java index 5c28aa1a1..cf8104005 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelSchemaRelaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaRelaResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java similarity index 86% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java index 19886c7ff..cb0be3692 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/ModelSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/ModelSchemaResp.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.tencent.supersonic.common.pojo.ModelRela; -import com.tencent.supersonic.headless.common.server.pojo.Identify; +import com.tencent.supersonic.headless.api.pojo.Identify; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/QueryResultWithSchemaResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/QueryResultWithSchemaResp.java similarity index 82% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/QueryResultWithSchemaResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/QueryResultWithSchemaResp.java index 50cc9f77c..7c2b20f7c 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/response/QueryResultWithSchemaResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/QueryResultWithSchemaResp.java @@ -1,11 +1,11 @@ -package com.tencent.supersonic.headless.common.server.response; +package com.tencent.supersonic.headless.api.response; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.QueryAuthorization; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.headless.common.server.enums.SemanticType; -import com.tencent.supersonic.headless.common.server.pojo.QueryResult; +import com.tencent.supersonic.headless.api.enums.SemanticType; +import com.tencent.supersonic.headless.api.pojo.QueryResult; import lombok.Data; import lombok.ToString; import java.util.List; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/SqlParserResp.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java similarity index 89% rename from headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/SqlParserResp.java rename to headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java index dcf83cad1..df0b0c8b5 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/response/SqlParserResp.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/response/SqlParserResp.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.headless.common.core.response; +package com.tencent.supersonic.headless.api.response; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/SingleItemQueryResult.java b/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/SingleItemQueryResult.java deleted file mode 100644 index efc0dbe46..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/pojo/SingleItemQueryResult.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.tencent.supersonic.headless.common.core.pojo; - - -import com.tencent.supersonic.headless.common.server.pojo.Item; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import lombok.Data; - -@Data -public class SingleItemQueryResult { - - private Item item; - - private QueryResultWithSchemaResp result; - -} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetaQueryApiReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetaQueryApiReq.java deleted file mode 100644 index 95a63fc5d..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/core/request/MetaQueryApiReq.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.tencent.supersonic.headless.common.core.request; - -import com.tencent.supersonic.common.pojo.enums.ApiItemType; -import lombok.Data; - -import javax.validation.constraints.NotEmpty; -import java.util.List; - -@Data -public class MetaQueryApiReq { - - @NotEmpty(message = "ids不可为空") - private List ids; - - private ApiItemType type = ApiItemType.METRIC; - -} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DimensionType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DimensionType.java deleted file mode 100644 index 3eece508f..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/DimensionType.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.tencent.supersonic.headless.common.server.enums; - - -public enum DimensionType { - - categorical, - time - -} diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/IdentifyType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/IdentifyType.java deleted file mode 100644 index 8d4859685..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/IdentifyType.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.tencent.supersonic.headless.common.server.enums; - -public enum IdentifyType { - - primary, - foreign, - -} \ No newline at end of file diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/MetricType.java b/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/MetricType.java deleted file mode 100644 index a90f42a98..000000000 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/common/server/enums/MetricType.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.tencent.supersonic.headless.common.server.enums; - - -public enum MetricType { - - ATOMIC, - DERIVED - -} diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/ApiHeaderCheckAspect.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/ApiHeaderCheckAspect.java index 8f7f9cae6..1d1222770 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/ApiHeaderCheckAspect.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/ApiHeaderCheckAspect.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.core.aspect; import com.tencent.supersonic.common.pojo.Pair; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.SignatureUtils; -import com.tencent.supersonic.headless.common.server.enums.AppStatus; -import com.tencent.supersonic.headless.common.server.response.AppDetailResp; +import com.tencent.supersonic.headless.api.enums.AppStatus; +import com.tencent.supersonic.headless.api.response.AppDetailResp; import com.tencent.supersonic.headless.server.service.AppService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/AuthCheckBaseAspect.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/AuthCheckBaseAspect.java index 4a94892e4..3bfba7c5f 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/AuthCheckBaseAspect.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/AuthCheckBaseAspect.java @@ -16,10 +16,10 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.AuthType; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.MetricService; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/DimValueAspect.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/DimValueAspect.java index 5ebd9123a..1b6a9c076 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/DimValueAspect.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/DimValueAspect.java @@ -8,11 +8,11 @@ import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.pojo.DimValueMap; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.DimValueMap; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; import lombok.extern.slf4j.Slf4j; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/S2SQLDataAspect.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/S2SQLDataAspect.java index 495070155..3e91cc18a 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/S2SQLDataAspect.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/S2SQLDataAspect.java @@ -7,10 +7,10 @@ import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResource import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; import com.tencent.supersonic.common.util.jsqlparser.SqlParserAddHelper; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.utils.QueryStructUtils; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.pojo.ModelFilter; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/StructDataAspect.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/StructDataAspect.java index 4c238c120..224a82eb0 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/StructDataAspect.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/aspect/StructDataAspect.java @@ -7,10 +7,10 @@ import com.tencent.supersonic.auth.api.authorization.response.AuthorizedResource import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.utils.QueryStructUtils; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.DimensionService; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java index 513dc3085..6f3994f44 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/JdbcExecutor.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.executor; -import com.tencent.supersonic.headless.common.server.response.DatabaseResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.response.DatabaseResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.server.service.Catalog; import com.tencent.supersonic.headless.server.utils.SqlUtils; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java index 4b9f96e4a..de6e493ce 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/QueryExecutor.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.executor; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.server.service.Catalog; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/DetailQuery.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/DetailQuery.java index 9a1260197..84ace0418 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/DetailQuery.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/DetailQuery.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.optimizer; import com.google.common.base.Strings; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import java.util.Objects; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/QueryOptimizer.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/QueryOptimizer.java index fd02c54d0..11e51c659 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/QueryOptimizer.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/optimizer/QueryOptimizer.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.optimizer; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; public interface QueryOptimizer { diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/QueryParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/QueryParser.java index 55f0e523a..865e7c265 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/QueryParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/QueryParser.java @@ -1,11 +1,11 @@ package com.tencent.supersonic.headless.core.parser; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.headless.common.core.enums.AggOption; -import com.tencent.supersonic.headless.common.core.pojo.MetricTable; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.MetricTable; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.ComponentFactory; import com.tencent.supersonic.headless.server.service.Catalog; @@ -38,7 +38,7 @@ public class QueryParser { queryStatement.setParseSqlReq(new ParseSqlReq()); } if (Objects.isNull(queryStatement.getMetricReq())) { - queryStatement.setMetricReq(new MetricReq()); + queryStatement.setMetricReq(new MetricQueryReq()); } log.info("SemanticConverter before [{}]", queryStructReq); for (HeadlessConverter headlessConverter : ComponentFactory.getSemanticConverters()) { @@ -65,7 +65,7 @@ public class QueryParser { List tables = new ArrayList<>(); String sourceId = ""; for (MetricTable metricTable : sqlCommend.getTables()) { - MetricReq metricReq = new MetricReq(); + MetricQueryReq metricReq = new MetricQueryReq(); metricReq.setMetrics(metricTable.getMetrics()); metricReq.setDimensions(metricTable.getDimensions()); metricReq.setWhere(StringUtil.formatSqlQuota(metricTable.getWhere())); @@ -117,7 +117,7 @@ public class QueryParser { } public QueryStatement parser(QueryStatement queryStatement, AggOption isAgg) { - MetricReq metricCommand = queryStatement.getMetricReq(); + MetricQueryReq metricCommand = queryStatement.getMetricReq(); log.info("parser MetricReq [{}] isAgg [{}]", metricCommand, isAgg); if (metricCommand.getRootPath().isEmpty()) { queryStatement.setErrMsg("rootPath empty"); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java index b31fc6d6f..33b5e3042 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.parser; -import com.tencent.supersonic.headless.common.core.enums.AggOption; +import com.tencent.supersonic.headless.api.enums.AggOption; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.server.service.Catalog; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java index 95ce08066..9ff84c7f0 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/CalciteSqlParser.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite; -import com.tencent.supersonic.headless.common.core.enums.AggOption; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.SqlParser; import com.tencent.supersonic.headless.core.parser.calcite.planner.AggPlanner; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.HeadlessModel; @@ -23,7 +23,7 @@ public class CalciteSqlParser implements SqlParser { @Override public QueryStatement explain(QueryStatement queryStatement, AggOption isAgg, Catalog catalog) throws Exception { - MetricReq metricReq = queryStatement.getMetricReq(); + MetricQueryReq metricReq = queryStatement.getMetricReq(); HeadlessModel headlessModel = headlessSchemaManager.get(metricReq.getRootPath()); if (headlessModel == null) { queryStatement.setErrMsg("semanticSchema not found"); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java index eb5038838..feb20c309 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/AggPlanner.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.planner; -import com.tencent.supersonic.headless.common.core.enums.AggOption; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.schema.SchemaBuilder; import com.tencent.supersonic.headless.core.parser.calcite.sql.Renderer; @@ -39,7 +39,7 @@ import org.apache.calcite.sql2rel.SqlToRelConverter; @Slf4j public class AggPlanner implements Planner { - private MetricReq metricReq; + private MetricQueryReq metricReq; private HeadlessSchema schema; private SqlValidatorScope scope; private Stack dataSets = new Stack<>(); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/MaterializationPlanner.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/MaterializationPlanner.java index 13439fdf6..753013c5d 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/MaterializationPlanner.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/MaterializationPlanner.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.parser.calcite.planner; import com.tencent.supersonic.common.util.calcite.SqlParseUtils; -import com.tencent.supersonic.headless.common.core.enums.AggOption; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.schema.SchemaBuilder; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; @@ -97,7 +97,7 @@ public class MaterializationPlanner implements Planner { return; } Set fields = new HashSet<>(); - MetricReq metricCommand = queryStatement.getMetricReq(); + MetricQueryReq metricCommand = queryStatement.getMetricReq(); if (!Objects.isNull(metricCommand.getWhere()) && !metricCommand.getWhere().isEmpty()) { fields.addAll(SqlParseUtils.getFilterField(metricCommand.getWhere())); } @@ -286,7 +286,7 @@ public class MaterializationPlanner implements Planner { relBuilder.literal(timeRange.getEnd()))); } - public boolean check(MetricReq metricCommand, Materialization materialization, String elem, + public boolean check(MetricQueryReq metricCommand, Materialization materialization, String elem, List> timeRanges) throws SqlParseException { boolean isMatch = false; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java index 8cdb15c81..5bfeee00e 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/planner/Planner.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.planner; -import com.tencent.supersonic.headless.common.core.enums.AggOption; +import com.tencent.supersonic.headless.api.enums.AggOption; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.parser.calcite.schema.HeadlessSchema; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java index 63f5fcb60..6de0c845d 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Renderer.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MeasureNode; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MetricNode; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode; @@ -101,6 +101,6 @@ public abstract class Renderer { return SemanticNode.buildAs(alias, tableView.build()); } - public abstract void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - HeadlessSchema schema, boolean nonAgg) throws Exception; + public abstract void render(MetricQueryReq metricCommand, List dataSources, SqlValidatorScope scope, + HeadlessSchema schema, boolean nonAgg) throws Exception; } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java index 4b1c97c58..ccfa56bb4 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/node/DataSourceNode.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.node; import com.google.common.collect.Lists; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; @@ -125,7 +125,7 @@ public class DataSourceNode extends SemanticNode { return dataSourceList.stream().map(d -> d.getName()).collect(Collectors.joining("_")); } - public static void getQueryDimensionMeasure(HeadlessSchema schema, MetricReq metricCommand, + public static void getQueryDimensionMeasure(HeadlessSchema schema, MetricQueryReq metricCommand, Set queryDimension, List measures) { queryDimension.addAll(metricCommand.getDimensions().stream() .map(d -> d.contains(Constants.DIMENSION_IDENTIFY) ? d.split(Constants.DIMENSION_IDENTIFY)[1] : d) @@ -137,7 +137,7 @@ public class DataSourceNode extends SemanticNode { } - public static void mergeQueryFilterDimensionMeasure(HeadlessSchema schema, MetricReq metricCommand, + public static void mergeQueryFilterDimensionMeasure(HeadlessSchema schema, MetricQueryReq metricCommand, Set queryDimension, List measures, SqlValidatorScope scope) throws Exception { if (Objects.nonNull(metricCommand.getWhere()) && !metricCommand.getWhere().isEmpty()) { @@ -161,7 +161,7 @@ public class DataSourceNode extends SemanticNode { } public static List getMatchDataSources(SqlValidatorScope scope, HeadlessSchema schema, - MetricReq metricCommand) throws Exception { + MetricQueryReq metricCommand) throws Exception { List dataSources = new ArrayList<>(); // check by metric @@ -233,7 +233,7 @@ public class DataSourceNode extends SemanticNode { Set queryDimension, List measures, Set dimension, - MetricReq metricCommand, + MetricQueryReq metricCommand, SqlValidatorScope scope) throws Exception { boolean isAllMatch = true; sourceMeasure.retainAll(measures); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java index 5d77a0599..c73bf7d48 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/FilterRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric; @@ -11,6 +11,10 @@ import com.tencent.supersonic.headless.core.parser.calcite.sql.TableView; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.FilterNode; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MetricNode; import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode; +import org.apache.calcite.sql.SqlIdentifier; +import org.apache.calcite.sql.SqlNode; +import org.apache.calcite.sql.parser.SqlParserPos; +import org.apache.calcite.sql.validate.SqlValidatorScope; import java.util.ArrayList; import java.util.HashSet; @@ -18,15 +22,11 @@ import java.util.List; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.apache.calcite.sql.SqlIdentifier; -import org.apache.calcite.sql.SqlNode; -import org.apache.calcite.sql.parser.SqlParserPos; -import org.apache.calcite.sql.validate.SqlValidatorScope; public class FilterRender extends Renderer { @Override - public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, + public void render(MetricQueryReq metricCommand, List dataSources, SqlValidatorScope scope, HeadlessSchema schema, boolean nonAgg) throws Exception { TableView tableView = super.tableView; SqlNode filterNode = null; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java index 96489dcaf..707df4af8 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/JoinRender.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; @@ -45,7 +45,7 @@ import java.util.stream.Collectors; public class JoinRender extends Renderer { @Override - public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, + public void render(MetricQueryReq metricCommand, List dataSources, SqlValidatorScope scope, HeadlessSchema schema, boolean nonAgg) throws Exception { String queryWhere = metricCommand.getWhere(); //dataSources = getOrderSource(dataSources); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java index b9e51dc9d..0709b63af 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/OutputRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.common.pojo.ColumnOrder; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.schema.HeadlessSchema; @@ -21,7 +21,7 @@ import org.springframework.util.CollectionUtils; public class OutputRender extends Renderer { @Override - public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, + public void render(MetricQueryReq metricCommand, List dataSources, SqlValidatorScope scope, HeadlessSchema schema, boolean nonAgg) throws Exception { TableView selectDataSet = super.tableView; for (String dimension : metricCommand.getDimensions()) { diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java index d2dfb24d2..3c67003c9 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/render/SourceRender.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.core.parser.calcite.sql.render; -import com.tencent.supersonic.headless.common.core.request.MetricReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; @@ -313,8 +313,8 @@ public class SourceRender extends Renderer { } } - public void render(MetricReq metricCommand, List dataSources, SqlValidatorScope scope, - HeadlessSchema schema, boolean nonAgg) throws Exception { + public void render(MetricQueryReq metricCommand, List dataSources, SqlValidatorScope scope, + HeadlessSchema schema, boolean nonAgg) throws Exception { String queryWhere = metricCommand.getWhere(); Set whereFields = new HashSet<>(); List fieldWhere = new ArrayList<>(); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/CalculateAggConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/CalculateAggConverter.java index 9bbbf14c4..eaa72879c 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/CalculateAggConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/CalculateAggConverter.java @@ -6,11 +6,11 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; -import com.tencent.supersonic.headless.common.core.enums.AggOption; -import com.tencent.supersonic.headless.common.core.pojo.MetricTable; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.response.DatabaseResp; +import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.MetricTable; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.DatabaseResp; import com.tencent.supersonic.headless.core.parser.HeadlessConverter; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.service.HeadlessQueryEngine; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/DefaultDimValueConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/DefaultDimValueConverter.java index 489e4e1b6..9d6134264 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/DefaultDimValueConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/DefaultDimValueConverter.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.core.parser.convert; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; import com.tencent.supersonic.headless.core.parser.HeadlessConverter; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.server.pojo.MetaFilter; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/MetricCheckConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/MetricCheckConverter.java index daf242e47..36be26857 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/MetricCheckConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/MetricCheckConverter.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.core.parser.convert; import com.tencent.supersonic.common.pojo.Filter; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; import com.tencent.supersonic.headless.core.parser.HeadlessConverter; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.server.pojo.MetaFilter; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ParserDefaultConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ParserDefaultConverter.java index d7354d6a5..a8b2c72f6 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ParserDefaultConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ParserDefaultConverter.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.core.parser.convert; import com.tencent.supersonic.common.pojo.ColumnOrder; -import com.tencent.supersonic.headless.common.core.pojo.Param; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.Param; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.parser.HeadlessConverter; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.QueryStructUtils; @@ -42,14 +42,14 @@ public class ParserDefaultConverter implements HeadlessConverter { @Override public void converter(Catalog catalog, QueryStatement queryStatement) throws Exception { QueryStructReq queryStructCmd = queryStatement.getQueryStructReq(); - MetricReq metricCommand = queryStatement.getMetricReq(); - MetricReq metricReq = generateSqlCommand(catalog, queryStructCmd); + MetricQueryReq metricCommand = queryStatement.getMetricReq(); + MetricQueryReq metricReq = generateSqlCommand(catalog, queryStructCmd); queryStatement.setMinMaxTime(queryStructUtils.getBeginEndTime(queryStructCmd)); BeanUtils.copyProperties(metricReq, metricCommand); } - public MetricReq generateSqlCommand(Catalog catalog, QueryStructReq queryStructCmd) { - MetricReq sqlCommend = new MetricReq(); + public MetricQueryReq generateSqlCommand(Catalog catalog, QueryStructReq queryStructCmd) { + MetricQueryReq sqlCommend = new MetricQueryReq(); sqlCommend.setMetrics(queryStructCmd.getMetrics()); sqlCommend.setDimensions(queryStructCmd.getGroups()); String where = queryStructUtils.generateWhere(queryStructCmd); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/QueryReqConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/QueryReqConverter.java index 4cb21cae5..053d01523 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/QueryReqConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/QueryReqConverter.java @@ -9,20 +9,20 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.jsqlparser.SqlParserReplaceHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectFunctionHelper; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.common.core.enums.AggOption; -import com.tencent.supersonic.headless.common.core.pojo.MetricTable; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; -import com.tencent.supersonic.headless.common.server.request.SqlExecuteReq; -import com.tencent.supersonic.headless.common.server.response.DatabaseResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.enums.AggOption; +import com.tencent.supersonic.headless.api.pojo.MetricTable; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.request.SqlExecuteReq; +import com.tencent.supersonic.headless.api.response.DatabaseResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.service.HeadlessQueryEngine; import com.tencent.supersonic.headless.core.utils.QueryStructUtils; -import com.tencent.supersonic.headless.server.engineadapter.EngineAdaptor; -import com.tencent.supersonic.headless.server.engineadapter.EngineAdaptorFactory; +import com.tencent.supersonic.headless.server.adaptor.db.DbAdaptor; +import com.tencent.supersonic.headless.server.adaptor.db.DbAdaptorFactory; import com.tencent.supersonic.headless.server.pojo.EngineTypeEnum; import com.tencent.supersonic.headless.server.service.Catalog; import com.tencent.supersonic.headless.server.service.ModelService; @@ -176,7 +176,7 @@ public class QueryReqConverter { return; } String type = database.getType(); - EngineAdaptor engineAdaptor = EngineAdaptorFactory.getEngineAdaptor(type.toLowerCase()); + DbAdaptor engineAdaptor = DbAdaptorFactory.getEngineAdaptor(type.toLowerCase()); log.info("type:{},engineAdaptor:{}", type, engineAdaptor); if (Objects.nonNull(engineAdaptor)) { String functionNameCorrector = engineAdaptor.functionNameCorrector(databaseReq.getSql()); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ZipperModelConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ZipperModelConverter.java index 9a377b6ee..58d5e2b5f 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ZipperModelConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/convert/ZipperModelConverter.java @@ -1,10 +1,10 @@ package com.tencent.supersonic.headless.core.parser.convert; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.enums.ModelSourceType; -import com.tencent.supersonic.headless.common.server.response.ModelResp; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.enums.ModelSourceType; +import com.tencent.supersonic.headless.api.response.ModelResp; import com.tencent.supersonic.headless.core.parser.HeadlessConverter; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.utils.QueryStructUtils; @@ -52,12 +52,12 @@ public class ZipperModelConverter implements HeadlessConverter { public void converter(Catalog catalog, QueryStatement queryStatement) throws Exception { QueryStructReq queryStructCmd = queryStatement.getQueryStructReq(); ParseSqlReq sqlCommend = queryStatement.getParseSqlReq(); - MetricReq metricCommand = queryStatement.getMetricReq(); + MetricQueryReq metricCommand = queryStatement.getMetricReq(); doSingleZipperSource(queryStructCmd, sqlCommend, metricCommand); } protected void doSingleZipperSource(QueryStructReq queryStructCmd, ParseSqlReq sqlCommend, - MetricReq metricCommand) { + MetricQueryReq metricCommand) { // all data sources are zipper tables // request time field rewrite to start_ end_ if (!sqlCommend.getSql().isEmpty()) { diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/mapper/StatMapper.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/mapper/StatMapper.java index 1896009d1..ee88bff18 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/mapper/StatMapper.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/mapper/StatMapper.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.persistence.mapper; -import com.tencent.supersonic.headless.common.server.pojo.QueryStat; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; +import com.tencent.supersonic.headless.api.pojo.QueryStat; +import com.tencent.supersonic.headless.api.request.ItemUseReq; import java.util.List; import org.apache.ibatis.annotations.Mapper; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/pojo/QueryStatement.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/pojo/QueryStatement.java index 32b9cf746..e853b86ca 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/pojo/QueryStatement.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/pojo/QueryStatement.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.persistence.pojo; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import lombok.Data; import org.apache.commons.lang3.tuple.ImmutablePair; @@ -18,7 +18,7 @@ public class QueryStatement { private String errMsg = ""; private Boolean ok; private QueryStructReq queryStructReq; - private MetricReq metricReq; + private MetricQueryReq metricReq; private ParseSqlReq parseSqlReq; private Integer status = 0; private Boolean isS2SQL = false; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepository.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepository.java index 6be083b95..63c6cb7ee 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepository.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepository.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.persistence.repository; -import com.tencent.supersonic.headless.common.server.pojo.QueryStat; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.QueryStat; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.response.ItemUseResp; import java.util.List; public interface StatRepository { diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepositoryImpl.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepositoryImpl.java index d9854a0ae..5a9e2f900 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepositoryImpl.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/persistence/repository/StatRepositoryImpl.java @@ -3,9 +3,9 @@ package com.tencent.supersonic.headless.core.persistence.repository; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.tencent.supersonic.common.pojo.enums.TypeEnums; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; -import com.tencent.supersonic.headless.common.server.pojo.QueryStat; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.pojo.QueryStat; import com.tencent.supersonic.headless.core.persistence.mapper.StatMapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/QueryController.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/QueryController.java index 422fc50c5..438fdd4e8 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/QueryController.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/QueryController.java @@ -3,22 +3,22 @@ package com.tencent.supersonic.headless.core.rest; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.headless.common.core.request.BatchDownloadReq; -import com.tencent.supersonic.headless.common.core.request.DownloadStructReq; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryItemReq; -import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.core.response.ItemQueryResultResp; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; -import com.tencent.supersonic.headless.common.server.enums.QueryType; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.response.SqlParserResp; +import com.tencent.supersonic.headless.api.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryItemReq; +import com.tencent.supersonic.headless.api.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.ItemQueryResultResp; +import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.enums.QueryType; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.response.SqlParserResp; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.service.DownloadService; import com.tencent.supersonic.headless.core.service.HeadlessQueryEngine; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/SchemaController.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/SchemaController.java index 441c9601b..d6d5a30ad 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/SchemaController.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/rest/SchemaController.java @@ -4,14 +4,14 @@ import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.utils.UserHolder; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.DomainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import com.tencent.supersonic.headless.core.service.SchemaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/DownloadService.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/DownloadService.java index 5b0e4a46a..bd32e518a 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/DownloadService.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/DownloadService.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.core.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.common.core.request.BatchDownloadReq; -import com.tencent.supersonic.headless.common.core.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.request.DownloadStructReq; import javax.servlet.http.HttpServletResponse; public interface DownloadService { diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/HeadlessQueryEngine.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/HeadlessQueryEngine.java index 75ec78d64..5e0b518ba 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/HeadlessQueryEngine.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/HeadlessQueryEngine.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.core.service; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.core.executor.QueryExecutor; @@ -17,5 +17,5 @@ public interface HeadlessQueryEngine { QueryStatement physicalSql(QueryStructReq queryStructCmd, ParseSqlReq sqlCommend) throws Exception; - QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricReq sqlCommend) throws Exception; + QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricQueryReq sqlCommend) throws Exception; } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/QueryService.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/QueryService.java index fc7836c61..5969eff89 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/QueryService.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/QueryService.java @@ -1,18 +1,18 @@ package com.tencent.supersonic.headless.core.service; import com.tencent.supersonic.auth.api.authentication.pojo.User; -import com.tencent.supersonic.headless.common.core.request.QueryItemReq; -import com.tencent.supersonic.headless.common.core.response.ItemQueryResultResp; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; +import com.tencent.supersonic.headless.api.request.QueryItemReq; +import com.tencent.supersonic.headless.api.response.ItemQueryResultResp; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.ItemUseResp; import com.tencent.supersonic.headless.core.annotation.ApiHeaderCheck; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; @@ -42,6 +42,6 @@ public interface QueryService { ItemQueryResultResp metricDataQueryById(QueryItemReq queryApiReq, HttpServletRequest request) throws Exception; - QueryStatement parseMetricReq(MetricReq metricReq) throws Exception; + QueryStatement parseMetricReq(MetricQueryReq metricReq) throws Exception; } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/SchemaService.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/SchemaService.java index ad3a922a0..65877a939 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/SchemaService.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/SchemaService.java @@ -3,14 +3,14 @@ package com.tencent.supersonic.headless.core.service; import com.github.pagehelper.PageInfo; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.AuthType; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.DomainResp; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.DomainResp; import java.util.List; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/DownloadServiceImpl.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/DownloadServiceImpl.java index d66060c90..94bcf1d8a 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/DownloadServiceImpl.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/DownloadServiceImpl.java @@ -13,16 +13,16 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.headless.core.persistence.pojo.DataDownload; -import com.tencent.supersonic.headless.common.core.request.BatchDownloadReq; -import com.tencent.supersonic.headless.common.core.request.DownloadStructReq; -import com.tencent.supersonic.headless.common.server.enums.SemanticType; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.response.DimSchemaResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.BatchDownloadReq; +import com.tencent.supersonic.headless.api.request.DownloadStructReq; +import com.tencent.supersonic.headless.api.enums.SemanticType; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.service.QueryService; import com.tencent.supersonic.headless.core.utils.DataTransformUtils; import com.tencent.supersonic.headless.core.service.DownloadService; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/HeadlessQueryEngineImpl.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/HeadlessQueryEngineImpl.java index e88d31e93..70ba82861 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/HeadlessQueryEngineImpl.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/HeadlessQueryEngineImpl.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.core.service.impl; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import com.tencent.supersonic.headless.core.executor.QueryExecutor; import com.tencent.supersonic.headless.core.optimizer.QueryOptimizer; import com.tencent.supersonic.headless.core.parser.QueryParser; @@ -78,7 +78,7 @@ public class HeadlessQueryEngineImpl implements HeadlessQueryEngine { return optimize(queryStructCmd, queryParser.parser(sqlCommend, queryStatement)); } - public QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricReq metricCommand) throws Exception { + public QueryStatement physicalSql(QueryStructReq queryStructCmd, MetricQueryReq metricCommand) throws Exception { QueryStatement queryStatement = new QueryStatement(); queryStatement.setQueryStructReq(queryStructCmd); queryStatement.setMetricReq(metricCommand); diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/QueryServiceImpl.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/QueryServiceImpl.java index 0c412056b..5a2b3e415 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/QueryServiceImpl.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/QueryServiceImpl.java @@ -14,29 +14,29 @@ import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.JsonUtil; import com.tencent.supersonic.common.util.cache.CacheUtils; -import com.tencent.supersonic.headless.common.core.pojo.SingleItemQueryResult; -import com.tencent.supersonic.headless.common.core.pojo.Cache; -import com.tencent.supersonic.headless.common.core.request.ExplainSqlReq; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.request.MetricReq; -import com.tencent.supersonic.headless.common.core.request.QueryItemReq; -import com.tencent.supersonic.headless.common.core.request.QueryDimValueReq; -import com.tencent.supersonic.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.core.response.ItemQueryResultResp; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; -import com.tencent.supersonic.headless.common.server.enums.QueryType; -import com.tencent.supersonic.headless.common.server.pojo.Dim; -import com.tencent.supersonic.headless.common.server.pojo.Item; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.response.AppDetailResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.ExplainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.pojo.SingleItemQueryResult; +import com.tencent.supersonic.headless.api.pojo.Cache; +import com.tencent.supersonic.headless.api.request.ExplainSqlReq; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.request.MetricQueryReq; +import com.tencent.supersonic.headless.api.request.QueryItemReq; +import com.tencent.supersonic.headless.api.request.QueryDimValueReq; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.ItemQueryResultResp; +import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.enums.QueryType; +import com.tencent.supersonic.headless.api.pojo.Dim; +import com.tencent.supersonic.headless.api.pojo.Item; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.response.AppDetailResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.ExplainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.annotation.ApiHeaderCheck; import com.tencent.supersonic.headless.core.annotation.S2SQLDataPermission; import com.tencent.supersonic.headless.core.annotation.StructDataPermission; @@ -365,7 +365,7 @@ public class QueryServiceImpl implements QueryService { return ExplainResp.builder().sql(sql).build(); } - public QueryStatement parseMetricReq(MetricReq metricReq) throws Exception { + public QueryStatement parseMetricReq(MetricQueryReq metricReq) throws Exception { QueryStructReq queryStructCmd = new QueryStructReq(); return headlessQueryEngine.physicalSql(queryStructCmd, metricReq); } diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/SchemaServiceImpl.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/SchemaServiceImpl.java index f45e50ab5..06f4f7c24 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/SchemaServiceImpl.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/service/impl/SchemaServiceImpl.java @@ -4,18 +4,18 @@ 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.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.request.PageDimensionReq; -import com.tencent.supersonic.headless.common.server.request.PageMetricReq; -import com.tencent.supersonic.headless.common.server.response.DimSchemaResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.DomainResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp; -import com.tencent.supersonic.headless.common.server.response.ModelResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.request.PageDimensionReq; +import com.tencent.supersonic.headless.api.request.PageMetricReq; +import com.tencent.supersonic.headless.api.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.DomainResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.response.ModelResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import com.tencent.supersonic.headless.core.service.QueryService; import com.tencent.supersonic.headless.core.service.SchemaService; import com.tencent.supersonic.headless.server.service.DimensionService; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryStructUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryStructUtils.java index 94f35cd59..567534d37 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryStructUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryStructUtils.java @@ -14,17 +14,17 @@ 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.headless.common.core.request.ParseSqlReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.server.pojo.ItemDateFilter; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; -import com.tencent.supersonic.headless.common.server.request.ModelSchemaFilterReq; -import com.tencent.supersonic.headless.common.server.response.DimSchemaResp; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.MetricSchemaResp; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.request.ParseSqlReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.request.ModelSchemaFilterReq; +import com.tencent.supersonic.headless.api.response.DimSchemaResp; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.MetricSchemaResp; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import com.tencent.supersonic.headless.core.service.SchemaService; import com.tencent.supersonic.headless.server.pojo.EngineTypeEnum; import com.tencent.supersonic.headless.server.pojo.MetaFilter; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryUtils.java index f280464f5..ef6cfa9c5 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/QueryUtils.java @@ -5,11 +5,11 @@ 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.headless.common.core.request.QueryMultiStructReq; -import com.tencent.supersonic.headless.common.server.enums.SemanticType; -import com.tencent.supersonic.headless.common.server.response.DimensionResp; -import com.tencent.supersonic.headless.common.server.response.MetricResp; -import com.tencent.supersonic.headless.common.server.response.QueryResultWithSchemaResp; +import com.tencent.supersonic.headless.api.request.QueryMultiStructReq; +import com.tencent.supersonic.headless.api.enums.SemanticType; +import com.tencent.supersonic.headless.api.response.DimensionResp; +import com.tencent.supersonic.headless.api.response.MetricResp; +import com.tencent.supersonic.headless.api.response.QueryResultWithSchemaResp; import com.tencent.supersonic.headless.core.persistence.pojo.QueryStatement; import com.tencent.supersonic.headless.server.pojo.MetaFilter; import com.tencent.supersonic.headless.server.service.Catalog; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java index 1dcddf889..0f3e184af 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java @@ -5,7 +5,7 @@ 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.headless.common.core.request.QueryStructReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/StatUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/StatUtils.java index 5e6c1c7e9..3bb069418 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/StatUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/StatUtils.java @@ -7,16 +7,16 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper; -import com.tencent.supersonic.headless.common.core.request.ItemUseReq; -import com.tencent.supersonic.headless.common.core.request.QueryS2SQLReq; -import com.tencent.supersonic.headless.common.core.request.QueryStructReq; -import com.tencent.supersonic.headless.common.core.response.ItemUseResp; -import com.tencent.supersonic.headless.common.core.enums.QueryOptMode; -import com.tencent.supersonic.headless.common.core.enums.QueryTypeBack; -import com.tencent.supersonic.headless.common.server.enums.QueryType; -import com.tencent.supersonic.headless.common.server.pojo.QueryStat; -import com.tencent.supersonic.headless.common.server.pojo.SchemaItem; -import com.tencent.supersonic.headless.common.server.response.ModelSchemaResp; +import com.tencent.supersonic.headless.api.request.ItemUseReq; +import com.tencent.supersonic.headless.api.request.QueryS2SQLReq; +import com.tencent.supersonic.headless.api.request.QueryStructReq; +import com.tencent.supersonic.headless.api.response.ItemUseResp; +import com.tencent.supersonic.headless.api.enums.QueryOptMode; +import com.tencent.supersonic.headless.api.enums.QueryTypeBack; +import com.tencent.supersonic.headless.api.enums.QueryType; +import com.tencent.supersonic.headless.api.pojo.QueryStat; +import com.tencent.supersonic.headless.api.pojo.SchemaItem; +import com.tencent.supersonic.headless.api.response.ModelSchemaResp; import com.tencent.supersonic.headless.core.persistence.repository.StatRepository; import com.tencent.supersonic.headless.server.service.ModelService; import lombok.extern.slf4j.Slf4j; diff --git a/headless/core/src/main/resources/mapper/StatMapper.xml b/headless/core/src/main/resources/mapper/StatMapper.xml index 99e43ddf0..4c5d48105 100644 --- a/headless/core/src/main/resources/mapper/StatMapper.xml +++ b/headless/core/src/main/resources/mapper/StatMapper.xml @@ -5,7 +5,7 @@ + type="com.tencent.supersonic.headless.api.pojo.QueryStat"> @@ -55,7 +55,7 @@ + - 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/headless/model/src/main/resources/mapper/custom/DateInfoMapper.xml b/headless/server/src/main/resources/mapper/custom/DateInfoMapper.xml similarity index 92% rename from headless/model/src/main/resources/mapper/custom/DateInfoMapper.xml rename to headless/server/src/main/resources/mapper/custom/DateInfoMapper.xml index 538ef2cd9..790033f59 100644 --- a/headless/model/src/main/resources/mapper/custom/DateInfoMapper.xml +++ b/headless/server/src/main/resources/mapper/custom/DateInfoMapper.xml @@ -1,10 +1,10 @@ - + + type="com.tencent.supersonic.headless.server.persistence.dataobject.DateInfoDO"> diff --git a/headless/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml b/headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml similarity index 97% rename from headless/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml rename to headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml index 75dd500a1..d9fda8391 100644 --- a/headless/model/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml +++ b/headless/server/src/main/resources/mapper/custom/DimensionDOCustomMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -20,7 +20,7 @@ - + diff --git a/headless/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml b/headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml similarity index 97% rename from headless/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml rename to headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml index 0bab71263..4b7098aae 100644 --- a/headless/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml +++ b/headless/server/src/main/resources/mapper/custom/MetricDOCustomMapper.xml @@ -1,8 +1,8 @@ - - + + @@ -20,7 +20,7 @@ - + diff --git a/headless/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml b/headless/server/src/main/resources/mapper/custom/ModelDOCustomMapper.xml similarity index 85% rename from headless/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml rename to headless/server/src/main/resources/mapper/custom/ModelDOCustomMapper.xml index 56ee61c95..02fd34c4c 100644 --- a/headless/model/src/main/resources/mapper/custom/ModelDOCustomMapper.xml +++ b/headless/server/src/main/resources/mapper/custom/ModelDOCustomMapper.xml @@ -1,7 +1,7 @@ - + diff --git a/headless/server/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java b/headless/server/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java index 9eb679dfc..1b1368c19 100644 --- a/headless/server/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java +++ b/headless/server/src/test/java/com/tencent/supersonic/headless/model/application/ModelServiceImplTest.java @@ -5,15 +5,15 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.auth.api.authentication.service.UserService; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.common.server.enums.DimensionType; -import com.tencent.supersonic.headless.common.server.enums.IdentifyType; -import com.tencent.supersonic.headless.common.server.pojo.Dim; -import com.tencent.supersonic.headless.common.server.pojo.DimensionTimeTypeParams; -import com.tencent.supersonic.headless.common.server.pojo.Identify; -import com.tencent.supersonic.headless.common.server.pojo.Measure; -import com.tencent.supersonic.headless.common.server.pojo.ModelDetail; -import com.tencent.supersonic.headless.common.server.request.ModelReq; -import com.tencent.supersonic.headless.common.server.response.ModelResp; +import com.tencent.supersonic.headless.api.enums.DimensionType; +import com.tencent.supersonic.headless.api.enums.IdentifyType; +import com.tencent.supersonic.headless.api.pojo.Dim; +import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.api.pojo.Identify; +import com.tencent.supersonic.headless.api.pojo.Measure; +import com.tencent.supersonic.headless.api.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.request.ModelReq; +import com.tencent.supersonic.headless.api.response.ModelResp; import com.tencent.supersonic.headless.server.persistence.dataobject.ModelDO; import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRepository; import com.tencent.supersonic.headless.server.persistence.repository.ModelRepository; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java index c8756fc3e..361453625 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/BenchMarkDemoDataLoader.java @@ -6,15 +6,15 @@ import com.tencent.supersonic.common.pojo.JoinCondition; import com.tencent.supersonic.common.pojo.ModelRela; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; -import com.tencent.supersonic.headless.common.server.enums.DimensionType; -import com.tencent.supersonic.headless.common.server.enums.IdentifyType; -import com.tencent.supersonic.headless.common.server.pojo.Dim; -import com.tencent.supersonic.headless.common.server.pojo.DimensionTimeTypeParams; -import com.tencent.supersonic.headless.common.server.pojo.Identify; -import com.tencent.supersonic.headless.common.server.pojo.Measure; -import com.tencent.supersonic.headless.common.server.pojo.ModelDetail; -import com.tencent.supersonic.headless.common.server.request.DomainReq; -import com.tencent.supersonic.headless.common.server.request.ModelReq; +import com.tencent.supersonic.headless.api.enums.DimensionType; +import com.tencent.supersonic.headless.api.enums.IdentifyType; +import com.tencent.supersonic.headless.api.pojo.Dim; +import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.api.pojo.Identify; +import com.tencent.supersonic.headless.api.pojo.Measure; +import com.tencent.supersonic.headless.api.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.request.DomainReq; +import com.tencent.supersonic.headless.api.request.ModelReq; import com.tencent.supersonic.headless.server.service.DomainService; import com.tencent.supersonic.headless.server.service.ModelRelaService; import com.tencent.supersonic.headless.server.service.ModelService; diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java b/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java index 30578d19c..ac6172079 100644 --- a/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java +++ b/launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java @@ -12,21 +12,21 @@ import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum; -import com.tencent.supersonic.headless.common.server.enums.DataType; -import com.tencent.supersonic.headless.common.server.enums.DimensionType; -import com.tencent.supersonic.headless.common.server.enums.IdentifyType; -import com.tencent.supersonic.headless.common.server.enums.SemanticType; -import com.tencent.supersonic.headless.common.server.pojo.Dim; -import com.tencent.supersonic.headless.common.server.pojo.DimensionTimeTypeParams; -import com.tencent.supersonic.headless.common.server.pojo.Identify; -import com.tencent.supersonic.headless.common.server.pojo.Measure; -import com.tencent.supersonic.headless.common.server.pojo.MetricTypeParams; -import com.tencent.supersonic.headless.common.server.pojo.ModelDetail; -import com.tencent.supersonic.headless.common.server.request.DatabaseReq; -import com.tencent.supersonic.headless.common.server.request.DimensionReq; -import com.tencent.supersonic.headless.common.server.request.DomainReq; -import com.tencent.supersonic.headless.common.server.request.MetricReq; -import com.tencent.supersonic.headless.common.server.request.ModelReq; +import com.tencent.supersonic.headless.api.enums.DataType; +import com.tencent.supersonic.headless.api.enums.DimensionType; +import com.tencent.supersonic.headless.api.enums.IdentifyType; +import com.tencent.supersonic.headless.api.enums.SemanticType; +import com.tencent.supersonic.headless.api.pojo.Dim; +import com.tencent.supersonic.headless.api.pojo.DimensionTimeTypeParams; +import com.tencent.supersonic.headless.api.pojo.Identify; +import com.tencent.supersonic.headless.api.pojo.Measure; +import com.tencent.supersonic.headless.api.pojo.MetricTypeParams; +import com.tencent.supersonic.headless.api.pojo.ModelDetail; +import com.tencent.supersonic.headless.api.request.DatabaseReq; +import com.tencent.supersonic.headless.api.request.DimensionReq; +import com.tencent.supersonic.headless.api.request.DomainReq; +import com.tencent.supersonic.headless.api.request.MetricReq; +import com.tencent.supersonic.headless.api.request.ModelReq; import com.tencent.supersonic.headless.server.service.DatabaseService; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.DomainService; diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java deleted file mode 100644 index 2a249da32..000000000 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricInterpretTest.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.tencent.supersonic.integration; - -import com.tencent.supersonic.StandaloneLauncher; -import com.tencent.supersonic.chat.query.llm.analytics.LLMAnswerResp; -import com.tencent.supersonic.chat.service.AgentService; -import com.tencent.supersonic.common.config.EmbeddingConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = StandaloneLauncher.class) -@ActiveProfiles("local") -public class MetricInterpretTest { - - @MockBean - private AgentService agentService; - @MockBean - private EmbeddingConfig embeddingConfig; - - @Test - public void testMetricInterpret() throws Exception { - MockConfiguration.mockAgent(agentService); - MockConfiguration.mockEmbeddingUrl(embeddingConfig); - - LLMAnswerResp lLmAnswerResp = new LLMAnswerResp(); - lLmAnswerResp.setAssistantMessage("alice最近在超音数的访问情况有增多"); - - } - -} diff --git a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java index 6625fefcb..27d951740 100644 --- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java +++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/model/MetricServiceImplTest.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.integration.model; import com.google.common.collect.Lists; import com.tencent.supersonic.StandaloneLauncher; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; -import com.tencent.supersonic.headless.common.server.enums.MetricType; -import com.tencent.supersonic.headless.common.server.response.MetricResp; +import com.tencent.supersonic.headless.api.enums.MetricType; +import com.tencent.supersonic.headless.api.response.MetricResp; import com.tencent.supersonic.headless.server.pojo.MetricFilter; import com.tencent.supersonic.headless.server.service.MetricService; import org.junit.jupiter.api.Assertions;