topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Fix)(headless)Fix expression replacement issue. (#2024)
Some checks failed
supersonic CentOS CI / build (21) (push) Has been cancelled
Details
supersonic mac CI / build (21) (push) Has been cancelled
Details
supersonic ubuntu CI / build (21) (push) Has been cancelled
Details
supersonic windows CI / build (21) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Jun Zhang
2025-01-30 08:54:42 +08:00
committed by GitHub
parent be5eeae707
commit de92b357df
18 changed files with 44 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java
View File

@@ -200,7 +200,7 @@ public class DimValueAspect {
}
for (QueryColumn queryColumn : columns) {
if (dimAndTechNameAndBizNamePair.containsKey(queryColumn.getNameEn())) {
if (dimAndTechNameAndBizNamePair.containsKey(queryColumn.getBizName())) {
return true;
}
}

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java
View File

@@ -227,7 +227,7 @@ public class S2SemanticLayerService implements SemanticLayerService {
private List<QueryColumn> createQueryColumns(DimensionValueReq dimensionValueReq) {
QueryColumn queryColumn = new QueryColumn();
queryColumn.setNameEn(dimensionValueReq.getBizName());
queryColumn.setBizName(dimensionValueReq.getBizName());
queryColumn.setShowType(SemanticType.CATEGORY.name());
queryColumn.setAuthorized(true);
queryColumn.setType("CHAR");

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java
View File

@@ -73,7 +73,7 @@ public class DatabaseController {
public SemanticQueryResp executeSql(@RequestBody SqlExecuteReq sqlExecuteReq,
HttpServletRequest request, HttpServletResponse response) {
User user = UserHolder.findUser(request, response);
return databaseService.executeSql(sqlExecuteReq, sqlExecuteReq.getId(), user);
return databaseService.executeSql(sqlExecuteReq, user);
}
@RequestMapping("/getDbNames")

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java
View File

@@ -20,7 +20,7 @@ public interface DatabaseService {
List<DatabaseResp> getDatabaseByType(DataType dataType);
SemanticQueryResp executeSql(SqlExecuteReq sqlExecuteReq, Long id, User user);
SemanticQueryResp executeSql(SqlExecuteReq sqlExecuteReq, User user);
DatabaseResp getDatabase(Long id, User user);

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

@@ -138,8 +138,8 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
}
@Override
public SemanticQueryResp executeSql(SqlExecuteReq sqlExecuteReq, Long id, User user) {
DatabaseResp databaseResp = getDatabase(id);
public SemanticQueryResp executeSql(SqlExecuteReq sqlExecuteReq, User user) {
DatabaseResp databaseResp = getDatabase(sqlExecuteReq.getId());
if (databaseResp == null) {
return new SemanticQueryResp();
}
@@ -257,7 +257,7 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
List<DBColumn> dbColumns = Lists.newArrayList();
for (QueryColumn queryColumn : semanticQueryResp.getColumns()) {
DBColumn dbColumn = new DBColumn();
dbColumn.setColumnName(queryColumn.getNameEn());
dbColumn.setColumnName(queryColumn.getBizName());
dbColumn.setDataType(queryColumn.getType());
dbColumns.add(dbColumn);
}

6
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DownloadServiceImpl.java
View File

@@ -179,7 +179,7 @@ public class DownloadServiceImpl implements DownloadService {
for (Map<String, Object> row : semanticQueryResp.getResultList()) {
List<String> rowData = new ArrayList<>();
for (QueryColumn column : semanticQueryResp.getColumns()) {
rowData.add(String.valueOf(row.get(column.getNameEn())));
rowData.add(String.valueOf(row.get(column.getBizName())));
}
data.add(rowData);
}
@@ -217,7 +217,7 @@ public class DownloadServiceImpl implements DownloadService {
QueryColumn metric = metricColumns.get(0);
List<String> groups = queryStructReq.getGroups();
List<Map<String, Object>> dataTransformed =
DataTransformUtils.transform(queryResult.getResultList(), metric.getNameEn(),
DataTransformUtils.transform(queryResult.getResultList(), metric.getBizName(),
groups, queryStructReq.getDateInfo());
List<List<String>> headers =
buildHeader(dimensionColumns, queryStructReq.getDateInfo().getDateList());
@@ -264,7 +264,7 @@ public class DownloadServiceImpl implements DownloadService {
private Map<String, String> getDimensionNameMap(List<QueryColumn> queryColumns) {
return queryColumns.stream()
.collect(Collectors.toMap(QueryColumn::getName, QueryColumn::getNameEn));
.collect(Collectors.toMap(QueryColumn::getName, QueryColumn::getBizName));
}
private List<DimensionResp> getMetricRelaDimensions(MetricResp metricResp,

4
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/FlightServiceImpl.java
View File

@@ -309,7 +309,7 @@ public class FlightServiceImpl extends BasicFlightSqlProducer implements FlightS
int columnNum = resp.getColumns().size();
rowSetMetaData.setColumnCount(columnNum);
for (int i = 1; i <= columnNum; i++) {
String columnName = resp.getColumns().get(i - 1).getNameEn();
String columnName = resp.getColumns().get(i - 1).getBizName();
rowSetMetaData.setColumnName(i, columnName);
Optional<Map<String, Object>> valOpt = resp.getResultList().stream()
.filter(r -> r.containsKey(columnName) && Objects.nonNull(r.get(columnName)))
@@ -329,7 +329,7 @@ public class FlightServiceImpl extends BasicFlightSqlProducer implements FlightS
for (Map<String, Object> row : resp.getResultList()) {
rowset.moveToInsertRow();
for (int i = 1; i <= columnNum; i++) {
String columnName = resp.getColumns().get(i - 1).getNameEn();
String columnName = resp.getColumns().get(i - 1).getBizName();
if (row.containsKey(columnName)) {
rowset.updateObject(i, row.get(columnName));
} else {

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

@@ -72,7 +72,7 @@ public class QueryUtils {
private void processColumn(QueryColumn column, Map<String, String> namePair,
Map<String, String> nameTypePair, Map<String, MetricResp> metricRespMap,
Map<String, DimensionResp> dimensionRespMap) {
String nameEn = getName(column.getNameEn());
String nameEn = getName(column.getBizName());
if (nameEn.contains(JOIN_UNDERLINE)) {
nameEn = nameEn.split(JOIN_UNDERLINE)[1];
}
@@ -110,8 +110,8 @@ public class QueryUtils {
column.setModelId(dimensionRespMap.get(nameEn).getModelId());
}
// set name by NameEn
if (StringUtils.isBlank(column.getName()) && StringUtils.isNotBlank(column.getNameEn())) {
column.setName(column.getNameEn());
if (StringUtils.isBlank(column.getName()) && StringUtils.isNotBlank(column.getBizName())) {
column.setName(column.getBizName());
}
}