[improvement][headless] In the translator, adopt Calcite to support multiple WITH structures and optimize the Calcite code. (#1747)

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/enums/EngineType.java

@@ -1,38 +0,0 @@
-package com.tencent.supersonic.headless.api.pojo.enums;
-
-public enum EngineType {
-    TDW(0, "tdw"),
-    MYSQL(1, "mysql"),
-    DORIS(2, "doris"),
-    CLICKHOUSE(3, "clickhouse"),
-    KAFKA(4, "kafka"),
-    H2(5, "h2"),
-    POSTGRESQL(6, "postgresql"),
-    OTHER(7, "other");
-
-    private Integer code;
-
-    private String name;
-
-    EngineType(Integer code, String name) {
-        this.code = code;
-        this.name = name;
-    }
-
-    public Integer getCode() {
-        return code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static EngineType fromString(String value) {
-        for (EngineType engineType : EngineType.values()) {
-            if (engineType.name().equalsIgnoreCase(value)) {
-                return engineType;
-            }
-        }
-        throw new IllegalArgumentException("Invalid value: " + value);
-    }
-}

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java

@@ -2,7 +2,6 @@ package com.tencent.supersonic.headless.chat.corrector;
 
 import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
@@ -41,8 +40,7 @@ public class SelectCorrector extends BaseSemanticCorrector {
             return;
         }
         correctS2SQL = addFieldsToSelect(chatQueryContext, semanticParseInfo, correctS2SQL);
-        String querySql = SqlReplaceHelper.dealAliasToOrderBy(correctS2SQL);
-        semanticParseInfo.getSqlInfo().setCorrectedS2SQL(querySql);
+        semanticParseInfo.getSqlInfo().setCorrectedS2SQL(correctS2SQL);
     }
 
     protected String addFieldsToSelect(

headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.adaptor.db;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 
 import java.util.HashMap;
 import java.util.Map;

headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/AbstractAccelerator.java

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.headless.core.executor;
 
+import com.tencent.supersonic.common.calcite.Configuration;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.core.pojo.Materialization;
-import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.TimeRange;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.DataSourceTable;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.DataSourceTable.Builder;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/DefaultSemanticTranslator.java

@@ -1,6 +1,8 @@
 package com.tencent.supersonic.headless.core.translator;
 
+import com.tencent.supersonic.common.calcite.SqlMergeWithUtils;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.common.util.StringUtil;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
@@ -8,6 +10,7 @@ import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
 import com.tencent.supersonic.headless.core.pojo.DataSetQueryParam;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.SemanticModel;
 import com.tencent.supersonic.headless.core.translator.converter.QueryConverter;
 import com.tencent.supersonic.headless.core.utils.ComponentFactory;
 import lombok.extern.slf4j.Slf4j;
@@ -81,6 +84,8 @@ public class DefaultSemanticTranslator implements SemanticTranslator {
     public QueryStatement doParse(
             DataSetQueryParam dataSetQueryParam, QueryStatement queryStatement) {
         log.info("parse dataSetQuery [{}] ", dataSetQueryParam);
+        SemanticModel semanticModel = queryStatement.getSemanticModel();
+        EngineType engineType = EngineType.fromString(semanticModel.getDatabase().getType());
         try {
             if (!CollectionUtils.isEmpty(dataSetQueryParam.getTables())) {
                 List<String[]> tables = new ArrayList<>();
@@ -99,13 +104,16 @@ public class DefaultSemanticTranslator implements SemanticTranslator {
                 if (!tables.isEmpty()) {
                     String sql;
                     if (dataSetQueryParam.isSupportWith()) {
+                        List<String> parentWithNameList =
+                                tables.stream().map(table -> table[0]).collect(Collectors.toList());
+                        List<String> parentSqlList =
+                                tables.stream().map(table -> table[1]).collect(Collectors.toList());
                         sql =
-                                "with "
-                                        + tables.stream()
-                                                .map(t -> String.format("%s as (%s)", t[0], t[1]))
-                                                .collect(Collectors.joining(","))
-                                        + "\n"
-                                        + dataSetQueryParam.getSql();
+                                SqlMergeWithUtils.mergeWith(
+                                        engineType,
+                                        dataSetQueryParam.getSql(),
+                                        parentSqlList,
+                                        parentWithNameList);
                     } else {
                         sql = dataSetQueryParam.getSql();
                         for (String[] tb : tables) {

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/CalciteQueryParser.java

@@ -1,7 +1,8 @@
 package com.tencent.supersonic.headless.core.translator.calcite;
 
+import com.tencent.supersonic.common.calcite.SqlMergeWithUtils;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.translator.QueryParser;
@@ -10,8 +11,10 @@ import com.tencent.supersonic.headless.core.translator.calcite.s2sql.SemanticMod
 import com.tencent.supersonic.headless.core.translator.calcite.schema.RuntimeOptions;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.calcite.sql.parser.SqlParseException;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
 import java.util.Objects;
 
 /** the calcite parse implements */
@@ -31,8 +34,7 @@ public class CalciteQueryParser implements QueryParser {
         SemanticSchema semanticSchema = getSemanticSchema(semanticModel, queryStatement);
         AggPlanner aggBuilder = new AggPlanner(semanticSchema);
         aggBuilder.explain(queryStatement, isAgg);
-        EngineType engineType =
-                EngineType.fromString(semanticSchema.getSemanticModel().getDatabase().getType());
+        EngineType engineType = EngineType.fromString(semanticModel.getDatabase().getType());
         queryStatement.setSql(aggBuilder.getSql(engineType));
         if (Objects.nonNull(queryStatement.getEnableOptimize())
                 && queryStatement.getEnableOptimize()
@@ -42,6 +44,7 @@ public class CalciteQueryParser implements QueryParser {
             String simplifySql =
                     aggBuilder.simplify(
                             getSqlByDataSet(
+                                    engineType,
                                     aggBuilder.getSql(engineType),
                                     queryStatement.getDataSetSql(),
                                     queryStatement.getDataSetAlias()),
@@ -70,7 +73,13 @@ public class CalciteQueryParser implements QueryParser {
         return semanticSchema;
     }
 
-    private String getSqlByDataSet(String sql, String dataSetSql, String dataSetAlias) {
-        return String.format("with %s as (%s) %s", dataSetAlias, sql, dataSetSql);
+    private String getSqlByDataSet(
+            EngineType engineType, String parentSql, String dataSetSql, String parentAlias)
+            throws SqlParseException {
+        return SqlMergeWithUtils.mergeWith(
+                engineType,
+                dataSetSql,
+                Collections.singletonList(parentSql),
+                Collections.singletonList(parentAlias));
     }
 }

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/Configuration.java

@@ -1,161 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.calcite;
-
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSqlDialect;
-import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSqlTypeFactoryImpl;
-import com.tencent.supersonic.headless.core.translator.calcite.schema.ViewExpanderImpl;
-import com.tencent.supersonic.headless.core.utils.SqlDialectFactory;
-import org.apache.calcite.avatica.util.Casing;
-import org.apache.calcite.avatica.util.Quoting;
-import org.apache.calcite.config.CalciteConnectionConfig;
-import org.apache.calcite.config.CalciteConnectionConfigImpl;
-import org.apache.calcite.config.CalciteConnectionProperty;
-import org.apache.calcite.config.Lex;
-import org.apache.calcite.jdbc.CalciteSchema;
-import org.apache.calcite.plan.RelOptCluster;
-import org.apache.calcite.plan.RelOptPlanner;
-import org.apache.calcite.prepare.CalciteCatalogReader;
-import org.apache.calcite.prepare.Prepare;
-import org.apache.calcite.prepare.Prepare.CatalogReader;
-import org.apache.calcite.rel.hint.HintStrategyTable;
-import org.apache.calcite.rel.type.RelDataTypeFactory;
-import org.apache.calcite.rel.type.RelDataTypeSystem;
-import org.apache.calcite.rex.RexBuilder;
-import org.apache.calcite.sql.SqlOperatorTable;
-import org.apache.calcite.sql.advise.SqlAdvisor;
-import org.apache.calcite.sql.advise.SqlAdvisorValidator;
-import org.apache.calcite.sql.fun.SqlStdOperatorTable;
-import org.apache.calcite.sql.parser.SqlParser;
-import org.apache.calcite.sql.parser.impl.SqlParserImpl;
-import org.apache.calcite.sql.util.ChainedSqlOperatorTable;
-import org.apache.calcite.sql.validate.SqlValidator;
-import org.apache.calcite.sql.validate.SqlValidatorScope;
-import org.apache.calcite.sql.validate.SqlValidatorUtil;
-import org.apache.calcite.sql.validate.SqlValidatorWithHints;
-import org.apache.calcite.sql2rel.SqlToRelConverter;
-import org.apache.calcite.tools.FrameworkConfig;
-import org.apache.calcite.tools.Frameworks;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-/** global configuration of the calcite */
-public class Configuration {
-
-    public static Properties configProperties = new Properties();
-    public static RelDataTypeFactory typeFactory =
-            new SemanticSqlTypeFactoryImpl(RelDataTypeSystem.DEFAULT);
-    public static SqlOperatorTable operatorTable = SqlStdOperatorTable.instance();
-    public static CalciteConnectionConfig config =
-            new CalciteConnectionConfigImpl(configProperties);
-
-    public static SqlValidator.Config getValidatorConfig(EngineType engineType) {
-        SemanticSqlDialect sqlDialect = SqlDialectFactory.getSqlDialect(engineType);
-        return SqlValidator.Config.DEFAULT
-                .withConformance(sqlDialect.getConformance())
-                .withDefaultNullCollation(config.defaultNullCollation())
-                .withLenientOperatorLookup(true);
-    }
-
-    static {
-        configProperties.put(
-                CalciteConnectionProperty.CASE_SENSITIVE.camelName(), Boolean.TRUE.toString());
-        configProperties.put(
-                CalciteConnectionProperty.UNQUOTED_CASING.camelName(), Casing.UNCHANGED.toString());
-        configProperties.put(
-                CalciteConnectionProperty.QUOTED_CASING.camelName(), Casing.TO_LOWER.toString());
-    }
-
-    public static SqlParser.Config getParserConfig(EngineType engineType) {
-        CalciteConnectionConfig config = new CalciteConnectionConfigImpl(configProperties);
-        SemanticSqlDialect sqlDialect = SqlDialectFactory.getSqlDialect(engineType);
-
-        SqlParser.ConfigBuilder parserConfig = SqlParser.configBuilder();
-        parserConfig.setCaseSensitive(config.caseSensitive());
-        parserConfig.setUnquotedCasing(config.unquotedCasing());
-        parserConfig.setQuotedCasing(config.quotedCasing());
-        parserConfig.setConformance(config.conformance());
-        parserConfig.setLex(Lex.BIG_QUERY);
-        parserConfig
-                .setParserFactory(SqlParserImpl.FACTORY)
-                .setCaseSensitive(false)
-                .setIdentifierMaxLength(Integer.MAX_VALUE)
-                .setQuoting(Quoting.BACK_TICK)
-                .setQuoting(Quoting.SINGLE_QUOTE)
-                .setQuotedCasing(Casing.TO_UPPER)
-                .setUnquotedCasing(Casing.TO_UPPER)
-                .setConformance(sqlDialect.getConformance())
-                .setLex(Lex.BIG_QUERY);
-        parserConfig = parserConfig.setQuotedCasing(Casing.UNCHANGED);
-        parserConfig = parserConfig.setUnquotedCasing(Casing.UNCHANGED);
-        return parserConfig.build();
-    }
-
-    public static SqlValidator getSqlValidator(CalciteSchema rootSchema, EngineType engineType) {
-        List<SqlOperatorTable> tables = new ArrayList<>();
-        tables.add(SqlStdOperatorTable.instance());
-        SqlOperatorTable operatorTable = new ChainedSqlOperatorTable(tables);
-        // operatorTable.
-        Prepare.CatalogReader catalogReader =
-                new CalciteCatalogReader(
-                        rootSchema,
-                        Collections.singletonList(rootSchema.getName()),
-                        typeFactory,
-                        config);
-        return SqlValidatorUtil.newValidator(
-                operatorTable,
-                catalogReader,
-                typeFactory,
-                Configuration.getValidatorConfig(engineType));
-    }
-
-    public static SqlValidatorWithHints getSqlValidatorWithHints(
-            CalciteSchema rootSchema, EngineType engineTyp) {
-        return new SqlAdvisorValidator(
-                SqlStdOperatorTable.instance(),
-                new CalciteCatalogReader(
-                        rootSchema,
-                        Collections.singletonList(rootSchema.getName()),
-                        typeFactory,
-                        config),
-                typeFactory,
-                SqlValidator.Config.DEFAULT);
-    }
-
-    public static SqlToRelConverter.Config getConverterConfig() {
-        HintStrategyTable strategies = HintStrategyTable.builder().build();
-        return SqlToRelConverter.config()
-                .withHintStrategyTable(strategies)
-                .withTrimUnusedFields(true)
-                .withExpand(true)
-                .addRelBuilderConfigTransform(c -> c.withSimplify(false));
-    }
-
-    public static SqlToRelConverter getSqlToRelConverter(
-            SqlValidatorScope scope,
-            SqlValidator sqlValidator,
-            RelOptPlanner relOptPlanner,
-            EngineType engineType) {
-        RexBuilder rexBuilder = new RexBuilder(typeFactory);
-        RelOptCluster cluster = RelOptCluster.create(relOptPlanner, rexBuilder);
-        FrameworkConfig fromworkConfig =
-                Frameworks.newConfigBuilder()
-                        .parserConfig(getParserConfig(engineType))
-                        .defaultSchema(
-                                scope.getValidator().getCatalogReader().getRootSchema().plus())
-                        .build();
-        return new SqlToRelConverter(
-                new ViewExpanderImpl(),
-                sqlValidator,
-                (CatalogReader) scope.getValidator().getCatalogReader(),
-                cluster,
-                fromworkConfig.getConvertletTable(),
-                getConverterConfig());
-    }
-
-    public static SqlAdvisor getSqlAdvisor(SqlValidatorWithHints validator, EngineType engineType) {
-        return new SqlAdvisor(validator, getParserConfig(engineType));
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/planner/AggPlanner.java

@@ -1,11 +1,11 @@
 package com.tencent.supersonic.headless.core.translator.calcite.planner;
 
+import com.tencent.supersonic.common.calcite.Configuration;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.Database;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.SchemaBuilder;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/planner/Planner.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.translator.calcite.planner;
 
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 
 /** parse and generate SQL and other execute information */

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/schema/SchemaBuilder.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
+import com.tencent.supersonic.common.calcite.Configuration;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.translator.calcite.sql.S2SQLSqlValidatorImpl;
 import org.apache.calcite.jdbc.CalciteSchema;
 import org.apache.calcite.prepare.CalciteCatalogReader;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/schema/SemanticSqlConformance.java

@@ -1,164 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.calcite.schema;
-
-import org.apache.calcite.sql.fun.SqlLibrary;
-import org.apache.calcite.sql.validate.SqlConformance;
-import org.apache.calcite.sql.validate.SqlConformanceEnum;
-
-/** customize the SqlConformance */
-public class SemanticSqlConformance implements SqlConformance {
-
-    @Override
-    public boolean isLiberal() {
-        return SqlConformanceEnum.BIG_QUERY.isLiberal();
-    }
-
-    @Override
-    public boolean allowCharLiteralAlias() {
-        return SqlConformanceEnum.BIG_QUERY.allowCharLiteralAlias();
-    }
-
-    @Override
-    public boolean isGroupByAlias() {
-        return SqlConformanceEnum.BIG_QUERY.isGroupByAlias();
-    }
-
-    @Override
-    public boolean isGroupByOrdinal() {
-        return SqlConformanceEnum.BIG_QUERY.isGroupByOrdinal();
-    }
-
-    @Override
-    public boolean isHavingAlias() {
-        return false;
-    }
-
-    @Override
-    public boolean isSortByOrdinal() {
-        return SqlConformanceEnum.BIG_QUERY.isSortByOrdinal();
-    }
-
-    @Override
-    public boolean isSortByAlias() {
-        return SqlConformanceEnum.BIG_QUERY.isSortByAlias();
-    }
-
-    @Override
-    public boolean isSortByAliasObscures() {
-        return SqlConformanceEnum.BIG_QUERY.isSortByAliasObscures();
-    }
-
-    @Override
-    public boolean isFromRequired() {
-        return SqlConformanceEnum.BIG_QUERY.isFromRequired();
-    }
-
-    @Override
-    public boolean splitQuotedTableName() {
-        return SqlConformanceEnum.BIG_QUERY.splitQuotedTableName();
-    }
-
-    @Override
-    public boolean allowHyphenInUnquotedTableName() {
-        return SqlConformanceEnum.BIG_QUERY.allowHyphenInUnquotedTableName();
-    }
-
-    @Override
-    public boolean isBangEqualAllowed() {
-        return SqlConformanceEnum.BIG_QUERY.isBangEqualAllowed();
-    }
-
-    @Override
-    public boolean isPercentRemainderAllowed() {
-        return SqlConformanceEnum.BIG_QUERY.isPercentRemainderAllowed();
-    }
-
-    @Override
-    public boolean isMinusAllowed() {
-        return SqlConformanceEnum.BIG_QUERY.isMinusAllowed();
-    }
-
-    @Override
-    public boolean isRegexReplaceCaptureGroupDollarIndexed() {
-        return SqlConformanceEnum.BIG_QUERY.isRegexReplaceCaptureGroupDollarIndexed();
-    }
-
-    @Override
-    public boolean isApplyAllowed() {
-        return SqlConformanceEnum.BIG_QUERY.isApplyAllowed();
-    }
-
-    @Override
-    public boolean isInsertSubsetColumnsAllowed() {
-        return SqlConformanceEnum.BIG_QUERY.isInsertSubsetColumnsAllowed();
-    }
-
-    @Override
-    public boolean allowAliasUnnestItems() {
-        return SqlConformanceEnum.BIG_QUERY.allowAliasUnnestItems();
-    }
-
-    @Override
-    public boolean allowNiladicParentheses() {
-        return SqlConformanceEnum.BIG_QUERY.allowNiladicParentheses();
-    }
-
-    @Override
-    public boolean allowExplicitRowValueConstructor() {
-        return SqlConformanceEnum.BIG_QUERY.allowExplicitRowValueConstructor();
-    }
-
-    @Override
-    public boolean allowExtend() {
-        return SqlConformanceEnum.BIG_QUERY.allowExtend();
-    }
-
-    @Override
-    public boolean isLimitStartCountAllowed() {
-        return true;
-    }
-
-    @Override
-    public boolean isOffsetLimitAllowed() {
-        return false;
-    }
-
-    @Override
-    public boolean allowGeometry() {
-        return SqlConformanceEnum.BIG_QUERY.allowGeometry();
-    }
-
-    @Override
-    public boolean shouldConvertRaggedUnionTypesToVarying() {
-        return SqlConformanceEnum.BIG_QUERY.shouldConvertRaggedUnionTypesToVarying();
-    }
-
-    @Override
-    public boolean allowExtendedTrim() {
-        return SqlConformanceEnum.BIG_QUERY.allowExtendedTrim();
-    }
-
-    @Override
-    public boolean allowPluralTimeUnits() {
-        return SqlConformanceEnum.BIG_QUERY.allowPluralTimeUnits();
-    }
-
-    @Override
-    public boolean allowQualifyingCommonColumn() {
-        return SqlConformanceEnum.BIG_QUERY.allowQualifyingCommonColumn();
-    }
-
-    @Override
-    public boolean isValueAllowed() {
-        return false;
-    }
-
-    @Override
-    public SqlLibrary semantics() {
-        return SqlConformanceEnum.BIG_QUERY.semantics();
-    }
-
-    @Override
-    public boolean allowLenientCoercion() {
-        return false;
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/schema/SemanticSqlDialect.java

@@ -1,84 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.calcite.schema;
-
-import com.google.common.base.Preconditions;
-import org.apache.calcite.sql.SqlDialect;
-import org.apache.calcite.sql.SqlIntervalLiteral;
-import org.apache.calcite.sql.SqlNode;
-import org.apache.calcite.sql.SqlWriter;
-import org.apache.calcite.sql.validate.SqlConformance;
-import org.checkerframework.checker.nullness.qual.Nullable;
-
-/** customize the SqlDialect */
-public class SemanticSqlDialect extends SqlDialect {
-
-    private static final SqlConformance tagTdwSqlConformance = new SemanticSqlConformance();
-
-    public SemanticSqlDialect(Context context) {
-        super(context);
-    }
-
-    public static void unparseFetchUsingAnsi(
-            SqlWriter writer, @Nullable SqlNode offset, @Nullable SqlNode fetch) {
-        Preconditions.checkArgument(fetch != null || offset != null);
-        SqlWriter.Frame fetchFrame;
-        writer.newlineAndIndent();
-        fetchFrame = writer.startList(SqlWriter.FrameTypeEnum.OFFSET);
-        writer.keyword("LIMIT");
-        boolean hasOffset = false;
-        if (offset != null) {
-            offset.unparse(writer, -1, -1);
-            hasOffset = true;
-        }
-
-        if (fetch != null) {
-            if (hasOffset) {
-                writer.keyword(",");
-            }
-            fetch.unparse(writer, -1, -1);
-        }
-
-        writer.endList(fetchFrame);
-    }
-
-    @Override
-    public void quoteStringLiteralUnicode(StringBuilder buf, String val) {
-        buf.append("'");
-        buf.append(val);
-        buf.append("'");
-    }
-
-    @Override
-    public void quoteStringLiteral(StringBuilder buf, String charsetName, String val) {
-        buf.append(literalQuoteString);
-        buf.append(val.replace(literalEndQuoteString, literalEscapedQuote));
-        buf.append(literalEndQuoteString);
-    }
-
-    @Override
-    public boolean supportsCharSet() {
-        return false;
-    }
-
-    @Override
-    public boolean requiresAliasForFromItems() {
-        return true;
-    }
-
-    @Override
-    public SqlConformance getConformance() {
-        // mysql_5
-        return tagTdwSqlConformance;
-    }
-
-    public boolean supportsGroupByWithCube() {
-        return true;
-    }
-
-    public void unparseSqlIntervalLiteral(
-            SqlWriter writer, SqlIntervalLiteral literal, int leftPrec, int rightPrec) {}
-
-    public void unparseOffsetFetch(
-            SqlWriter writer, @Nullable SqlNode offset, @Nullable SqlNode fetch) {
-        unparseFetchUsingAnsi(writer, offset, fetch);
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/schema/SemanticSqlTypeFactoryImpl.java

@@ -1,19 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.calcite.schema;
-
-import org.apache.calcite.rel.type.RelDataTypeSystem;
-import org.apache.calcite.sql.type.SqlTypeFactoryImpl;
-
-import java.nio.charset.Charset;
-
-/** customize the SqlTypeFactoryImpl */
-public class SemanticSqlTypeFactoryImpl extends SqlTypeFactoryImpl {
-
-    public SemanticSqlTypeFactoryImpl(RelDataTypeSystem typeSystem) {
-        super(typeSystem);
-    }
-
-    @Override
-    public Charset getDefaultCharset() {
-        return Charset.forName("UTF8");
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/schema/ViewExpanderImpl.java

@@ -1,21 +0,0 @@
-package com.tencent.supersonic.headless.core.translator.calcite.schema;
-
-import org.apache.calcite.plan.RelOptTable;
-import org.apache.calcite.rel.RelRoot;
-import org.apache.calcite.rel.type.RelDataType;
-
-import java.util.List;
-
-/** customize the ViewExpander */
-public class ViewExpanderImpl implements RelOptTable.ViewExpander {
-    public ViewExpanderImpl() {}
-
-    @Override
-    public RelRoot expandView(
-            RelDataType rowType,
-            String queryString,
-            List<String> schemaPath,
-            List<String> dataSetPath) {
-        return null;
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/Renderer.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/AggFunctionNode.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidatorScope;
 

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/DataSourceNode.java

@@ -1,10 +1,10 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
 import com.google.common.collect.Lists;
+import com.tencent.supersonic.common.calcite.Configuration;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
-import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/DimensionNode.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;
 import org.apache.calcite.sql.SqlNode;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/IdentifyNode.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Identify;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidatorScope;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/MeasureNode.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Measure;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidatorScope;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/MetricNode.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
 import lombok.Data;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/node/SemanticNode.java

@@ -1,12 +1,12 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
+import com.tencent.supersonic.common.calcite.Configuration;
+import com.tencent.supersonic.common.calcite.SemanticSqlDialect;
+import com.tencent.supersonic.common.calcite.SqlDialectFactory;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSqlDialect;
 import com.tencent.supersonic.headless.core.translator.calcite.sql.optimizer.FilterToGroupScanRule;
-import com.tencent.supersonic.headless.core.utils.SqlDialectFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.plan.RelOptPlanner;
 import org.apache.calcite.plan.hep.HepPlanner;
@@ -31,7 +31,6 @@ import org.apache.calcite.sql.SqlWriterConfig;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
 import org.apache.calcite.sql.parser.SqlParser;
 import org.apache.calcite.sql.parser.SqlParserPos;
-import org.apache.calcite.sql.pretty.SqlPrettyWriter;
 import org.apache.calcite.sql.validate.SqlValidator;
 import org.apache.calcite.sql.validate.SqlValidatorScope;
 import org.apache.calcite.sql.validate.SqlValidatorWithHints;
@@ -102,7 +101,7 @@ public abstract class SemanticNode {
 
     public static String getSql(SqlNode sqlNode, EngineType engineType) {
         UnaryOperator<SqlWriterConfig> sqlWriterConfigUnaryOperator =
-                (c) -> getSqlWriterConfig(engineType);
+                (c) -> Configuration.getSqlWriterConfig(engineType);
         return sqlNode.toSqlString(sqlWriterConfigUnaryOperator).getSql();
     }
 
@@ -184,24 +183,6 @@ public abstract class SemanticNode {
         return sqlNode;
     }
 
-    private static SqlWriterConfig getSqlWriterConfig(EngineType engineType) {
-        SemanticSqlDialect sqlDialect = SqlDialectFactory.getSqlDialect(engineType);
-        SqlWriterConfig config =
-                SqlPrettyWriter.config()
-                        .withDialect(sqlDialect)
-                        .withKeywordsLowerCase(false)
-                        .withClauseEndsLine(true)
-                        .withAlwaysUseParentheses(false)
-                        .withSelectListItemsOnSeparateLines(false)
-                        .withUpdateSetListNewline(false)
-                        .withIndentation(0);
-        if (EngineType.MYSQL.equals(engineType)) {
-            // no backticks around function name
-            config = config.withQuoteAllIdentifiers(false);
-        }
-        return config;
-    }
-
     private static void sqlVisit(SqlNode sqlNode, Map<String, Object> parseInfo) {
         SqlKind kind = sqlNode.getKind();
         switch (kind) {

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/render/FilterRender.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/render/JoinRender.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/render/OutputRender.java

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
 import com.tencent.supersonic.common.pojo.ColumnOrder;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/calcite/sql/render/SourceRender.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
 import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/converter/CalculateAggConverter.java

@@ -3,12 +3,12 @@ package com.tencent.supersonic.headless.core.translator.converter;
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.pojo.enums.DatePeriodEnum;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.DataSetQueryParam;
 import com.tencent.supersonic.headless.core.pojo.Database;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;

headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlDialectFactory.java

@@ -1,50 +0,0 @@
-package com.tencent.supersonic.headless.core.utils;
-
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSqlDialect;
-import org.apache.calcite.avatica.util.Casing;
-import org.apache.calcite.sql.SqlDialect;
-import org.apache.calcite.sql.SqlDialect.Context;
-import org.apache.calcite.sql.SqlDialect.DatabaseProduct;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-public class SqlDialectFactory {
-
-    public static final Context DEFAULT_CONTEXT =
-            SqlDialect.EMPTY_CONTEXT
-                    .withDatabaseProduct(DatabaseProduct.BIG_QUERY)
-                    .withLiteralQuoteString("'")
-                    .withLiteralEscapedQuoteString("''")
-                    .withIdentifierQuoteString("`")
-                    .withUnquotedCasing(Casing.UNCHANGED)
-                    .withQuotedCasing(Casing.UNCHANGED)
-                    .withCaseSensitive(false);
-    public static final Context POSTGRESQL_CONTEXT =
-            SqlDialect.EMPTY_CONTEXT
-                    .withDatabaseProduct(DatabaseProduct.BIG_QUERY)
-                    .withLiteralQuoteString("'")
-                    .withLiteralEscapedQuoteString("''")
-                    .withUnquotedCasing(Casing.UNCHANGED)
-                    .withQuotedCasing(Casing.UNCHANGED)
-                    .withCaseSensitive(false);
-    private static Map<EngineType, SemanticSqlDialect> sqlDialectMap;
-
-    static {
-        sqlDialectMap = new HashMap<>();
-        sqlDialectMap.put(EngineType.CLICKHOUSE, new SemanticSqlDialect(DEFAULT_CONTEXT));
-        sqlDialectMap.put(EngineType.MYSQL, new SemanticSqlDialect(DEFAULT_CONTEXT));
-        sqlDialectMap.put(EngineType.H2, new SemanticSqlDialect(DEFAULT_CONTEXT));
-        sqlDialectMap.put(EngineType.POSTGRESQL, new SemanticSqlDialect(POSTGRESQL_CONTEXT));
-    }
-
-    public static SemanticSqlDialect getSqlDialect(EngineType engineType) {
-        SemanticSqlDialect semanticSqlDialect = sqlDialectMap.get(engineType);
-        if (Objects.isNull(semanticSqlDialect)) {
-            return new SemanticSqlDialect(DEFAULT_CONTEXT);
-        }
-        return semanticSqlDialect;
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java

@@ -6,6 +6,7 @@ import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.ItemDateResp;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.util.DateModeUtils;
 import com.tencent.supersonic.common.util.SqlFilterUtils;
@@ -13,7 +14,6 @@ import com.tencent.supersonic.common.util.StringUtil;
 import com.tencent.supersonic.headless.api.pojo.Measure;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType;
 import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;
 import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp;

headless/server/src/main/java/com/tencent/supersonic/headless/server/pojo/DbParameterFactory.java

@@ -1,6 +1,6 @@
 package com.tencent.supersonic.headless.server.pojo;
 
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

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

@@ -4,8 +4,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.QueryColumn;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.DBColumn;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq;
 import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq;
 import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;

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

@@ -275,6 +275,7 @@ public class ModelConverter {
                 continue;
             }
             // Compatible with front-end tmp
+
             String oriFieldName =
                     measure.getBizName().replaceFirst(modelReq.getBizName() + "_", "");
             measure.setExpr(oriFieldName);

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

@@ -6,6 +6,7 @@ import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.common.pojo.enums.QueryType;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.headless.api.pojo.Measure;
@@ -13,7 +14,6 @@ import com.tencent.supersonic.headless.api.pojo.MetricTable;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.SchemaItem;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.enums.MetricType;
 import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq;
 import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq;

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

@@ -1,8 +1,8 @@
 package com.tencent.supersonic.headless.server.calcite;
 
 import com.tencent.supersonic.common.pojo.ColumnOrder;
+import com.tencent.supersonic.common.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.api.pojo.response.SqlParserResp;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;