[improvement][project] supersonic 0.7.0 version backend update (#20)

Co-authored-by: kanedai <kanedai@tencent.com>

semantic/api/pom.xml

@@ -12,10 +12,17 @@
     <artifactId>semantic-api</artifactId>
 
     <dependencies>
+<!--        <dependency>-->
+<!--            <groupId>ru.yandex.clickhouse</groupId>-->
+<!--            <artifactId>clickhouse-jdbc</artifactId>-->
+<!--            <version>${clickhouse.jdbc.version}</version>-->
+<!--        </dependency>-->
         <dependency>
-            <groupId>ru.yandex.clickhouse</groupId>
+            <groupId>com.clickhouse</groupId>
             <artifactId>clickhouse-jdbc</artifactId>
             <version>${clickhouse.jdbc.version}</version>
+            <!-- use uber jar with all dependencies included, change classifier to http for smaller jar -->
+            <classifier>all</classifier>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/core/pojo/DataFormat.java

@@ -1,13 +0,0 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
-
-import lombok.Data;
-
-@Data
-public class DataFormat {
-
-    private boolean needMultiply100;
-
-    private Integer decimalPlaces;
-
-
-}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/core/pojo/QueryAuthorization.java

@@ -1,20 +0,0 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-@AllArgsConstructor
-@Data
-@ToString
-@NoArgsConstructor
-public class QueryAuthorization {
-
-    private String domainName;
-    private List<String> dimensionFilters;
-    private List<String> dimensionFiltersDesc;
-    private String message;
-}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/core/pojo/QueryColumn.java

@@ -1,28 +0,0 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class QueryColumn {
-
-    private String name;
-    private String type;
-    private String nameEn;
-    private String showType;
-    private Boolean authorized = true;
-    private String dataFormatType;
-    private DataFormat dataFormat;
-
-    public QueryColumn(String nameEn, String type) {
-        this.type = type;
-        this.nameEn = nameEn;
-    }
-
-    public void setType(String type) {
-        this.type = type == null ? null : type;
-    }
-}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/core/pojo/RecordInfo.java

@@ -1,23 +0,0 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
-
-import java.util.Date;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.ToString;
-
-
-@Data
-@ToString
-@AllArgsConstructor
-public class RecordInfo {
-
-
-    private String createdBy;
-
-    private String updatedBy;
-
-    private Date createdAt;
-
-    private Date updatedAt;
-
-}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/core/request/MetricBaseReq.java

@@ -1,15 +0,0 @@
-package com.tencent.supersonic.semantic.api.core.request;
-
-
-import com.tencent.supersonic.common.pojo.SchemaItem;
-import lombok.Data;
-
-
-@Data
-public class MetricBaseReq extends SchemaItem {
-
-    private Long domainId;
-
-    private String alias;
-
-}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/core/response/DatasourceResp.java

@@ -1,17 +0,0 @@
-package com.tencent.supersonic.semantic.api.core.response;
-
-import com.tencent.supersonic.semantic.api.core.pojo.DatasourceDetail;
-import com.tencent.supersonic.common.pojo.SchemaItem;
-import lombok.Data;
-
-@Data
-public class DatasourceResp extends SchemaItem {
-
-    private Long domainId;
-
-    private Long databaseId;
-
-    private DatasourceDetail datasourceDetail;
-
-
-}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DataTypeEnum.java

@@ -1,7 +1,7 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 
-import com.tencent.supersonic.common.constant.Constants;
+import com.tencent.supersonic.common.pojo.Constants;
 import java.util.HashSet;
 import java.util.Set;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/DimensionTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 
 public enum DimensionTypeEnum {

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/MetricTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 
 public enum MetricTypeEnum {

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/OperatorEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 public enum OperatorEnum {
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeBackEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 
 public enum QueryTypeBackEnum {

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/QueryTypeEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 
 public enum QueryTypeEnum {

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/enums/TimeDimensionEnum.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.enums;
+package com.tencent.supersonic.semantic.api.model.enums;
 
 import java.util.Arrays;
 import java.util.List;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DatasourceDetail.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import java.util.List;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DatasourceType.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
-import com.tencent.supersonic.common.constant.Constants;
+import com.tencent.supersonic.common.pojo.Constants;
 import java.util.List;
 import lombok.Data;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Dim.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
-import com.tencent.supersonic.common.constant.Constants;
+import com.tencent.supersonic.common.pojo.Constants;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimValueMap.java

@@ -0,0 +1,30 @@
+package com.tencent.supersonic.semantic.api.model.pojo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author: kanedai
+ * @date: 2023/7/24
+ */
+
+@Data
+public class DimValueMap {
+
+    /**
+     * dimension value in db
+     */
+    private String techName;
+
+    /**
+     * dimension value for result show
+     */
+    private String bizName;
+
+    /**
+     * dimension value for user query
+     */
+    private List<String> alias = new ArrayList<>();
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/DimensionTimeTypeParams.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Entity.java

@@ -0,0 +1,26 @@
+package com.tencent.supersonic.semantic.api.model.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import java.util.List;
+
+@Data
+@ToString
+@AllArgsConstructor
+@NoArgsConstructor
+public class Entity {
+
+
+    /**
+     * uniquely identifies an entity
+     */
+    private Long entityId;
+
+    /**
+     * entity name list
+     */
+    private List<String> names;
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Identify.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/ItemDateFilter.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import java.util.List;
 import lombok.AllArgsConstructor;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/Measure.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/MetricTypeParams.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import java.util.List;
 import com.google.common.collect.Lists;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryResult.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import java.io.Serializable;
 import java.util.ArrayList;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo;
+package com.tencent.supersonic.semantic.api.model.pojo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/SchemaItem.java

@@ -0,0 +1,52 @@
+package com.tencent.supersonic.semantic.api.model.pojo;
+
+import com.google.common.base.Objects;
+import com.tencent.supersonic.common.pojo.RecordInfo;
+import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum;
+import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+import com.tencent.supersonic.common.pojo.enums.TypeEnums;
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString(callSuper = true)
+public class SchemaItem extends RecordInfo {
+
+    private Long id;
+
+    private String name;
+
+    private String bizName;
+
+    private String description;
+
+    private Integer status = StatusEnum.ONLINE.getCode();
+
+    private TypeEnums typeEnum;
+
+    private Integer sensitiveLevel = SensitiveLevelEnum.LOW.getCode();
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        if (!super.equals(o)) {
+            return false;
+        }
+        SchemaItem that = (SchemaItem) o;
+        return Objects.equal(id, that.id) && Objects.equal(name, that.name)
+                && Objects.equal(bizName, that.bizName) && Objects.equal(
+                description, that.description) && Objects.equal(status, that.status)
+                && typeEnum == that.typeEnum && Objects.equal(sensitiveLevel, that.sensitiveLevel);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(super.hashCode(), id, name, bizName, description, status, typeEnum, sensitiveLevel);
+    }
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatabaseReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
-import com.tencent.supersonic.semantic.api.core.enums.DataTypeEnum;
+import com.tencent.supersonic.semantic.api.model.enums.DataTypeEnum;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -26,6 +26,8 @@ public class DatabaseReq {
 
     private String database;
 
+    private String version;
+
     private String description;
 
     private String url;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatasourceRelaReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 import javax.validation.constraints.NotNull;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DatasourceReq.java

@@ -1,10 +1,10 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
-import com.tencent.supersonic.semantic.api.core.pojo.Dim;
-import com.tencent.supersonic.semantic.api.core.pojo.Identify;
-import com.tencent.supersonic.semantic.api.core.pojo.Measure;
-import com.tencent.supersonic.common.pojo.SchemaItem;
+import com.tencent.supersonic.semantic.api.model.pojo.Dim;
+import com.tencent.supersonic.semantic.api.model.pojo.Identify;
+import com.tencent.supersonic.semantic.api.model.pojo.Measure;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 import java.util.List;
 
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DateInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 import java.util.ArrayList;
 import java.util.List;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DimensionReq.java

@@ -1,8 +1,12 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
+
+import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 
-import com.tencent.supersonic.common.pojo.SchemaItem;
 import javax.validation.constraints.NotNull;
+
 import lombok.Data;
+
 import java.util.List;
 
 @Data
@@ -25,5 +29,5 @@ public class DimensionReq extends SchemaItem {
 
     private List<String> defaultValues;
 
-
+    private List<DimValueMap> dimValueMaps;
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainReq.java

@@ -1,9 +1,12 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
-import com.tencent.supersonic.common.pojo.SchemaItem;
+import com.tencent.supersonic.semantic.api.model.pojo.Entity;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
+
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.Data;
 
 
@@ -21,4 +24,6 @@ public class DomainReq extends SchemaItem {
     private List<String> admins = new ArrayList<>();
 
     private List<String> adminOrgs = new ArrayList<>();
+
+    private Entity entity;
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainSchemaFilterReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 import java.util.List;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/DomainUpdateReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricBaseReq.java

@@ -0,0 +1,20 @@
+package com.tencent.supersonic.semantic.api.model.request;
+
+
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
+import com.tencent.supersonic.common.pojo.DataFormat;
+import lombok.Data;
+
+
+@Data
+public class MetricBaseReq extends SchemaItem {
+
+    private Long domainId;
+
+    private String alias;
+
+    private String dataFormatType;
+
+    private DataFormat dataFormat;
+
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricReq.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
-import com.tencent.supersonic.semantic.api.core.enums.MetricTypeEnum;
-import com.tencent.supersonic.semantic.api.core.pojo.Measure;
-import com.tencent.supersonic.semantic.api.core.pojo.MetricTypeParams;
+import com.tencent.supersonic.semantic.api.model.enums.MetricTypeEnum;
+import com.tencent.supersonic.semantic.api.model.pojo.Measure;
+import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams;
 import lombok.Data;
 import java.util.List;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageDimensionReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageMetricReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageSchemaItemReq.java

@@ -1,6 +1,6 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
-import com.tencent.supersonic.common.request.PageBaseReq;
+import com.tencent.supersonic.common.pojo.PageBaseReq;
 import lombok.Data;
 
 @Data

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/SqlExecuteReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 
 import javax.validation.constraints.NotBlank;
@@ -7,7 +7,7 @@ import lombok.Data;
 
 @Data
 public class SqlExecuteReq {
-
+    public static final String LIMIT_WRAPPER = " select * from ( %s ) a limit 1000 ";
 
     @NotNull(message = "domainId can not be null")
     private Long domainId;
@@ -16,7 +16,7 @@ public class SqlExecuteReq {
     private String sql;
 
     public String getSql() {
-        return String.format(" select * from ( %s ) a limit 1000 ", sql);
+        return String.format(LIMIT_WRAPPER, sql);
     }
 
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/ViewInfoReq.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.request;
+package com.tencent.supersonic.semantic.api.model.request;
 
 import java.util.Date;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DatabaseResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -28,6 +28,8 @@ public class DatabaseResp {
 
     private String database;
 
+    private String version;
+
     public String getHost() {
         Pattern p = Pattern.compile("jdbc:(?<db>\\w+):.*((//)|@)(?<host>.+):(?<port>\\d+).*");
         Matcher m = p.matcher(url);

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DatasourceRelaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import java.util.Date;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DatasourceResp.java

@@ -0,0 +1,17 @@
+package com.tencent.supersonic.semantic.api.model.response;
+
+import com.tencent.supersonic.semantic.api.model.pojo.DatasourceDetail;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
+import lombok.Data;
+
+@Data
+public class DatasourceResp extends SchemaItem {
+
+    private Long domainId;
+
+    private Long databaseId;
+
+    private DatasourceDetail datasourceDetail;
+
+
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimSchemaResp.java

@@ -1,8 +1,10 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString(callSuper = true)
 public class DimSchemaResp extends DimensionResp {
 
     private Long useCnt = 0L;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DimensionResp.java

@@ -1,12 +1,17 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 
-import com.tencent.supersonic.common.pojo.SchemaItem;
-import lombok.Data;
+import com.tencent.supersonic.semantic.api.model.pojo.DimValueMap;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
+
 import java.util.List;
 
+import lombok.Data;
+import lombok.ToString;
+
 
 @Data
+@ToString(callSuper = true)
 public class DimensionResp extends SchemaItem {
 
     private Long domainId;
@@ -29,5 +34,6 @@ public class DimensionResp extends SchemaItem {
 
     private List<String> defaultValues;
 
+    private List<DimValueMap> dimValueMaps;
 
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DomainResp.java

@@ -1,7 +1,10 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
+
+import com.tencent.supersonic.semantic.api.model.pojo.Entity;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 
-import com.tencent.supersonic.common.pojo.SchemaItem;
 import java.util.List;
+
 import lombok.Data;
 import lombok.ToString;
 
@@ -27,5 +30,6 @@ public class DomainResp extends SchemaItem {
 
     private Integer metricCnt;
 
+    private Entity entity;
 
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DomainSchemaRelaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import java.util.List;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/DomainSchemaResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import java.util.List;
 import lombok.AllArgsConstructor;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ItemDateResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import java.util.ArrayList;
 import java.util.List;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MeasureResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import lombok.Data;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricResp.java

@@ -1,13 +1,15 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 
-import com.tencent.supersonic.semantic.api.core.pojo.DataFormat;
-import com.tencent.supersonic.semantic.api.core.pojo.MetricTypeParams;
-import com.tencent.supersonic.common.pojo.SchemaItem;
+import com.tencent.supersonic.common.pojo.DataFormat;
+import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 import lombok.Data;
+import lombok.ToString;
 
 
 @Data
+@ToString(callSuper = true)
 public class MetricResp extends SchemaItem {
 
     private Long domainId;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricSchemaResp.java

@@ -1,8 +1,10 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import lombok.Data;
+import lombok.ToString;
 
 @Data
+@ToString(callSuper = true)
 public class MetricSchemaResp extends MetricResp {
 
     private Long useCnt = 0L;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/QueryResultWithSchemaResp.java

@@ -1,9 +1,9 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 
-import com.tencent.supersonic.semantic.api.core.pojo.QueryAuthorization;
-import com.tencent.supersonic.semantic.api.core.pojo.QueryColumn;
-import com.tencent.supersonic.semantic.api.core.pojo.QueryResult;
+import com.tencent.supersonic.common.pojo.QueryAuthorization;
+import com.tencent.supersonic.common.pojo.QueryColumn;
+import com.tencent.supersonic.semantic.api.model.pojo.QueryResult;
 import java.util.List;
 import java.util.Map;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/SqlParserResp.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.response;
+package com.tencent.supersonic.semantic.api.model.response;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DatasourceYamlTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 import java.util.List;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionTimeTypeParamsTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 import lombok.Data;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/DimensionYamlTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/IdentifyYamlTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MeasureYamlTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricTypeParamsYamlTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 import java.util.List;
 import lombok.Data;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/yaml/MetricYamlTpl.java

@@ -1,4 +1,4 @@
-package com.tencent.supersonic.semantic.api.core.pojo.yaml;
+package com.tencent.supersonic.semantic.api.model.yaml;
 
 
 import java.util.List;

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ParseSqlReq.java

@@ -13,6 +13,7 @@ public class ParseSqlReq {
     private Map<String, String> variables;
     private String sql = "";
     private List<MetricTable> tables;
+    private boolean supportWith = true;
 
     public Map<String, String> getVariables() {
         if (variables == null) {

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryDslReq.java

@@ -6,7 +6,7 @@ import lombok.ToString;
 
 @Data
 @ToString
-public class QuerySqlReq {
+public class QueryDslReq {
 
     private Long domainId;
 

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/QueryMultiStructReq.java

@@ -11,11 +11,11 @@ import org.apache.commons.codec.digest.DigestUtils;
 public class QueryMultiStructReq {
 
 
-    List<QueryStructReq> queryStructCmds;
+    List<QueryStructReq> queryStructReqs;
 
 
     public String toCustomizedString() {
-        return JSONObject.toJSONString(queryStructCmds);
+        return JSONObject.toJSONString(queryStructReqs);
     }
 
     public String generateCommandMd5() {