mirror of
https://github.com/tencentmusic/supersonic.git
synced 2025-12-10 11:07:06 +00:00
[fix][heaadless]Fix dim value replacement.
This commit is contained in:
@@ -102,7 +102,7 @@ public class DimValueAspect {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
for (DimensionResp dimension : dimensions) {
|
for (DimensionResp dimension : dimensions) {
|
||||||
if (!expression.getFieldName().equals(dimension.getName())
|
if (!expression.getFieldName().equals(dimension.getBizName())
|
||||||
|| CollectionUtils.isEmpty(dimension.getDimValueMaps())) {
|
|| CollectionUtils.isEmpty(dimension.getDimValueMaps())) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -124,6 +124,7 @@ public class DimValueAspect {
|
|||||||
sql = SqlReplaceHelper.replaceValue(sql, filedNameToValueMap);
|
sql = SqlReplaceHelper.replaceValue(sql, filedNameToValueMap);
|
||||||
log.debug("correctorSql after replacing:{}", sql);
|
log.debug("correctorSql after replacing:{}", sql);
|
||||||
querySqlReq.setSql(sql);
|
querySqlReq.setSql(sql);
|
||||||
|
querySqlReq.getSqlInfo().setQuerySQL(sql);
|
||||||
Map<String, Map<String, String>> techNameToBizName = getTechNameToBizName(dimensions);
|
Map<String, Map<String, String>> techNameToBizName = getTechNameToBizName(dimensions);
|
||||||
|
|
||||||
SemanticQueryResp queryResultWithColumns = (SemanticQueryResp) joinPoint.proceed();
|
SemanticQueryResp queryResultWithColumns = (SemanticQueryResp) joinPoint.proceed();
|
||||||
|
|||||||
@@ -19,9 +19,10 @@ public class DataSetSchemaBuilder {
|
|||||||
public static DataSetSchema build(DataSetSchemaResp resp) {
|
public static DataSetSchema build(DataSetSchemaResp resp) {
|
||||||
DataSetSchema dataSetSchema = new DataSetSchema();
|
DataSetSchema dataSetSchema = new DataSetSchema();
|
||||||
dataSetSchema.setQueryConfig(resp.getQueryConfig());
|
dataSetSchema.setQueryConfig(resp.getQueryConfig());
|
||||||
SchemaElement dataSet = SchemaElement.builder().dataSetId(resp.getId())
|
SchemaElement dataSet =
|
||||||
.dataSetName(resp.getName()).id(resp.getId()).name(resp.getName())
|
SchemaElement.builder().dataSetId(resp.getId()).dataSetName(resp.getName())
|
||||||
.bizName(resp.getBizName()).type(SchemaElementType.DATASET).build();
|
.id(resp.getId()).name(resp.getName()).description(resp.getDescription())
|
||||||
|
.bizName(resp.getBizName()).type(SchemaElementType.DATASET).build();
|
||||||
dataSetSchema.setDataSet(dataSet);
|
dataSetSchema.setDataSet(dataSet);
|
||||||
dataSetSchema.setDatabaseType(resp.getDatabaseType());
|
dataSetSchema.setDatabaseType(resp.getDatabaseType());
|
||||||
dataSetSchema.setDatabaseVersion(resp.getDatabaseVersion());
|
dataSetSchema.setDatabaseVersion(resp.getDatabaseVersion());
|
||||||
|
|||||||
Reference in New Issue
Block a user