(improvement)(semantic)Simplify datasource related code and support setting filter SQL for dict generation (#397)

* (improvement) (semantic) Simplify datasource related code and support setting filtering SQL for dict generation
* (improvement) (semantic) Remove the semicolon at the end of the datasource SQL
* (improvement) (common) Update sys parameter init

---------

Co-authored-by: jolunoluo
This commit is contained in:
LXW
2023-11-17 17:52:28 +08:00
committed by GitHub
parent d9eaf79ab8
commit 8f19584ad7
26 changed files with 394 additions and 2126 deletions

View File

@@ -10,6 +10,7 @@ import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
import java.util.List;
import java.util.stream.Collectors;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
@@ -32,6 +33,8 @@ public class DatasourceReq extends SchemaItem {
private List<Measure> measures;
private String filterSql;
public List<Dim> getTimeDimension() {
@@ -43,4 +46,11 @@ public class DatasourceReq extends SchemaItem {
.collect(Collectors.toList());
}
public String getSqlQuery() {
if (StringUtils.isNotBlank(sqlQuery) && sqlQuery.endsWith(";")) {
sqlQuery = sqlQuery.substring(0, sqlQuery.length() - 1);
}
return sqlQuery;
}
}

View File

@@ -4,6 +4,7 @@ package com.tencent.supersonic.semantic.api.model.request;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
@Data
public class SqlExecuteReq {
@@ -16,6 +17,9 @@ public class SqlExecuteReq {
private String sql;
public String getSql() {
if (StringUtils.isNotBlank(sql) && sql.endsWith(";")) {
sql = sql.substring(0, sql.length() - 1);
}
return String.format(LIMIT_WRAPPER, sql);
}

View File

@@ -15,6 +15,6 @@ public class DatasourceResp extends SchemaItem {
private String depends;
private String filterSql;
}