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

[fix]Fix unit test cases.

Browse Source
This commit is contained in:
jerryjzhang
2025-08-05 17:22:10 +08:00
parent bf3213e8fb
commit 91e4b51ef8
22 changed files with 197 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java
View File

@@ -19,7 +19,8 @@ public class ParseContext {
}
public boolean enableNL2SQL() {
return Objects.nonNull(agent) && agent.containsDatasetTool()&&response.getSelectedParses().size() == 0;
return Objects.nonNull(agent) && agent.containsDatasetTool()
&& response.getSelectedParses().size() == 0;
}
public boolean enableLLM() {

2
common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java
View File

@@ -727,7 +727,7 @@ public class SqlReplaceHelper {
List<PlainSelect> plainSelects = SqlSelectHelper.getPlainSelects(plainSelectList);
for (PlainSelect plainSelect : plainSelects) {
if (Objects.nonNull(plainSelect.getFromItem())) {
Table table = (Table) plainSelect.getFromItem();
Table table = SqlSelectHelper.getTable(plainSelect.getFromItem());
if (table.getName().equals(tableName)) {
replacePlainSelectByExpr(plainSelect, replace);
if (SqlSelectHelper.hasAggregateFunction(plainSelect)) {

38
common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java
View File

@@ -723,6 +723,44 @@ public class SqlSelectHelper {
return null;
}
public static Table getTable(FromItem fromItem) {
Table table = null;
if (fromItem instanceof Table) {
table = (Table) fromItem;
} else if (fromItem instanceof ParenthesedSelect) {
ParenthesedSelect parenthesedSelect = (ParenthesedSelect) fromItem;
if (parenthesedSelect.getSelect() instanceof PlainSelect) {
PlainSelect subSelect = (PlainSelect) parenthesedSelect.getSelect();
table = getTable(subSelect.getSelectBody());
} else if (parenthesedSelect.getSelect() instanceof SetOperationList) {
table = getTable(parenthesedSelect.getSelect());
}
}
return table;
}
public static Table getTable(Select select) {
if (select == null) {
return null;
}
List<PlainSelect> plainSelectList = getWithItem(select);
if (!CollectionUtils.isEmpty(plainSelectList)) {
List<PlainSelect> selectList = new ArrayList<>(plainSelectList);
Table table = getTable(selectList.get(0));
return table;
}
if (select instanceof PlainSelect) {
PlainSelect plainSelect = (PlainSelect) select;
return getTable(plainSelect.getFromItem());
} else if (select instanceof SetOperationList) {
SetOperationList setOperationList = (SetOperationList) select;
if (!CollectionUtils.isEmpty(setOperationList.getSelects())) {
return getTable(setOperationList.getSelects().get(0));
}
}
return null;
}
public static String getDbTableName(String sql) {
Table table = getTable(sql);
return table.getFullyQualifiedName();

20
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java
View File

@@ -3,7 +3,11 @@ package com.tencent.supersonic.headless.api.pojo.request;
import com.google.common.collect.Lists;
import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
import com.tencent.supersonic.common.pojo.*;
import com.tencent.supersonic.common.pojo.Aggregator;
import com.tencent.supersonic.common.pojo.Constants;
import com.tencent.supersonic.common.pojo.DateConf;
import com.tencent.supersonic.common.pojo.Filter;
import com.tencent.supersonic.common.pojo.Order;
import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
import com.tencent.supersonic.common.pojo.enums.QueryType;
import com.tencent.supersonic.common.util.ContextUtils;
@@ -21,14 +25,22 @@ import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.schema.Column;
import net.sf.jsqlparser.schema.Table;
import net.sf.jsqlparser.statement.select.*;
import net.sf.jsqlparser.statement.select.GroupByElement;
import net.sf.jsqlparser.statement.select.Limit;
import net.sf.jsqlparser.statement.select.Offset;
import net.sf.jsqlparser.statement.select.OrderByElement;
import net.sf.jsqlparser.statement.select.ParenthesedSelect;
import net.sf.jsqlparser.statement.select.PlainSelect;
import net.sf.jsqlparser.statement.select.SelectItem;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@Data
@@ -176,7 +188,7 @@ public class QueryStructReq extends SemanticQueryReq {
private List<SelectItem<?>> buildSelectItems(QueryStructReq queryStructReq) {
List<SelectItem<?>> selectItems = new ArrayList<>();
List<String> groups = queryStructReq.getGroups();
Set<String> groups = new HashSet<>(queryStructReq.getGroups());
if (!CollectionUtils.isEmpty(groups)) {
for (String group : groups) {
@@ -236,7 +248,7 @@ public class QueryStructReq extends SemanticQueryReq {
}
private GroupByElement buildGroupByElement(QueryStructReq queryStructReq) {
List<String> groups = queryStructReq.getGroups();
Set<String> groups = new HashSet<>(queryStructReq.getGroups());
if ((!CollectionUtils.isEmpty(groups) && !queryStructReq.getAggregators().isEmpty())
|| !queryStructReq.getMetricFilters().isEmpty()) {
GroupByElement groupByElement = new GroupByElement();

6
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/SqlExecuteReq.java
View File

@@ -23,9 +23,9 @@ public class SqlExecuteReq {
private Integer limit = 1000;
public String getSql() {
if(StringUtils.isNotBlank(sql)){
sql=sql.replaceAll("^[\\n]+|[\\n]+$", "");
sql=StringUtils.removeEnd(sql,";");
if (StringUtils.isNotBlank(sql)) {
sql = sql.replaceAll("^[\\n]+|[\\n]+$", "");
sql = StringUtils.removeEnd(sql, ";");
}
return String.format(LIMIT_WRAPPER, sql, limit);

2
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/file/FileHandlerImpl.java
View File

@@ -175,7 +175,7 @@ public class FileHandlerImpl implements FileHandler {
private DictValueResp convert2Resp(String lineStr) {
DictValueResp dictValueResp = new DictValueResp();
if (StringUtils.isNotEmpty(lineStr)) {
lineStr=StringUtils.stripStart(lineStr,null);
lineStr = StringUtils.stripStart(lineStr, null);
String[] itemArray = lineStr.split("\\s+");
if (Objects.nonNull(itemArray) && itemArray.length >= 3) {
dictValueResp.setValue(itemArray[0].replace("#", " "));

9
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java
View File

@@ -168,10 +168,11 @@ public class EmbeddingMatchStrategy extends BatchMatchStrategy<EmbeddingResult>
variable.put("retrievedInfo", JSONObject.toJSONString(results));
Prompt prompt = PromptTemplate.from(LLM_FILTER_PROMPT).apply(variable);
ChatModelConfig chatModelConfig=null;
if(chatQueryContext.getRequest().getChatAppConfig()!=null
&& chatQueryContext.getRequest().getChatAppConfig().containsKey("REWRITE_MULTI_TURN")){
chatModelConfig=chatQueryContext.getRequest().getChatAppConfig().get("REWRITE_MULTI_TURN").getChatModelConfig();
ChatModelConfig chatModelConfig = null;
if (chatQueryContext.getRequest().getChatAppConfig() != null && chatQueryContext
.getRequest().getChatAppConfig().containsKey("REWRITE_MULTI_TURN")) {
chatModelConfig = chatQueryContext.getRequest().getChatAppConfig()
.get("REWRITE_MULTI_TURN").getChatModelConfig();
}
ChatLanguageModel chatLanguageModel = ModelProvider.getChatModel(chatModelConfig);
String response = chatLanguageModel.generate(prompt.toUserMessage().singleText());

3
headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/KeywordMapper.java
View File

@@ -87,7 +87,8 @@ public class KeywordMapper extends BaseMapper {
.similarity(hanlpMapResult.getSimilarity())
.detectWord(hanlpMapResult.getDetectWord()).build();
// doDimValueAliasLogic 将维度值别名进行替换成真实维度值
doDimValueAliasLogic(schemaElementMatch,chatQueryContext.getSemanticSchema().getDimensionValues());
doDimValueAliasLogic(schemaElementMatch,
chatQueryContext.getSemanticSchema().getDimensionValues());
addToSchemaMap(chatQueryContext.getMapInfo(), dataSetId, schemaElementMatch);
}
}

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

@@ -124,7 +124,7 @@ public class DimValueAspect {
sql = SqlReplaceHelper.replaceValue(sql, filedNameToValueMap);
log.debug("correctorSql after replacing:{}", sql);
querySqlReq.setSql(sql);
querySqlReq.getSqlInfo().setQuerySQL(sql);
// querySqlReq.getSqlInfo().setQuerySQL(sql);
Map<String, Map<String, String>> techNameToBizName = getTechNameToBizName(dimensions);
SemanticQueryResp queryResultWithColumns = (SemanticQueryResp) joinPoint.proceed();

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DimensionRepositoryImpl.java
View File

@@ -88,7 +88,7 @@ public class DimensionRepositoryImpl implements DimensionRepository {
}
if (StringUtils.isNotBlank(dimensionFilter.getKey())) {
String key = dimensionFilter.getKey();
queryWrapper.and(qw->qw.lambda().like(DimensionDO::getName, key).or()
queryWrapper.and(qw -> qw.lambda().like(DimensionDO::getName, key).or()
.like(DimensionDO::getBizName, key).or().like(DimensionDO::getDescription, key)
.or().like(DimensionDO::getAlias, key).or()
.like(DimensionDO::getCreatedBy, key));

11
headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java
View File

@@ -114,14 +114,9 @@ public class MetricRepositoryImpl implements MetricRepository {
}
if (StringUtils.isNotBlank(metricFilter.getKey())) {
String key = metricFilter.getKey();
queryWrapper.lambda()
.and(wrapper -> wrapper
.like(MetricDO::getName, key)
.or().like(MetricDO::getBizName, key)
.or().like(MetricDO::getDescription, key)
.or().like(MetricDO::getAlias, key)
.or().like(MetricDO::getCreatedBy, key)
);
queryWrapper.lambda().and(wrapper -> wrapper.like(MetricDO::getName, key).or()
.like(MetricDO::getBizName, key).or().like(MetricDO::getDescription, key).or()
.like(MetricDO::getAlias, key).or().like(MetricDO::getCreatedBy, key));
}
return metricDOMapper.selectList(queryWrapper);

5
headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DataSetController.java
View File

@@ -51,8 +51,9 @@ public class DataSetController {
@GetMapping("/getDataSetList")
public List<DataSetResp> getDataSetList(@RequestParam("domainId") Long domainId) {
List<Integer> statuCodeList = Arrays.asList(StatusEnum.ONLINE.getCode(),StatusEnum.OFFLINE.getCode());
return dataSetService.getDataSetList(domainId,statuCodeList);
List<Integer> statuCodeList =
Arrays.asList(StatusEnum.ONLINE.getCode(), StatusEnum.OFFLINE.getCode());
return dataSetService.getDataSetList(domainId, statuCodeList);
}
@DeleteMapping("/{id}")

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

@@ -20,7 +20,7 @@ public interface DataSetService {
List<DataSetResp> getDataSetList(MetaFilter metaFilter);
List<DataSetResp> getDataSetList(Long domainId ,List<Integer> statuCodesList);
List<DataSetResp> getDataSetList(Long domainId, List<Integer> statuCodesList);
void delete(Long id, User user);

3
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DimensionService.java
View File

@@ -27,7 +27,8 @@ public interface DimensionService {
DimensionResp createDimension(DimensionReq dimensionReq, User user) throws Exception;
void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user) throws Exception;
void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user)
throws Exception;
void createDimensionBatch(List<DimensionReq> dimensionReqs, User user) throws Exception;

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

@@ -55,7 +55,9 @@ public interface ModelService {
void batchUpdateStatus(MetaBatchReq metaBatchReq, User user);
void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList, List<MetricReq> metricReqList, User user);
void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList,
List<MetricReq> metricReqList, User user);
void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionReqList, List<MetricDO> metricReqList);
void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionReqList,
List<MetricDO> metricReqList);
}

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

@@ -104,7 +104,7 @@ public class DataSetServiceImpl extends ServiceImpl<DataSetDOMapper, DataSetDO>
@Override
public List<DataSetResp> getDataSetList(Long domainId, List<Integer> statuCodesList) {
if(domainId==null || CollectionUtils.isEmpty(statuCodesList)){
if (domainId == null || CollectionUtils.isEmpty(statuCodesList)) {
return List.of();
}
QueryWrapper<DataSetDO> wrapper = new QueryWrapper<>();

30
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
View File

@@ -86,13 +86,15 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
sendEventBatch(Lists.newArrayList(dimensionDO), EventType.ADD);
// should update modelDetail
modelService.updateModelByDimAndMetric(dimensionReq.getModelId(), Lists.newArrayList(dimensionReq), null, user);
modelService.updateModelByDimAndMetric(dimensionReq.getModelId(),
Lists.newArrayList(dimensionReq), null, user);
return DimensionConverter.convert2DimensionResp(dimensionDO);
}
@Override
public void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user) throws Exception {
public void alterDimensionBatch(List<DimensionReq> dimensionReqs, Long modelId, User user)
throws Exception {
List<DimensionResp> dimensionResps = getDimensions(modelId);
// get all dimension in model, only use bizname, because name can be changed to everything
Map<String, DimensionResp> bizNameMap = dimensionResps.stream()
@@ -117,7 +119,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
});
// the bizNames from alter dimensions
List<String> bizNames = dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
List<String> bizNames =
dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
bizNameMap.keySet().forEach(bizNameInDb -> {
if (!bizNames.contains(bizNameInDb)) {
dimensionToDelete.add(bizNameMap.get(bizNameInDb).getId());
@@ -148,7 +151,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
.map(DimensionConverter::convert2DimensionDO).collect(Collectors.toList());
dimensionRepository.createDimensionBatch(dimensionDOS);
// should update modelDetail as well
modelService.updateModelByDimAndMetric(dimensionReqs.get(0).getModelId(), dimensionReqs, null, user);
modelService.updateModelByDimAndMetric(dimensionReqs.get(0).getModelId(), dimensionReqs,
null, user);
sendEventBatch(dimensionDOS, EventType.ADD);
}
@@ -162,7 +166,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
DimensionConverter.convert(dimensionDO, dimensionReq);
dimensionRepository.updateDimension(dimensionDO);
// should update modelDetail as well
modelService.updateModelByDimAndMetric(dimensionReq.getModelId(), Lists.newArrayList(dimensionReq), null, user);
modelService.updateModelByDimAndMetric(dimensionReq.getModelId(),
Lists.newArrayList(dimensionReq), null, user);
if (!oldName.equals(dimensionDO.getName())) {
sendEvent(getDataItem(dimensionDO), EventType.UPDATE);
@@ -172,10 +177,12 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
@Override
public void updateDimensionBatch(List<DimensionReq> dimensionReqList, User user) {
checkExist(dimensionReqList);
List<DimensionDO> dimensionDOS = dimensionReqList.stream().map(DimensionConverter::convert2DimensionDO).collect(Collectors.toList());
List<DimensionDO> dimensionDOS = dimensionReqList.stream()
.map(DimensionConverter::convert2DimensionDO).collect(Collectors.toList());
dimensionRepository.batchUpdate(dimensionDOS);
// should update modelDetail as well
modelService.updateModelByDimAndMetric(dimensionReqList.get(0).getModelId(),dimensionReqList, null, user);
modelService.updateModelByDimAndMetric(dimensionReqList.get(0).getModelId(),
dimensionReqList, null, user);
sendEventBatch(dimensionDOS, EventType.UPDATE);
}
@@ -231,7 +238,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
dimensionDO.setUpdatedBy(user.getName());
dimensionRepository.updateDimension(dimensionDO);
// should update modelDetail
modelService.deleteModelDetailByDimAndMetric(dimensionDO.getModelId(), Lists.newArrayList(dimensionDO), null);
modelService.deleteModelDetailByDimAndMetric(dimensionDO.getModelId(),
Lists.newArrayList(dimensionDO), null);
sendEventBatch(Lists.newArrayList(dimensionDO), EventType.DELETE);
}
@@ -241,7 +249,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
dimensionFilter.setDimensionIds(idList);
List<DimensionDO> dimensionDOList = dimensionRepository.getDimensions(dimensionFilter);
if (CollectionUtils.isEmpty(dimensionDOList)) {
throw new RuntimeException(String.format("the dimension %s not exist", StringUtils.join(",",idList)));
throw new RuntimeException(
String.format("the dimension %s not exist", StringUtils.join(",", idList)));
}
dimensionDOList.forEach(dimensionDO -> {
dimensionDO.setStatus(StatusEnum.DELETED.getCode());
@@ -250,7 +259,8 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
});
dimensionRepository.batchUpdateStatus(dimensionDOList);
// should update modelDetail
modelService.deleteModelDetailByDimAndMetric(dimensionDOList.get(0).getModelId(), dimensionDOList, null);
modelService.deleteModelDetailByDimAndMetric(dimensionDOList.get(0).getModelId(),
dimensionDOList, null);
sendEventBatch(dimensionDOList, EventType.DELETE);
}

30
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java
View File

@@ -80,7 +80,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
metricRepository.createMetric(metricDO);
sendEventBatch(Lists.newArrayList(metricDO), EventType.ADD);
// should update modelDetail as well
modelService.updateModelByDimAndMetric(metricReq.getModelId(),null, Lists.newArrayList(metricReq), user);
modelService.updateModelByDimAndMetric(metricReq.getModelId(), null,
Lists.newArrayList(metricReq), user);
return MetricConverter.convert2MetricResp(metricDO);
@@ -93,7 +94,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
.map(MetricConverter::convert2MetricDO).collect(Collectors.toList());
metricRepository.createMetricBatch(metricDOS);
// should update modelDetail as well
modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs, user);
modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs,
user);
sendEventBatch(metricDOS, EventType.ADD);
}
@@ -123,7 +125,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
});
// the bizNames from alter dimensions
List<String> bizNames = metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
List<String> bizNames =
metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
bizNameMap.keySet().forEach(bizNameInDb -> {
if (!bizNames.contains(bizNameInDb)) {
metricToDelete.add(bizNameMap.get(bizNameInDb).getId());
@@ -163,7 +166,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
sendEvent(dataItem, EventType.UPDATE);
}
// should update modelDetail as well
modelService.updateModelByDimAndMetric(metricReq.getModelId(), null, Lists.newArrayList(metricReq), user);
modelService.updateModelByDimAndMetric(metricReq.getModelId(), null,
Lists.newArrayList(metricReq), user);
return MetricConverter.convert2MetricResp(metricDO);
}
@@ -171,10 +175,12 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
public void updateMetricBatch(List<MetricReq> metricReqs, User user) {
MetricCheckUtils.checkParam(metricReqs);
checkExist(metricReqs);
List<MetricDO> metricDOS = metricReqs.stream().map(MetricConverter::convert2MetricDO).collect(Collectors.toList());
List<MetricDO> metricDOS = metricReqs.stream().map(MetricConverter::convert2MetricDO)
.collect(Collectors.toList());
metricRepository.batchUpdateMetric(metricDOS);
// should update modelDetail as well
modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs, user);
modelService.updateModelByDimAndMetric(metricReqs.get(0).getModelId(), null, metricReqs,
user);
sendEventBatch(metricDOS, EventType.UPDATE);
}
@@ -277,7 +283,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
metricDO.setUpdatedBy(user.getName());
metricRepository.updateMetric(metricDO);
// should update modelDetail
modelService.deleteModelDetailByDimAndMetric(metricDO.getModelId(), null, Lists.newArrayList(metricDO));
modelService.deleteModelDetailByDimAndMetric(metricDO.getModelId(), null,
Lists.newArrayList(metricDO));
sendEventBatch(Lists.newArrayList(metricDO), EventType.DELETE);
}
@@ -287,7 +294,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
metricsFilter.setMetricIds(idList);
List<MetricDO> metricDOList = metricRepository.getMetrics(metricsFilter);
if (CollectionUtils.isEmpty(metricDOList)) {
throw new RuntimeException(String.format("the metrics %s not exist", StringUtils.join(",",idList)));
throw new RuntimeException(
String.format("the metrics %s not exist", StringUtils.join(",", idList)));
}
metricDOList.forEach(metricDO -> {
metricDO.setStatus(StatusEnum.DELETED.getCode());
@@ -296,7 +304,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
});
metricRepository.batchUpdateStatus(metricDOList);
// should update modelDetail
modelService.deleteModelDetailByDimAndMetric(metricDOList.get(0).getModelId(), null, metricDOList);
modelService.deleteModelDetailByDimAndMetric(metricDOList.get(0).getModelId(), null,
metricDOList);
sendEventBatch(metricDOList, EventType.DELETE);
}
@@ -889,7 +898,8 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
private boolean isChange(MetricReq metricReq, MetricResp metricResp) {
boolean isNameChange = !metricReq.getName().equals(metricResp.getName());
boolean isBizNameChange = !Objects.equals(metricReq.getMetricDefineByMeasureParams(),metricResp.getMetricDefineByMeasureParams());
boolean isBizNameChange = !Objects.equals(metricReq.getMetricDefineByMeasureParams(),
metricResp.getMetricDefineByMeasureParams());
return isNameChange || isBizNameChange;
}
}

23
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
View File

@@ -521,13 +521,14 @@ public class ModelServiceImpl implements ModelService {
}
@Override
public void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList, List<MetricReq> metricReqList, User user) {
public void updateModelByDimAndMetric(Long modelId, List<DimensionReq> dimensionReqList,
List<MetricReq> metricReqList, User user) {
ModelDO modelDO = getModelDO(modelId);
ModelDetail modelDetail = JsonUtil.toObject(modelDO.getModelDetail(), ModelDetail.class);
if (!CollectionUtils.isEmpty(dimensionReqList)) {
dimensionReqList.forEach(dimensionReq -> {
Optional<Dimension> dimOptional = modelDetail.getDimensions().stream()
.filter(dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
Optional<Dimension> dimOptional = modelDetail.getDimensions().stream().filter(
dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
.findFirst();
if (dimOptional.isPresent()) {
Dimension dimension = dimOptional.get();
@@ -547,10 +548,13 @@ public class ModelServiceImpl implements ModelService {
if (!CollectionUtils.isEmpty(metricReqList)) {
// 目前modeltail中的measure
Map<String, Measure> mesureMap = modelDetail.getMeasures().stream().collect(Collectors.toMap(Measure::getBizName, a -> a, (k1, k2) -> k1));
Map<String, Measure> mesureMap = modelDetail.getMeasures().stream()
.collect(Collectors.toMap(Measure::getBizName, a -> a, (k1, k2) -> k1));
metricReqList.forEach(metricReq -> {
if (null != metricReq.getMetricDefineByMeasureParams() && !CollectionUtils.isEmpty(metricReq.getMetricDefineByMeasureParams().getMeasures())) {
for(Measure alterMeasure : metricReq.getMetricDefineByMeasureParams().getMeasures()) {
if (null != metricReq.getMetricDefineByMeasureParams() && !CollectionUtils
.isEmpty(metricReq.getMetricDefineByMeasureParams().getMeasures())) {
for (Measure alterMeasure : metricReq.getMetricDefineByMeasureParams()
.getMeasures()) {
if (mesureMap.containsKey(alterMeasure.getBizName())) {
Measure measure = mesureMap.get(alterMeasure.getBizName());
BeanUtils.copyProperties(alterMeasure, measure);
@@ -569,13 +573,14 @@ public class ModelServiceImpl implements ModelService {
}
@Override
public void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionList, List<MetricDO> metricReqList) {
public void deleteModelDetailByDimAndMetric(Long modelId, List<DimensionDO> dimensionList,
List<MetricDO> metricReqList) {
ModelDO modelDO = getModelDO(modelId);
ModelDetail modelDetail = JsonUtil.toObject(modelDO.getModelDetail(), ModelDetail.class);
if (!CollectionUtils.isEmpty(dimensionList)) {
dimensionList.forEach(dimensionReq -> {
Optional<Dimension> dimOptional = modelDetail.getDimensions().stream()
.filter(dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
Optional<Dimension> dimOptional = modelDetail.getDimensions().stream().filter(
dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
.findFirst();
if (dimOptional.isPresent()) {
Dimension dimension = dimOptional.get();

3
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DataSetSchemaBuilder.java
View File

@@ -198,8 +198,7 @@ public class DataSetSchemaBuilder {
}).collect(Collectors.toList());
}
private static void setDefaultTimeFormat(SchemaElement dimToAdd,
String timeFormat) {
private static void setDefaultTimeFormat(SchemaElement dimToAdd, String timeFormat) {
dimToAdd.getExtInfo().put(DimensionConstants.DIMENSION_TIME_FORMAT, timeFormat);
}
}

3
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java
View File

@@ -56,7 +56,8 @@ public class MetricCheckUtils {
if (StringUtils.isBlank(expr)) {
throw new InvalidArgumentException("表达式不可为空");
}
String forbiddenCharacters = NameCheckUtils.findForbiddenCharacters(metricReq.getName());
String forbiddenCharacters =
NameCheckUtils.findForbiddenCharacters(metricReq.getName());
if (StringUtils.isNotBlank(forbiddenCharacters)) {
throw new InvalidArgumentException(
String.format("名称包含特殊字符%s, 请修改", forbiddenCharacters));

15
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
View File

@@ -294,7 +294,8 @@ public class ModelConverter {
List<Dimension> dimensions = modelReq.getModelDetail().getDimensions();
List<Identify> identifiers = modelReq.getModelDetail().getIdentifiers();
List<Field> fields = modelReq.getModelDetail().getFields();
List<String> fieldNames = fields.stream().map(Field::getFieldName).collect(Collectors.toList());
List<String> fieldNames =
fields.stream().map(Field::getFieldName).collect(Collectors.toList());
if (measures != null) {
for (Measure measure : measures) {
@@ -302,7 +303,8 @@ public class ModelConverter {
&& StringUtils.isBlank(measure.getExpr())) {
measure.setExpr(measure.getBizName());
}
if (StringUtils.isNotBlank(measure.getBizName()) && !fieldNames.contains(measure.getBizName())) {
if (StringUtils.isNotBlank(measure.getBizName())
&& !fieldNames.contains(measure.getBizName())) {
fields.add(new Field(measure.getBizName(), ""));
}
}
@@ -313,18 +315,21 @@ public class ModelConverter {
&& StringUtils.isBlank(dimension.getExpr())) {
dimension.setExpr(dimension.getBizName());
}
if (StringUtils.isNotBlank(dimension.getBizName()) && !fieldNames.contains(dimension.getBizName())) {
if (StringUtils.isNotBlank(dimension.getBizName())
&& !fieldNames.contains(dimension.getBizName())) {
fields.add(new Field(dimension.getBizName(), ""));
}
}
}
if (identifiers != null) {
for (Identify identify : identifiers) {
if (StringUtils.isNotBlank(identify.getBizName()) && StringUtils.isBlank(identify.getName())) {
if (StringUtils.isNotBlank(identify.getBizName())
&& StringUtils.isBlank(identify.getName())) {
identify.setName(identify.getBizName());
}
identify.setIsCreateDimension(1);
if (StringUtils.isNotBlank(identify.getBizName()) && !fieldNames.contains(identify.getBizName())) {
if (StringUtils.isNotBlank(identify.getBizName())
&& !fieldNames.contains(identify.getBizName())) {
fields.add(new Field(identify.getBizName(), ""));
}
}