Make some refactoring in Headless (#672)

* [improvement][headless]Move QueryCache from server to core and move yaml-related classes from core to server

* [improvement][headless]Declare QueryParser and QueryPlanner as interface instead of class.

---------

Co-authored-by: LXW

headless/server/src/main/java/com/tencent/supersonic/headless/server/cache/CacheManager.java

@@ -1,14 +0,0 @@
-package com.tencent.supersonic.headless.server.cache;
-
-
-public interface CacheManager {
-
-    Boolean put(String key, Object value);
-
-    Object get(String key);
-
-    String generateCacheKey(String prefix, String body);
-
-    Boolean removeCache(String key);
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/cache/CaffeineCacheManager.java

@@ -1,52 +0,0 @@
-package com.tencent.supersonic.headless.server.cache;
-
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.google.common.base.Joiner;
-import com.tencent.supersonic.headless.server.config.CacheCommonConfig;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.logging.log4j.util.Strings;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class CaffeineCacheManager implements CacheManager {
-
-    @Autowired
-    private CacheCommonConfig cacheCommonConfig;
-
-    @Autowired
-    @Qualifier("caffeineCache")
-    private Cache<String, Object> caffeineCache;
-
-    @Override
-    public Boolean put(String key, Object value) {
-        log.info("[put caffeineCache] key:{}, value:{}", key, value);
-        caffeineCache.put(key, value);
-        return true;
-    }
-
-    @Override
-    public Object get(String key) {
-        Object value = caffeineCache.asMap().get(key);
-        log.info("[get caffeineCache] key:{}, value:{}", key, value);
-        return value;
-    }
-
-    @Override
-    public String generateCacheKey(String prefix, String body) {
-        if (Strings.isEmpty(prefix)) {
-            prefix = "-1";
-        }
-        return Joiner.on(":").join(cacheCommonConfig.getCacheCommonApp(), cacheCommonConfig.getCacheCommonEnv(),
-                cacheCommonConfig.getCacheCommonVersion(), prefix, body);
-    }
-
-    @Override
-    public Boolean removeCache(String key) {
-        caffeineCache.asMap().remove(key);
-        return true;
-    }
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/cache/QueryCache.java

@@ -1,78 +0,0 @@
-package com.tencent.supersonic.headless.server.cache;
-
-
-import com.tencent.supersonic.headless.api.pojo.Cache;
-import com.tencent.supersonic.headless.api.request.SemanticQueryReq;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-@Slf4j
-public class QueryCache {
-
-    @Value("${query.cache.enable:true}")
-    private Boolean cacheEnable;
-    @Autowired
-    private CacheManager cacheManager;
-
-    public Object query(SemanticQueryReq semanticQueryReq) {
-        String cacheKey = getCacheKey(semanticQueryReq);
-        handleGlobalCacheDisable(semanticQueryReq);
-        boolean isCache = isCache(semanticQueryReq);
-        if (isCache) {
-            Object result = cacheManager.get(cacheKey);
-            log.info("queryFromCache, key:{}, semanticQueryReq:{}", cacheKey, semanticQueryReq);
-            return result;
-        }
-        return null;
-    }
-
-    public Boolean put(SemanticQueryReq semanticQueryReq, Object value) {
-        if (cacheEnable && Objects.nonNull(value)) {
-            String key = getCacheKey(semanticQueryReq);
-            CompletableFuture.supplyAsync(() -> cacheManager.put(key, value))
-                    .exceptionally(exception -> {
-                        log.warn("exception:", exception);
-                        return null;
-                    });
-            log.info("add record to cache, key:{}", key);
-            return true;
-        }
-        return false;
-    }
-
-    public String getCacheKey(SemanticQueryReq semanticQueryReq) {
-        String commandMd5 = semanticQueryReq.generateCommandMd5();
-        String keyByModelIds = getKeyByModelIds(semanticQueryReq.getModelIds());
-        return cacheManager.generateCacheKey(keyByModelIds, commandMd5);
-    }
-
-    private void handleGlobalCacheDisable(SemanticQueryReq semanticQueryReq) {
-        if (!cacheEnable) {
-            Cache cacheInfo = new Cache();
-            cacheInfo.setCache(false);
-            semanticQueryReq.setCacheInfo(cacheInfo);
-        }
-    }
-
-    private String getKeyByModelIds(List<Long> modelIds) {
-        return String.join(",", modelIds.stream().map(Object::toString).collect(Collectors.toList()));
-    }
-
-    private boolean isCache(SemanticQueryReq semanticQueryReq) {
-        if (!cacheEnable) {
-            return false;
-        }
-        if (semanticQueryReq.getCacheInfo() != null) {
-            return semanticQueryReq.getCacheInfo().getCache();
-        }
-        return false;
-    }
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/config/CacheCommonConfig.java

@@ -1,24 +0,0 @@
-package com.tencent.supersonic.headless.server.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@Data
-public class CacheCommonConfig {
-
-    @Value("${cache.common.app:supersonic}")
-    private String cacheCommonApp;
-
-    @Value("${cache.common.env:dev}")
-    private String cacheCommonEnv;
-
-    @Value("${cache.common.version:0}")
-    private Integer cacheCommonVersion;
-
-    @Value("${cache.common.expire.after.write:10}")
-    private Integer cacheCommonExpireAfterWrite;
-
-
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/config/CaffeineCacheConfig.java

@@ -1,40 +0,0 @@
-package com.tencent.supersonic.headless.server.config;
-
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class CaffeineCacheConfig {
-
-    @Autowired
-    private CacheCommonConfig cacheCommonConfig;
-
-    @Value("${caffeine.initial.capacity:500}")
-    private Integer caffeineInitialCapacity;
-
-    @Value("${caffeine.max.size:5000}")
-    private Integer caffeineMaximumSize;
-
-    @Bean(name = "caffeineCache")
-    public Cache<String, Object> caffeineCache() {
-        return Caffeine.newBuilder()
-                .expireAfterWrite(cacheCommonConfig.getCacheCommonExpireAfterWrite(), TimeUnit.MINUTES)
-                .initialCapacity(caffeineInitialCapacity)
-                .maximumSize(caffeineMaximumSize)
-                .build();
-    }
-
-    @Bean(name = "searchCaffeineCache")
-    public Cache<Long, Object> searchCaffeineCache() {
-        return Caffeine.newBuilder()
-                .expireAfterWrite(10000, TimeUnit.MINUTES)
-                .initialCapacity(caffeineInitialCapacity)
-                .maximumSize(caffeineMaximumSize)
-                .build();
-    }
-}

headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/DimensionYamlManager.java

@@ -0,0 +1,40 @@
+package com.tencent.supersonic.headless.server.manager;
+
+
+import com.tencent.supersonic.headless.api.enums.IdentifyType;
+import com.tencent.supersonic.headless.api.response.DimensionResp;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *  manager to handle the dimension
+ */
+@Slf4j
+@Service
+public class DimensionYamlManager {
+
+    public static List<DimensionYamlTpl> convert2DimensionYaml(List<DimensionResp> dimensions) {
+        if (CollectionUtils.isEmpty(dimensions)) {
+            return new ArrayList<>();
+        }
+        return dimensions.stream()
+                .filter(dimension -> !dimension.getType().equalsIgnoreCase(IdentifyType.primary.name()))
+                .map(DimensionYamlManager::convert2DimensionYamlTpl).collect(Collectors.toList());
+    }
+
+    public static DimensionYamlTpl convert2DimensionYamlTpl(DimensionResp dimension) {
+        DimensionYamlTpl dimensionYamlTpl = new DimensionYamlTpl();
+        BeanUtils.copyProperties(dimension, dimensionYamlTpl);
+        dimensionYamlTpl.setName(dimension.getBizName());
+        dimensionYamlTpl.setOwners(dimension.getCreatedBy());
+        return dimensionYamlTpl;
+    }
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/MetricYamlManager.java

@@ -0,0 +1,92 @@
+package com.tencent.supersonic.headless.server.manager;
+
+import com.google.common.collect.Lists;
+import com.tencent.supersonic.headless.api.enums.MetricDefineType;
+import com.tencent.supersonic.headless.api.pojo.FieldParam;
+import com.tencent.supersonic.headless.api.pojo.MeasureParam;
+import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams;
+import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams;
+import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams;
+import com.tencent.supersonic.headless.api.pojo.MetricParam;
+import com.tencent.supersonic.headless.api.response.MetricResp;
+import com.tencent.supersonic.headless.server.pojo.yaml.FieldParamYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MeasureYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricParamYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricTypeParamsYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * manager to handle the metric
+ */
+@Slf4j
+@Service
+public class MetricYamlManager {
+
+    public static List<MetricYamlTpl> convert2YamlObj(List<MetricResp> metrics) {
+
+        List<MetricYamlTpl> metricYamlTpls = new ArrayList<>();
+        for (MetricResp metric : metrics) {
+            MetricYamlTpl metricYamlTpl = convert2MetricYamlTpl(metric);
+            metricYamlTpls.add(metricYamlTpl);
+        }
+        return metricYamlTpls;
+    }
+
+    public static MetricYamlTpl convert2MetricYamlTpl(MetricResp metric) {
+        MetricYamlTpl metricYamlTpl = new MetricYamlTpl();
+        BeanUtils.copyProperties(metric, metricYamlTpl);
+        metricYamlTpl.setName(metric.getBizName());
+        metricYamlTpl.setOwners(Lists.newArrayList(metric.getCreatedBy()));
+        MetricTypeParamsYamlTpl metricTypeParamsYamlTpl = new MetricTypeParamsYamlTpl();
+        if (MetricDefineType.MEASURE.equals(metric.getMetricDefineType())) {
+            MetricDefineByMeasureParams metricDefineParams = metric.getMetricDefineByMeasureParams();
+            metricTypeParamsYamlTpl.setExpr(metricDefineParams.getExpr());
+            List<MeasureParam> measures = metricDefineParams.getMeasures();
+            metricTypeParamsYamlTpl.setMeasures(
+                    measures.stream().map(MetricYamlManager::convert).collect(Collectors.toList()));
+        } else if (MetricDefineType.FIELD.equals(metric.getMetricDefineType())) {
+            MetricDefineByFieldParams metricDefineParams = metric.getMetricDefineByFieldParams();
+            metricTypeParamsYamlTpl.setExpr(metricDefineParams.getExpr());
+            List<FieldParam> fields = metricDefineParams.getFields();
+            metricTypeParamsYamlTpl.setFields(
+                    fields.stream().map(MetricYamlManager::convert).collect(Collectors.toList()));
+        } else if (MetricDefineType.METRIC.equals(metric.getMetricDefineType())) {
+            MetricDefineByMetricParams metricDefineByMetricParams = metric.getMetricDefineByMetricParams();
+            metricTypeParamsYamlTpl.setExpr(metricDefineByMetricParams.getExpr());
+            List<MetricParam> metrics = metricDefineByMetricParams.getMetrics();
+            metricTypeParamsYamlTpl.setMetrics(
+                    metrics.stream().map(MetricYamlManager::convert).collect(Collectors.toList()));
+        }
+        metricYamlTpl.setTypeParams(metricTypeParamsYamlTpl);
+        return metricYamlTpl;
+    }
+
+    public static MeasureYamlTpl convert(MeasureParam measure) {
+        MeasureYamlTpl measureYamlTpl = new MeasureYamlTpl();
+        measureYamlTpl.setName(measure.getBizName());
+        measureYamlTpl.setConstraint(measure.getConstraint());
+        measureYamlTpl.setAgg(measure.getAgg());
+        return measureYamlTpl;
+    }
+
+    public static FieldParamYamlTpl convert(FieldParam fieldParam) {
+        FieldParamYamlTpl fieldParamYamlTpl = new FieldParamYamlTpl();
+        fieldParamYamlTpl.setFieldName(fieldParam.getFieldName());
+        return fieldParamYamlTpl;
+    }
+
+    public static MetricParamYamlTpl convert(MetricParam metricParam) {
+        MetricParamYamlTpl metricParamYamlTpl = new MetricParamYamlTpl();
+        metricParamYamlTpl.setBizName(metricParam.getBizName());
+        metricParamYamlTpl.setId(metricParam.getId());
+        return metricParamYamlTpl;
+    }
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/ModelYamlManager.java

@@ -0,0 +1,102 @@
+package com.tencent.supersonic.headless.server.manager;
+
+import com.tencent.supersonic.headless.api.enums.DatasourceQuery;
+import com.tencent.supersonic.headless.api.enums.ModelSourceType;
+import com.tencent.supersonic.headless.api.pojo.Dim;
+import com.tencent.supersonic.headless.api.pojo.Identify;
+import com.tencent.supersonic.headless.api.pojo.Measure;
+import com.tencent.supersonic.headless.api.pojo.ModelDetail;
+import com.tencent.supersonic.headless.api.response.DatabaseResp;
+import com.tencent.supersonic.headless.api.response.ModelResp;
+import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptor;
+import com.tencent.supersonic.headless.core.adaptor.db.DbAdaptorFactory;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionTimeTypeParamsTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.IdentifyYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MeasureYamlTpl;
+import com.tencent.supersonic.headless.core.utils.SysTimeDimensionBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * manager to handle the model
+ */
+@Service
+@Slf4j
+public class ModelYamlManager {
+
+    public static DataModelYamlTpl convert2YamlObj(ModelResp modelResp, DatabaseResp databaseResp) {
+        ModelDetail modelDetail = modelResp.getModelDetail();
+        DbAdaptor engineAdaptor = DbAdaptorFactory.getEngineAdaptor(databaseResp.getType());
+        SysTimeDimensionBuilder.addSysTimeDimension(modelDetail.getDimensions(), engineAdaptor);
+        addInterCntMetric(modelResp.getBizName(), modelDetail);
+        DataModelYamlTpl dataModelYamlTpl = new DataModelYamlTpl();
+        dataModelYamlTpl.setType(databaseResp.getType());
+        BeanUtils.copyProperties(modelDetail, dataModelYamlTpl);
+        dataModelYamlTpl.setIdentifiers(modelDetail.getIdentifiers().stream().map(ModelYamlManager::convert)
+                .collect(Collectors.toList()));
+        dataModelYamlTpl.setDimensions(modelDetail.getDimensions().stream().map(ModelYamlManager::convert)
+                .collect(Collectors.toList()));
+        dataModelYamlTpl.setMeasures(modelDetail.getMeasures().stream().map(ModelYamlManager::convert)
+                .collect(Collectors.toList()));
+        dataModelYamlTpl.setName(modelResp.getBizName());
+        dataModelYamlTpl.setSourceId(modelResp.getDatabaseId());
+        dataModelYamlTpl.setModelSourceTypeEnum(ModelSourceType.of(modelResp.getSourceType()));
+        if (modelDetail.getQueryType().equalsIgnoreCase(DatasourceQuery.SQL_QUERY.getName())) {
+            dataModelYamlTpl.setSqlQuery(modelDetail.getSqlQuery());
+        } else {
+            dataModelYamlTpl.setTableQuery(modelDetail.getTableQuery());
+        }
+        dataModelYamlTpl.setFields(modelResp.getModelDetail().getFields());
+        return dataModelYamlTpl;
+    }
+
+    public static DimensionYamlTpl convert(Dim dim) {
+        DimensionYamlTpl dimensionYamlTpl = new DimensionYamlTpl();
+        BeanUtils.copyProperties(dim, dimensionYamlTpl);
+        dimensionYamlTpl.setName(dim.getBizName());
+        if (Objects.isNull(dimensionYamlTpl.getExpr())) {
+            dimensionYamlTpl.setExpr(dim.getBizName());
+        }
+        if (dim.getTypeParams() != null) {
+            DimensionTimeTypeParamsTpl dimensionTimeTypeParamsTpl = new DimensionTimeTypeParamsTpl();
+            dimensionTimeTypeParamsTpl.setIsPrimary(dim.getTypeParams().getIsPrimary());
+            dimensionTimeTypeParamsTpl.setTimeGranularity(dim.getTypeParams().getTimeGranularity());
+            dimensionYamlTpl.setTypeParams(dimensionTimeTypeParamsTpl);
+        }
+        return dimensionYamlTpl;
+    }
+
+    public static MeasureYamlTpl convert(Measure measure) {
+        MeasureYamlTpl measureYamlTpl = new MeasureYamlTpl();
+        BeanUtils.copyProperties(measure, measureYamlTpl);
+        measureYamlTpl.setName(measure.getBizName());
+        return measureYamlTpl;
+    }
+
+    public static IdentifyYamlTpl convert(Identify identify) {
+        IdentifyYamlTpl identifyYamlTpl = new IdentifyYamlTpl();
+        identifyYamlTpl.setName(identify.getBizName());
+        identifyYamlTpl.setType(identify.getType());
+        return identifyYamlTpl;
+    }
+
+    private static void addInterCntMetric(String datasourceEnName, ModelDetail datasourceDetail) {
+        Measure measure = new Measure();
+        measure.setExpr("1");
+        if (!CollectionUtils.isEmpty(datasourceDetail.getIdentifiers())) {
+            measure.setExpr(datasourceDetail.getIdentifiers().get(0).getBizName());
+        }
+        measure.setAgg("count");
+        measure.setBizName(String.format("%s_%s", datasourceEnName, "internal_cnt"));
+        measure.setIsCreateMetric(1);
+        datasourceDetail.getMeasures().add(measure);
+    }
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/manager/SemanticSchemaManager.java

@@ -20,15 +20,15 @@ import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.MetricTypeParams;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel;
 import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.pojo.yaml.DataModelYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionTimeTypeParamsTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.FieldParamYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.IdentifyYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MeasureYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricParamYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricTypeParamsYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionTimeTypeParamsTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.FieldParamYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.IdentifyYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MeasureYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricParamYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricTypeParamsYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
 import com.tencent.supersonic.headless.server.service.Catalog;
 import com.tencent.supersonic.headless.server.utils.DatabaseConverter;
 import java.util.ArrayList;

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DataModelYamlTpl.java

@@ -0,0 +1,37 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import com.tencent.supersonic.headless.api.enums.ModelSourceType;
+import com.tencent.supersonic.headless.api.pojo.Field;
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class DataModelYamlTpl {
+
+    private Long id;
+
+    private String name;
+
+    private Long sourceId;
+
+    private String type;
+
+    private String sqlQuery;
+
+    private String tableQuery;
+
+    private List<IdentifyYamlTpl> identifiers;
+
+    private List<DimensionYamlTpl> dimensions;
+
+    private List<MeasureYamlTpl> measures;
+
+    private List<Field> fields;
+
+    private ModelSourceType modelSourceTypeEnum;
+
+
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DimensionTimeTypeParamsTpl.java

@@ -0,0 +1,13 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import lombok.Data;
+
+
+@Data
+public class DimensionTimeTypeParamsTpl {
+
+    private String isPrimary;
+
+    private String timeGranularity;
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/DimensionYamlTpl.java

@@ -0,0 +1,27 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+
+import com.tencent.supersonic.common.pojo.enums.DataTypeEnums;
+import java.util.List;
+import lombok.Data;
+
+
+@Data
+public class DimensionYamlTpl {
+
+    private String name;
+
+    private String bizName;
+
+    private String owners;
+
+    private String type;
+
+    private String expr;
+
+    private DimensionTimeTypeParamsTpl typeParams;
+
+    private DataTypeEnums dataType;
+
+    private List<String> defaultValues;
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/FieldParamYamlTpl.java

@@ -0,0 +1,10 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import lombok.Data;
+
+@Data
+public class FieldParamYamlTpl {
+
+    private String fieldName;
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/IdentifyYamlTpl.java

@@ -0,0 +1,20 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IdentifyYamlTpl {
+
+    private String name;
+
+    /**
+     * 主键 primary 外键 foreign
+     */
+    private String type;
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/MeasureYamlTpl.java

@@ -0,0 +1,25 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class MeasureYamlTpl {
+
+    private String name;
+
+    private String agg;
+
+    private String expr;
+
+    private String constraint;
+
+    private String alias;
+
+    private String createMetric;
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/MetricParamYamlTpl.java

@@ -0,0 +1,12 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import lombok.Data;
+
+@Data
+public class MetricParamYamlTpl {
+
+    private Long id;
+
+    private String bizName;
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/MetricTypeParamsYamlTpl.java

@@ -0,0 +1,19 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+import lombok.Data;
+import org.apache.commons.compress.utils.Lists;
+
+import java.util.List;
+
+@Data
+public class MetricTypeParamsYamlTpl {
+
+    private List<MeasureYamlTpl> measures = Lists.newArrayList();
+
+    private List<MetricParamYamlTpl> metrics = Lists.newArrayList();
+
+    private List<FieldParamYamlTpl> fields = Lists.newArrayList();
+
+    private String expr;
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/yaml/MetricYamlTpl.java

@@ -0,0 +1,21 @@
+package com.tencent.supersonic.headless.server.pojo.yaml;
+
+
+import lombok.Data;
+
+import java.util.List;
+
+
+@Data
+public class MetricYamlTpl {
+
+    private String name;
+
+    private List<String> owners;
+
+    private String type;
+
+    private MetricTypeParamsYamlTpl typeParams;
+
+
+}

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/Catalog.java

@@ -8,9 +8,9 @@ import com.tencent.supersonic.headless.api.response.DimensionResp;
 import com.tencent.supersonic.headless.api.response.MetricResp;
 import com.tencent.supersonic.headless.api.response.ModelResp;
 import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.core.pojo.yaml.DataModelYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 
 import java.util.List;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java

@@ -12,9 +12,9 @@ import com.tencent.supersonic.headless.api.response.DatabaseResp;
 import com.tencent.supersonic.headless.api.response.ModelResp;
 import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import com.tencent.supersonic.headless.api.response.UnAvailableItemResp;
-import com.tencent.supersonic.headless.core.pojo.yaml.DataModelYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
 import com.tencent.supersonic.headless.server.pojo.ModelFilter;
 
 import java.util.List;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/CatalogImpl.java

@@ -9,9 +9,9 @@ import com.tencent.supersonic.headless.api.response.DimensionResp;
 import com.tencent.supersonic.headless.api.response.MetricResp;
 import com.tencent.supersonic.headless.api.response.ModelResp;
 import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
-import com.tencent.supersonic.headless.core.pojo.yaml.DataModelYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.service.Catalog;
 import com.tencent.supersonic.headless.server.service.DatabaseService;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java

@@ -31,12 +31,12 @@ import com.tencent.supersonic.headless.api.response.MetricSchemaResp;
 import com.tencent.supersonic.headless.api.response.ModelResp;
 import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import com.tencent.supersonic.headless.api.response.UnAvailableItemResp;
-import com.tencent.supersonic.headless.core.manager.DimensionYamlManager;
-import com.tencent.supersonic.headless.core.manager.MetricYamlManager;
-import com.tencent.supersonic.headless.core.manager.ModelYamlManager;
-import com.tencent.supersonic.headless.core.pojo.yaml.DataModelYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricYamlTpl;
+import com.tencent.supersonic.headless.server.manager.DimensionYamlManager;
+import com.tencent.supersonic.headless.server.manager.MetricYamlManager;
+import com.tencent.supersonic.headless.server.manager.ModelYamlManager;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DateInfoDO;
 import com.tencent.supersonic.headless.server.persistence.dataobject.ModelDO;
 import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRepository;

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryServiceImpl.java

@@ -37,6 +37,7 @@ import com.tencent.supersonic.headless.api.response.ModelResp;
 import com.tencent.supersonic.headless.api.response.ModelSchemaResp;
 import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.executor.QueryExecutor;
+import com.tencent.supersonic.headless.core.parser.DefaultQueryParser;
 import com.tencent.supersonic.headless.core.parser.QueryParser;
 import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel;
 import com.tencent.supersonic.headless.core.planner.QueryPlanner;
@@ -44,7 +45,7 @@ import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.server.annotation.S2SQLDataPermission;
 import com.tencent.supersonic.headless.server.annotation.StructDataPermission;
 import com.tencent.supersonic.headless.server.aspect.ApiHeaderCheckAspect;
-import com.tencent.supersonic.headless.server.cache.QueryCache;
+import com.tencent.supersonic.headless.core.cache.QueryCache;
 import com.tencent.supersonic.headless.server.manager.SemanticSchemaManager;
 import com.tencent.supersonic.headless.server.pojo.DimensionFilter;
 import com.tencent.supersonic.headless.server.service.AppService;
@@ -96,7 +97,7 @@ public class QueryServiceImpl implements QueryService {
             AppService appService,
             QueryCache queryCache,
             SemanticSchemaManager semanticSchemaManager,
-            QueryParser queryParser,
+            DefaultQueryParser queryParser,
             QueryPlanner queryPlanner) {
         this.statUtils = statUtils;
         this.queryUtils = queryUtils;
@@ -259,8 +260,8 @@ public class QueryServiceImpl implements QueryService {
             List<QueryStatement> sqlParsers = new ArrayList<>();
             for (QueryStructReq queryStructReq : queryMultiStructReq.getQueryStructReqs()) {
                 QueryStatement queryStatement = buildQueryStatement(queryStructReq);
-                queryStatement = queryParser.parse(queryStatement);
-                queryPlanner.optimizer(queryStatement);
+                queryParser.parse(queryStatement);
+                queryPlanner.plan(queryStatement);
                 sqlParsers.add(queryStatement);
             }
             log.info("multi sqlParser:{}", sqlParsers);
@@ -456,9 +457,9 @@ public class QueryServiceImpl implements QueryService {
     }
 
     private QueryStatement plan(QueryStatement queryStatement) throws Exception {
-        queryStatement = queryParser.parse(queryStatement);
+        queryParser.parse(queryStatement);
         log.info("queryStatement:{}", queryStatement);
-        queryPlanner.optimizer(queryStatement);
+        queryPlanner.plan(queryStatement);
         return queryStatement;
     }
 
@@ -467,7 +468,7 @@ public class QueryServiceImpl implements QueryService {
         log.info("[QueryStatement:{}]", queryStatement);
         try {
             //1 parse
-            queryStatement = queryParser.parse(queryStatement);
+            queryParser.parse(queryStatement);
             //2 plan
             QueryExecutor queryExecutor = queryPlanner.plan(queryStatement);
             //3 execute

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryUtils.java

@@ -14,7 +14,7 @@ import com.tencent.supersonic.headless.api.response.MetricResp;
 import com.tencent.supersonic.headless.api.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils;
-import com.tencent.supersonic.headless.server.cache.CacheManager;
+import com.tencent.supersonic.headless.core.cache.CacheManager;
 import com.tencent.supersonic.headless.server.pojo.MetaFilter;
 import com.tencent.supersonic.headless.server.service.Catalog;
 import java.util.Arrays;

headless/server/src/test/java/com/tencent/supersonic/headless/server/calcite/HeadlessParserServiceTest.java

@@ -8,13 +8,13 @@ import com.tencent.supersonic.headless.api.response.SqlParserResp;
 import com.tencent.supersonic.headless.core.parser.calcite.planner.AggPlanner;
 import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-import com.tencent.supersonic.headless.core.pojo.yaml.DataModelYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionTimeTypeParamsTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.DimensionYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.IdentifyYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MeasureYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricTypeParamsYamlTpl;
-import com.tencent.supersonic.headless.core.pojo.yaml.MetricYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DataModelYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionTimeTypeParamsTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.DimensionYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.IdentifyYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MeasureYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricTypeParamsYamlTpl;
+import com.tencent.supersonic.headless.server.pojo.yaml.MetricYamlTpl;
 import com.tencent.supersonic.headless.server.manager.SemanticSchemaManager;
 import lombok.extern.slf4j.Slf4j;