(improvement)(headless)Refactor headless to abstract SemanticTranslator explicitly.

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

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.core.executor.accelerator;
+package com.tencent.supersonic.headless.core.executor;
 
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
-import com.tencent.supersonic.headless.core.parser.calcite.Configuration;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.TimeRange;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.DataSourceTable;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.DataSourceTable.Builder;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SchemaBuilder;
+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;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SchemaBuilder;
 import com.tencent.supersonic.headless.core.pojo.Materialization;
 import java.util.Arrays;
 import java.util.HashSet;

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

@@ -4,11 +4,14 @@ import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.pojo.Database;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
+import com.tencent.supersonic.headless.core.utils.ComponentFactory;
 import com.tencent.supersonic.headless.core.utils.SqlUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Component;
 
+import java.util.Objects;
+
 @Component("JdbcExecutor")
 @Slf4j
 public class JdbcExecutor implements QueryExecutor {
@@ -19,6 +22,17 @@ public class JdbcExecutor implements QueryExecutor {
 
     @Override
     public SemanticQueryResp execute(QueryStatement queryStatement) {
+        // accelerate query if possible
+        for (QueryAccelerator queryAccelerator : ComponentFactory.getQueryAccelerators()) {
+            if (queryAccelerator.check(queryStatement)) {
+                SemanticQueryResp semanticQueryResp = queryAccelerator.query(queryStatement);
+                if (Objects.nonNull(semanticQueryResp) && !semanticQueryResp.getResultList().isEmpty()) {
+                    log.info("query by Accelerator {}", queryAccelerator.getClass().getSimpleName());
+                    return semanticQueryResp;
+                }
+            }
+        }
+
         SqlUtils sqlUtils = ContextUtils.getBean(SqlUtils.class);
         if (Strings.isEmpty(queryStatement.getSourceId())) {
             log.warn("data base id is empty");

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.executor.accelerator;
+package com.tencent.supersonic.headless.core.executor;
 
 import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;

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

@@ -4,7 +4,7 @@ import com.tencent.supersonic.headless.api.pojo.response.SemanticQueryResp;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 
 /**
- * Query data or execute sql from a query engine
+ * QueryExecutor submits SQL to the database engine and performs acceleration if necessary.
  */
 public interface QueryExecutor {
 

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/QueryParser.java

@@ -1,12 +0,0 @@
-package com.tencent.supersonic.headless.core.parser;
-
-import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-
-/**
- * A query parser takes semantic query request and generates SQL to be executed.
- */
-public interface QueryParser {
-
-    void parse(QueryStatement queryStatement) throws Exception;
-
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/SqlParser.java

@@ -1,9 +0,0 @@
-package com.tencent.supersonic.headless.core.parser;
-
-import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-
-public interface SqlParser {
-
-    QueryStatement explain(QueryStatement queryStatement, AggOption aggOption) throws Exception;
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/schema/SemanticItem.java

@@ -1,6 +0,0 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
-
-public interface SemanticItem {
-
-    public String getName();
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/calcite/sql/Optimization.java

@@ -1,10 +0,0 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql;
-
-
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-
-
-public interface Optimization {
-
-    public void visit(SemanticSchema semanticSchema);
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/DefaultQueryPlanner.java

@@ -1,43 +0,0 @@
-package com.tencent.supersonic.headless.core.planner;
-
-import com.tencent.supersonic.headless.core.executor.QueryExecutor;
-import com.tencent.supersonic.headless.core.executor.accelerator.QueryAccelerator;
-import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-import com.tencent.supersonic.headless.core.utils.ComponentFactory;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class DefaultQueryPlanner implements QueryPlanner {
-
-    public QueryExecutor plan(QueryStatement queryStatement) {
-        optimize(queryStatement);
-        return route(queryStatement);
-    }
-
-    private void optimize(QueryStatement queryStatement) {
-        for (QueryOptimizer queryOptimizer : ComponentFactory.getQueryOptimizers()) {
-            queryOptimizer.rewrite(queryStatement);
-        }
-    }
-
-    public QueryExecutor route(QueryStatement queryStatement) {
-        for (QueryExecutor queryExecutor : ComponentFactory.getQueryExecutors()) {
-            if (queryExecutor.accept(queryStatement)) {
-                return queryExecutor;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public QueryAccelerator accelerate(QueryStatement queryStatement) {
-        for (QueryAccelerator queryAccelerator : ComponentFactory.getQueryAccelerators()) {
-            if (queryAccelerator.check(queryStatement)) {
-                return queryAccelerator;
-            }
-        }
-        return null;
-    }
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/QueryOptimizer.java

@@ -1,10 +0,0 @@
-package com.tencent.supersonic.headless.core.planner;
-
-import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-
-/**
- * A query optimizer rewrites QueryStatement with a set of optimization rules
- */
-public interface QueryOptimizer {
-    void rewrite(QueryStatement queryStatement);
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/planner/QueryPlanner.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.headless.core.planner;
-
-import com.tencent.supersonic.headless.core.executor.QueryExecutor;
-import com.tencent.supersonic.headless.core.executor.accelerator.QueryAccelerator;
-import com.tencent.supersonic.headless.core.pojo.QueryStatement;
-
-/**
- * A query planner takes parsed QueryStatement and generates an optimized execution plan.
- * It interacts with the optimizer to determine the most efficient way to execute the query.
- */
-public interface QueryPlanner {
-    QueryExecutor plan(QueryStatement queryStatement);
-
-    QueryExecutor route(QueryStatement queryStatement);
-
-    QueryAccelerator accelerate(QueryStatement queryStatement);
-}

headless/core/src/main/java/com/tencent/supersonic/headless/core/pojo/QueryStatement.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.pojo;
 
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.SemanticModel;
 import lombok.Data;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Triple;

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

@@ -1,19 +1,18 @@
-package com.tencent.supersonic.headless.core.parser;
+package com.tencent.supersonic.headless.core.translator;
 
 import com.google.common.base.Strings;
-import com.tencent.supersonic.common.util.StringUtil;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
+import com.tencent.supersonic.common.util.StringUtil;
 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.core.parser.converter.HeadlessConverter;
 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.converter.QueryConverter;
 import com.tencent.supersonic.headless.core.utils.ComponentFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
@@ -24,8 +23,23 @@ import java.util.stream.Collectors;
 
 @Component
 @Slf4j
-@Primary
-public class DefaultQueryParser implements QueryParser {
+public class DefaultSemanticTranslator implements SemanticTranslator {
+
+    public void translate(QueryStatement queryStatement) {
+        try {
+            parse(queryStatement);
+            optimize(queryStatement);
+            queryStatement.setOk(true);
+        } catch (Exception e) {
+            queryStatement.setOk(false);
+        }
+    }
+
+    public void optimize(QueryStatement queryStatement) {
+        for (QueryOptimizer queryOptimizer : ComponentFactory.getQueryOptimizers()) {
+            queryOptimizer.rewrite(queryStatement);
+        }
+    }
 
     public void parse(QueryStatement queryStatement) throws Exception {
         QueryParam queryParam = queryStatement.getQueryParam();
@@ -36,7 +50,7 @@ public class DefaultQueryParser implements QueryParser {
             queryStatement.setMetricQueryParam(new MetricQueryParam());
         }
         log.debug("SemanticConverter before [{}]", queryParam);
-        for (HeadlessConverter headlessConverter : ComponentFactory.getSemanticConverters()) {
+        for (QueryConverter headlessConverter : ComponentFactory.getQueryConverters()) {
             if (headlessConverter.accept(queryStatement)) {
                 log.info("SemanticConverter accept [{}]", headlessConverter.getClass().getName());
                 headlessConverter.convert(queryStatement);
@@ -45,10 +59,10 @@ public class DefaultQueryParser implements QueryParser {
         log.debug("SemanticConverter after {} {} {}", queryParam, queryStatement.getDataSetQueryParam(),
                 queryStatement.getMetricQueryParam());
         if (!queryStatement.getDataSetQueryParam().getSql().isEmpty()) {
-            queryStatement = parser(queryStatement.getDataSetQueryParam(), queryStatement);
+            doParse(queryStatement.getDataSetQueryParam(), queryStatement);
         } else {
             queryStatement.getMetricQueryParam().setNativeQuery(queryParam.getQueryType().isNativeAggQuery());
-            queryStatement = parser(queryStatement);
+            doParse(queryStatement);
         }
         if (Strings.isNullOrEmpty(queryStatement.getSql())
                 || Strings.isNullOrEmpty(queryStatement.getSourceId())) {
@@ -61,14 +75,15 @@ public class DefaultQueryParser implements QueryParser {
         }
     }
 
-    public QueryStatement parser(DataSetQueryParam dataSetQueryParam, QueryStatement queryStatement) {
+    public QueryStatement doParse(DataSetQueryParam dataSetQueryParam, QueryStatement queryStatement) {
         log.info("parser MetricReq [{}] ", dataSetQueryParam);
         try {
             if (!CollectionUtils.isEmpty(dataSetQueryParam.getTables())) {
                 List<String[]> tables = new ArrayList<>();
                 boolean isSingleTable = dataSetQueryParam.getTables().size() == 1;
                 for (MetricTable metricTable : dataSetQueryParam.getTables()) {
-                    QueryStatement tableSql = parserSql(metricTable, isSingleTable, dataSetQueryParam, queryStatement);
+                    QueryStatement tableSql = parserSql(metricTable, isSingleTable,
+                            dataSetQueryParam, queryStatement);
                     if (isSingleTable && Objects.nonNull(tableSql.getDataSetQueryParam())
                             && !tableSql.getDataSetSimplifySql().isEmpty()) {
                         queryStatement.setSql(tableSql.getDataSetSimplifySql());
@@ -101,15 +116,16 @@ public class DefaultQueryParser implements QueryParser {
         return queryStatement;
     }
 
-    public QueryStatement parser(QueryStatement queryStatement) {
-        return parser(queryStatement, AggOption.getAggregation(queryStatement.getMetricQueryParam().isNativeQuery()));
+    public QueryStatement doParse(QueryStatement queryStatement) {
+        return doParse(queryStatement, AggOption.getAggregation(
+                queryStatement.getMetricQueryParam().isNativeQuery()));
     }
 
-    public QueryStatement parser(QueryStatement queryStatement, AggOption isAgg) {
+    public QueryStatement doParse(QueryStatement queryStatement, AggOption isAgg) {
         MetricQueryParam metricQueryParam = queryStatement.getMetricQueryParam();
         log.info("parser metricQueryReq [{}] isAgg [{}]", metricQueryParam, isAgg);
         try {
-            return ComponentFactory.getSqlParser().explain(queryStatement, isAgg);
+            ComponentFactory.getQueryParser().parse(queryStatement, isAgg);
         } catch (Exception e) {
             queryStatement.setErrMsg(e.getMessage());
             log.error("parser error metricQueryReq[{}] error [{}]", metricQueryParam, e);
@@ -118,8 +134,8 @@ public class DefaultQueryParser implements QueryParser {
     }
 
     private QueryStatement parserSql(MetricTable metricTable, Boolean isSingleMetricTable,
-            DataSetQueryParam dataSetQueryParam,
-            QueryStatement queryStatement) throws Exception {
+                                     DataSetQueryParam dataSetQueryParam,
+                                     QueryStatement queryStatement) throws Exception {
         MetricQueryParam metricReq = new MetricQueryParam();
         metricReq.setMetrics(metricTable.getMetrics());
         metricReq.setDimensions(metricTable.getDimensions());
@@ -136,7 +152,7 @@ public class DefaultQueryParser implements QueryParser {
             tableSql.setDataSetSql(dataSetQueryParam.getSql());
             tableSql.setDataSetAlias(metricTable.getAlias());
         }
-        tableSql = parser(tableSql, metricTable.getAggOption());
+        tableSql = doParse(tableSql, metricTable.getAggOption());
         if (!tableSql.isOk()) {
             throw new Exception(String.format("parser table [%s] error [%s]", metricTable.getAlias(),
                     tableSql.getErrMsg()));

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.planner;
+package com.tencent.supersonic.headless.core.translator;
 
 import com.google.common.base.Strings;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;

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

@@ -0,0 +1,11 @@
+package com.tencent.supersonic.headless.core.translator;
+
+import com.tencent.supersonic.headless.core.pojo.QueryStatement;
+
+/**
+ * A query optimizer rewrites physical SQL by following a set of
+ * optimization rules, trying to derive the most efficient query.
+ */
+public interface QueryOptimizer {
+    void rewrite(QueryStatement queryStatement);
+}

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

@@ -0,0 +1,11 @@
+package com.tencent.supersonic.headless.core.translator;
+
+import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
+import com.tencent.supersonic.headless.core.pojo.QueryStatement;
+
+/**
+ * A query parser generates physical SQL for the QueryStatement.
+ */
+public interface QueryParser {
+    void parse(QueryStatement queryStatement, AggOption aggOption) throws Exception;
+}

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

@@ -0,0 +1,13 @@
+package com.tencent.supersonic.headless.core.translator;
+
+import com.tencent.supersonic.headless.core.pojo.QueryStatement;
+
+/**
+ * SemanticTranslator converts semantic query statement into SQL statement that
+ * can be executed against physical data models.
+ */
+public interface SemanticTranslator {
+
+    void translate(QueryStatement queryStatement);
+
+}

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

@@ -1,13 +1,13 @@
-package com.tencent.supersonic.headless.core.parser.calcite;
+package com.tencent.supersonic.headless.core.translator.calcite;
 
 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.parser.SqlParser;
-import com.tencent.supersonic.headless.core.parser.calcite.planner.AggPlanner;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.RuntimeOptions;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.QueryParser;
+import com.tencent.supersonic.headless.core.translator.calcite.planner.AggPlanner;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.SemanticModel;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.RuntimeOptions;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -17,17 +17,17 @@ import java.util.Objects;
 /**
  * the calcite parse implements
  */
-@Component("CalciteSqlParser")
+@Component("CalciteQueryParser")
 @Slf4j
-public class CalciteSqlParser implements SqlParser {
+public class CalciteQueryParser implements QueryParser {
 
     @Override
-    public QueryStatement explain(QueryStatement queryStatement, AggOption isAgg) throws Exception {
+    public void parse(QueryStatement queryStatement, AggOption isAgg) throws Exception {
         MetricQueryParam metricReq = queryStatement.getMetricQueryParam();
         SemanticModel semanticModel = queryStatement.getSemanticModel();
         if (semanticModel == null) {
             queryStatement.setErrMsg("semanticSchema not found");
-            return queryStatement;
+            return;
         }
         queryStatement.setMetricQueryParam(metricReq);
         SemanticSchema semanticSchema = getSemanticSchema(semanticModel, queryStatement);
@@ -47,7 +47,6 @@ public class CalciteSqlParser implements SqlParser {
                 queryStatement.setDataSetSimplifySql(simplifySql);
             }
         }
-        return queryStatement;
     }
 
     private SemanticSchema getSemanticSchema(SemanticModel semanticModel, QueryStatement queryStatement) {

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

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.headless.core.parser.calcite;
+package com.tencent.supersonic.headless.core.translator.calcite;
 
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlDialect;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlTypeFactoryImpl;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.ViewExpanderImpl;
+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 java.util.ArrayList;
 import java.util.Collections;

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

@@ -1,20 +1,20 @@
-package com.tencent.supersonic.headless.core.parser.calcite.planner;
+package com.tencent.supersonic.headless.core.translator.calcite.planner;
 
 
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.parser.calcite.Configuration;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SchemaBuilder;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.Renderer;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.TableView;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.DataSourceNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.render.FilterRender;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.render.OutputRender;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.render.SourceRender;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SchemaBuilder;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.SemanticNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.render.FilterRender;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.render.OutputRender;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.render.SourceRender;
+import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.Renderer;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.TableView;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.DataSourceNode;
 import com.tencent.supersonic.headless.core.pojo.Database;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
@@ -24,6 +24,7 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Objects;
 import java.util.Stack;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.parser.SqlParser;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.planner;
+package com.tencent.supersonic.headless.core.translator.calcite.planner;
 
 
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 public class Constants {
 

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import lombok.Builder;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import java.util.Arrays;
 

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

@@ -1,9 +1,11 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticItem;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticItem;
+
 import java.util.List;
 import java.util.Map;
+
 import lombok.Builder;
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import lombok.Data;
 

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import java.util.List;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import java.util.List;
 import lombok.Builder;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticItem;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticItem;
 
 import java.util.List;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import java.util.List;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import com.tencent.supersonic.headless.core.pojo.Database;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.s2sql;
+package com.tencent.supersonic.headless.core.translator.calcite.s2sql;
 
 import lombok.Builder;
 import lombok.Data;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 
 import java.util.ArrayList;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 import lombok.Builder;
 import lombok.Data;

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

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

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

@@ -0,0 +1,6 @@
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
+
+public interface SemanticItem {
+
+    public String getName();
+}

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

@@ -1,12 +1,12 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Materialization;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.JoinRelation;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.SemanticModel;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Materialization;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.SemanticModel;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.JoinRelation;
 import org.apache.calcite.schema.Schema;
 import org.apache.calcite.schema.SchemaVersion;
 import org.apache.calcite.schema.Table;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 import org.apache.calcite.sql.fun.SqlLibrary;
 import org.apache.calcite.sql.validate.SqlConformance;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 import com.google.common.base.Preconditions;
 import org.apache.calcite.sql.SqlDialect;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 import java.nio.charset.Charset;
 import org.apache.calcite.rel.type.RelDataTypeSystem;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.schema;
+package com.tencent.supersonic.headless.core.translator.calcite.schema;
 
 import org.apache.calcite.plan.RelOptTable;
 import org.apache.calcite.rel.RelRoot;

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

@@ -0,0 +1,10 @@
+package com.tencent.supersonic.headless.core.translator.calcite.sql;
+
+
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+
+
+public interface Optimization {
+
+    public void visit(SemanticSchema semanticSchema);
+}

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

@@ -1,22 +1,23 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql;
+package com.tencent.supersonic.headless.core.translator.calcite.sql;
 
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
-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;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Measure;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Identify;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Measure;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.MeasureNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.MetricNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.SemanticNode;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import lombok.Data;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidatorScope;
@@ -48,7 +49,7 @@ public abstract class Renderer {
     }
 
     public static MetricNode buildMetricNode(String metric, DataSource datasource, SqlValidatorScope scope,
-            SemanticSchema schema, boolean nonAgg, String alias) throws Exception {
+                                             SemanticSchema schema, boolean nonAgg, String alias) throws Exception {
         Optional<Metric> metricOpt = getMetricByName(metric, schema);
         MetricNode metricNode = new MetricNode();
         EngineType engineType = EngineType.fromString(datasource.getType());

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql;
+package com.tencent.supersonic.headless.core.translator.calcite.sql;
 
 import org.apache.calcite.rel.type.RelDataTypeFactory;
 import org.apache.calcite.sql.SqlOperatorTable;

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql;
+package com.tencent.supersonic.headless.core.translator.calcite.sql;
 
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import java.util.Objects;

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

@@ -1,18 +1,18 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.parser.calcite.Configuration;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.JoinRelation;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Measure;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SchemaBuilder;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.extend.LateralViewExplodeNode;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Identify;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.JoinRelation;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Measure;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SchemaBuilder;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.extend.LateralViewExplodeNode;
+import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -25,6 +25,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.sql.SqlBasicCall;
 import org.apache.calcite.sql.SqlDataTypeSpec;
@@ -148,7 +149,7 @@ public class DataSourceNode extends SemanticNode {
     }
 
     public static void getQueryDimensionMeasure(SemanticSchema schema, MetricQueryParam metricCommand,
-            Set<String> queryDimension, List<String> measures) {
+                                                Set<String> queryDimension, List<String> measures) {
         queryDimension.addAll(metricCommand.getDimensions().stream()
                 .map(d -> d.contains(Constants.DIMENSION_IDENTIFY) ? d.split(Constants.DIMENSION_IDENTIFY)[1] : d)
                 .collect(Collectors.toSet()));

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

@@ -1,11 +1,13 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+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.parser.calcite.s2sql.Constants;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;
+
 import java.util.List;
 import java.util.Objects;
+
 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/ExtendNode.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
 import org.apache.calcite.sql.SqlCall;
 import org.apache.calcite.sql.SqlInternalOperator;

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
 import java.util.Set;
 import org.apache.calcite.sql.SqlBasicCall;

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

@@ -1,12 +1,13 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+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.parser.calcite.s2sql.Identify;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify.Type;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Identify;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
+
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidatorScope;
 
@@ -26,7 +27,7 @@ public class IdentifyNode extends SemanticNode {
         Optional<Identify> identify = identifies.stream().filter(i -> i.getName().equalsIgnoreCase(name))
                 .findFirst();
         if (identify.isPresent()) {
-            return Type.FOREIGN.name().equalsIgnoreCase(identify.get().getType());
+            return Identify.Type.FOREIGN.name().equalsIgnoreCase(identify.get().getType());
         }
         return false;
     }
@@ -35,7 +36,7 @@ public class IdentifyNode extends SemanticNode {
         Optional<Identify> identify = identifies.stream().filter(i -> i.getName().equalsIgnoreCase(name))
                 .findFirst();
         if (identify.isPresent()) {
-            return Type.PRIMARY.name().equalsIgnoreCase(identify.get().getType());
+            return Identify.Type.PRIMARY.name().equalsIgnoreCase(identify.get().getType());
         }
         return false;
     }

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.node;
 
 import lombok.Data;
 import org.apache.calcite.sql.SqlNode;

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

@@ -1,8 +1,8 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+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.parser.calcite.s2sql.Measure;
+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,12 +1,14 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+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.parser.calcite.s2sql.Metric;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+
 import lombok.Data;
 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/SemanticNode.java

@@ -1,12 +1,12 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node;
+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.parser.calcite.Configuration;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlDialect;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.optimizer.FilterToGroupScanRule;
+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.sql.optimizer.FilterToGroupScanRule;
+import com.tencent.supersonic.headless.core.translator.calcite.Configuration;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSqlDialect;
 import com.tencent.supersonic.headless.core.utils.SqlDialectFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.plan.RelOptPlanner;
@@ -407,7 +407,7 @@ public abstract class SemanticNode {
     }
 
     public static SqlNode optimize(SqlValidatorScope scope, SemanticSchema schema, SqlNode sqlNode,
-            EngineType engineType) {
+                                   EngineType engineType) {
         try {
             HepProgramBuilder hepProgramBuilder = new HepProgramBuilder();
             SemanticSqlDialect sqlDialect = SqlDialectFactory.getSqlDialect(engineType);

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.node.extend;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.node.extend;
 
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.ExtendNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.ExtendNode;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Objects;

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

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.optimizer;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.optimizer;
 
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
 
 import java.util.ArrayList;
 import java.util.Iterator;

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

@@ -1,23 +1,24 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.render;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
-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;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.Renderer;
-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 com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+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.sql.Renderer;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.TableView;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.FilterNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.MetricNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.SemanticNode;
 import java.util.ArrayList;
 import java.util.HashSet;
 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;
@@ -30,7 +31,7 @@ public class FilterRender extends Renderer {
 
     @Override
     public void render(MetricQueryParam metricCommand, List<DataSource> dataSources, SqlValidatorScope scope,
-            SemanticSchema schema, boolean nonAgg) throws Exception {
+                       SemanticSchema schema, boolean nonAgg) throws Exception {
         TableView tableView = super.tableView;
         SqlNode filterNode = null;
         List<String> queryMetrics = new ArrayList<>(metricCommand.getMetrics());

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

@@ -1,23 +1,23 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.render;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
-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;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.JoinRelation;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Materialization;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.Renderer;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.TableView;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.AggFunctionNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.DataSourceNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.FilterNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.IdentifyNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MetricNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Identify;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Materialization;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+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;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.JoinRelation;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.Renderer;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.TableView;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.AggFunctionNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.DataSourceNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.FilterNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.IdentifyNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.MetricNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.SemanticNode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.sql.JoinConditionType;
 import org.apache.calcite.sql.SqlBasicCall;
@@ -50,7 +50,7 @@ public class JoinRender extends Renderer {
 
     @Override
     public void render(MetricQueryParam metricCommand, List<DataSource> dataSources, SqlValidatorScope scope,
-            SemanticSchema schema, boolean nonAgg) throws Exception {
+                       SemanticSchema schema, boolean nonAgg) throws Exception {
         String queryWhere = metricCommand.getWhere();
         EngineType engineType = EngineType.fromString(schema.getSemanticModel().getDatabase().getType());
         Set<String> whereFields = new HashSet<>();

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

@@ -1,17 +1,18 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.render;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.common.pojo.ColumnOrder;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.Renderer;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.TableView;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MetricNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.Renderer;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.TableView;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.MetricNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.SemanticNode;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.SqlNodeList;
 import org.apache.calcite.sql.fun.SqlStdOperatorTable;
@@ -26,7 +27,7 @@ public class OutputRender extends Renderer {
 
     @Override
     public void render(MetricQueryParam metricCommand, List<DataSource> dataSources, SqlValidatorScope scope,
-            SemanticSchema schema, boolean nonAgg) throws Exception {
+                       SemanticSchema schema, boolean nonAgg) throws Exception {
         TableView selectDataSet = super.tableView;
         EngineType engineType = EngineType.fromString(schema.getSemanticModel().getDatabase().getType());
         for (String dimension : metricCommand.getDimensions()) {

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

@@ -1,25 +1,25 @@
-package com.tencent.supersonic.headless.core.parser.calcite.sql.render;
+package com.tencent.supersonic.headless.core.translator.calcite.sql.render;
 
 
-import static com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants.DIMENSION_DELIMITER;
+import static com.tencent.supersonic.headless.core.translator.calcite.s2sql.Constants.DIMENSION_DELIMITER;
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Constants;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Identify;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Materialization;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Measure;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Metric;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSchema;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.Renderer;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.TableView;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.DataSourceNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.DimensionNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.FilterNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.IdentifyNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.MetricNode;
-import com.tencent.supersonic.headless.core.parser.calcite.sql.node.SemanticNode;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Identify;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Materialization;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Measure;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Metric;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSchema;
+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;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.Renderer;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.TableView;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.DataSourceNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.DimensionNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.FilterNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.IdentifyNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.MetricNode;
+import com.tencent.supersonic.headless.core.translator.calcite.sql.node.SemanticNode;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,6 +32,7 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.apache.calcite.sql.SqlNode;
 import org.apache.calcite.sql.validate.SqlValidatorScope;
@@ -44,9 +45,9 @@ import org.springframework.util.CollectionUtils;
 public class SourceRender extends Renderer {
 
     public static TableView renderOne(String alias, List<String> fieldWheres,
-            List<String> reqMetrics, List<String> reqDimensions,
-            String queryWhere, DataSource datasource, SqlValidatorScope scope,
-            SemanticSchema schema, boolean nonAgg) throws Exception {
+                                      List<String> reqMetrics, List<String> reqDimensions,
+                                      String queryWhere, DataSource datasource, SqlValidatorScope scope,
+                                      SemanticSchema schema, boolean nonAgg) throws Exception {
 
         TableView dataSet = new TableView();
         TableView output = new TableView();

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

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.headless.core.parser.converter;
+package com.tencent.supersonic.headless.core.translator.converter;
 
 import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.Constants;
@@ -27,7 +27,7 @@ import org.springframework.util.CollectionUtils;
  */
 @Component("CalculateAggConverter")
 @Slf4j
-public class CalculateAggConverter implements HeadlessConverter {
+public class CalculateAggConverter implements QueryConverter {
 
 
     public interface EngineSql {
@@ -100,13 +100,10 @@ public class CalculateAggConverter implements HeadlessConverter {
 
     @Override
     public void convert(QueryStatement queryStatement) throws Exception {
-        DataSetQueryParam sqlCommend = queryStatement.getDataSetQueryParam();
         Database database = queryStatement.getSemanticModel().getDatabase();
         DataSetQueryParam dataSetQueryParam = generateSqlCommend(queryStatement,
                 EngineType.fromString(database.getType().toUpperCase()), database.getVersion());
-        sqlCommend.setSql(dataSetQueryParam.getSql());
-        sqlCommend.setTables(dataSetQueryParam.getTables());
-        sqlCommend.setSupportWith(dataSetQueryParam.isSupportWith());
+        queryStatement.setDataSetQueryParam(dataSetQueryParam);
     }
 
     /**

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

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.core.parser.converter;
+package com.tencent.supersonic.headless.core.translator.converter;
 
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
 import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.headless.api.pojo.MetricTable;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.Dimension;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
@@ -23,7 +23,7 @@ import java.util.stream.Collectors;
 
 @Slf4j
 @Component("DefaultDimValueConverter")
-public class DefaultDimValueConverter implements HeadlessConverter {
+public class DefaultDimValueConverter implements QueryConverter {
 
     @Override
     public boolean accept(QueryStatement queryStatement) {

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

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.core.parser.converter;
+package com.tencent.supersonic.headless.core.translator.converter;
 
 import com.tencent.supersonic.common.pojo.ColumnOrder;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.headless.api.pojo.QueryParam;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.pojo.MetricQueryParam;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.utils.SqlGenerateUtils;
@@ -16,11 +16,11 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 /**
- * HeadlessConverter default implement
+ * QueryConverter default implement
  */
 @Component("ParserDefaultConverter")
 @Slf4j
-public class ParserDefaultConverter implements HeadlessConverter {
+public class ParserDefaultConverter implements QueryConverter {
 
     @Override
     public boolean accept(QueryStatement queryStatement) {

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

@@ -1,11 +1,11 @@
-package com.tencent.supersonic.headless.core.parser.converter;
+package com.tencent.supersonic.headless.core.translator.converter;
 
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 
 /**
  * to supplement,translate the request Body
  */
-public interface HeadlessConverter {
+public interface QueryConverter {
 
     boolean accept(QueryStatement queryStatement);
 

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

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.headless.core.parser.converter;
+package com.tencent.supersonic.headless.core.translator.converter;
 
 import com.tencent.supersonic.headless.api.pojo.enums.ModelDefineType;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.api.pojo.response.SemanticSchemaResp;
-import com.tencent.supersonic.headless.core.parser.calcite.s2sql.DataSource;
+import com.tencent.supersonic.headless.core.translator.calcite.s2sql.DataSource;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import com.tencent.supersonic.headless.core.utils.SqlVariableParseUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +15,7 @@ import java.util.Objects;
 
 @Slf4j
 @Component("SqlVariableParseConverter")
-public class SqlVariableParseConverter implements HeadlessConverter {
+public class SqlVariableParseConverter implements QueryConverter {
 
     @Override
     public boolean accept(QueryStatement queryStatement) {

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

@@ -3,42 +3,46 @@ package com.tencent.supersonic.headless.core.utils;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.headless.core.cache.QueryCache;
 import com.tencent.supersonic.headless.core.executor.QueryExecutor;
-import com.tencent.supersonic.headless.core.executor.accelerator.QueryAccelerator;
-import com.tencent.supersonic.headless.core.parser.SqlParser;
-import com.tencent.supersonic.headless.core.parser.converter.HeadlessConverter;
-import com.tencent.supersonic.headless.core.planner.QueryOptimizer;
+import com.tencent.supersonic.headless.core.executor.QueryAccelerator;
+import com.tencent.supersonic.headless.core.translator.QueryParser;
+import com.tencent.supersonic.headless.core.translator.converter.QueryConverter;
+import com.tencent.supersonic.headless.core.translator.QueryOptimizer;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.io.support.SpringFactoriesLoader;
 
 /**
- * HeadlessConverter QueryOptimizer QueryExecutor object factory
+ * QueryConverter QueryOptimizer QueryExecutor object factory
  */
 @Slf4j
 public class ComponentFactory {
 
-    private static List<HeadlessConverter> headlessConverters = new ArrayList<>();
+    private static List<QueryConverter> queryConverters = new ArrayList<>();
     private static Map<String, QueryOptimizer> queryOptimizers = new HashMap<>();
     private static List<QueryExecutor> queryExecutors = new ArrayList<>();
     private static List<QueryAccelerator> queryAccelerators = new ArrayList<>();
-    private static SqlParser sqlParser;
+    private static QueryParser queryParser;
     private static QueryCache queryCache;
 
     static {
-        initSemanticConverter();
+        initQueryConverter();
         initQueryOptimizer();
         initQueryExecutors();
+        initQueryAccelerators();
+        initQueryParser();
+        initQueryCache();
     }
 
-    public static List<HeadlessConverter> getSemanticConverters() {
-        if (headlessConverters.isEmpty()) {
-            initSemanticConverter();
+    public static List<QueryConverter> getQueryConverters() {
+        if (queryConverters.isEmpty()) {
+            initQueryConverter();
         }
-        return headlessConverters;
+        return queryConverters;
     }
 
     public static List<QueryOptimizer> getQueryOptimizers() {
@@ -62,11 +66,11 @@ public class ComponentFactory {
         return queryAccelerators;
     }
 
-    public static SqlParser getSqlParser() {
-        if (sqlParser == null) {
+    public static QueryParser getQueryParser() {
+        if (queryParser == null) {
             initQueryParser();
         }
-        return sqlParser;
+        return queryParser;
     }
 
     public static QueryCache getQueryCache() {
@@ -98,12 +102,12 @@ public class ComponentFactory {
         init(QueryAccelerator.class, queryAccelerators);
     }
 
-    private static void initSemanticConverter() {
-        init(HeadlessConverter.class, headlessConverters);
+    private static void initQueryConverter() {
+        init(QueryConverter.class, queryConverters);
     }
 
     private static void initQueryParser() {
-        sqlParser = init(SqlParser.class);
+        queryParser = init(QueryParser.class);
     }
 
     private static void initQueryCache() {

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

@@ -1,7 +1,7 @@
 package com.tencent.supersonic.headless.core.utils;
 
 import com.tencent.supersonic.headless.api.pojo.enums.EngineType;
-import com.tencent.supersonic.headless.core.parser.calcite.schema.SemanticSqlDialect;
+import com.tencent.supersonic.headless.core.translator.calcite.schema.SemanticSqlDialect;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;

headless/core/src/test/java/com/tencent/supersonic/chat/core/parser/aggregate/CalciteSqlParserTest.java

@@ -2,7 +2,7 @@ package com.tencent.supersonic.chat.core.parser.aggregate;
 
 import com.alibaba.fastjson.JSON;
 import com.tencent.supersonic.headless.api.pojo.enums.AggOption;
-import com.tencent.supersonic.headless.core.parser.calcite.CalciteSqlParser;
+import com.tencent.supersonic.headless.core.translator.calcite.CalciteQueryParser;
 import com.tencent.supersonic.headless.core.pojo.QueryStatement;
 import org.junit.jupiter.api.Test;
 import org.testng.Assert;
@@ -459,9 +459,9 @@ public class CalciteSqlParserTest {
                 + "    }\n"
                 + "}";
         QueryStatement queryStatement = JSON.parseObject(json, QueryStatement.class);
-        CalciteSqlParser calciteSqlParser = new CalciteSqlParser();
-        QueryStatement explain = calciteSqlParser.explain(queryStatement, AggOption.DEFAULT);
-        Assert.assertEquals(explain.getSql().trim().replaceAll("\\s+", ""),
+        CalciteQueryParser calciteSqlParser = new CalciteQueryParser();
+        calciteSqlParser.parse(queryStatement, AggOption.DEFAULT);
+        Assert.assertEquals(queryStatement.getSql().trim().replaceAll("\\s+", ""),
                 "SELECT`imp_date`AS`sys_imp_date`,SUM(1)AS`pv`"
                 + "FROM"
                 + "`s2_pv_uv_statis`"