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

(improvement)(headless) If no time partition is configured, the metric market does not support querying by time (#1531)

Browse Source
This commit is contained in:
lexluo09
2024-08-07 22:41:04 +08:00
committed by GitHub
parent 82f86a8635
commit b8aeff9a6a
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/MetricResp.java
View File

@@ -69,6 +69,8 @@ public class MetricResp extends SchemaItem {
private String defaultAgg; private String defaultAgg;
private boolean containsPartitionDimensions;
public void setClassifications(String tag) { public void setClassifications(String tag) {
if (StringUtils.isBlank(tag)) { if (StringUtils.isBlank(tag)) {
classifications = Lists.newArrayList(); classifications = Lists.newArrayList();

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

@@ -529,7 +529,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
if (metricDO == null) { if (metricDO == null) {
return null; return null;
} }
ModelFilter modelFilter = new ModelFilter(false, ModelFilter modelFilter = new ModelFilter(true,
Lists.newArrayList(metricDO.getModelId())); Lists.newArrayList(metricDO.getModelId()));
Map<Long, ModelResp> modelMap = modelService.getModelMap(modelFilter); Map<Long, ModelResp> modelMap = modelService.getModelMap(modelFilter);
List<CollectDO> collectList = collectService.getCollectionList(user.getName(), TypeEnums.METRIC); List<CollectDO> collectList = collectService.getCollectionList(user.getName(), TypeEnums.METRIC);

11
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricConverter.java
View File

@@ -7,16 +7,18 @@ import com.tencent.supersonic.common.pojo.enums.PublishEnum;
import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.StatusEnum;
import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.enums.TypeEnums;
import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.common.util.BeanMapper;
import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.Dim;
import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams;
import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams;
import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMetricParams;
import com.tencent.supersonic.headless.api.pojo.RelateDimension; import com.tencent.supersonic.headless.api.pojo.RelateDimension;
import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType;
import com.tencent.supersonic.headless.api.pojo.request.MetricReq; import com.tencent.supersonic.headless.api.pojo.request.MetricReq;
import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
import com.tencent.supersonic.headless.api.pojo.response.MetricResp; import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
import com.tencent.supersonic.headless.api.pojo.response.ModelResp; import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO; import com.tencent.supersonic.headless.server.persistence.dataobject.MetricDO;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import java.util.HashMap; import java.util.HashMap;
@@ -78,7 +80,12 @@ public class MetricConverter {
metricResp.setModelName(modelResp.getName()); metricResp.setModelName(modelResp.getName());
metricResp.setModelBizName(modelResp.getBizName()); metricResp.setModelBizName(modelResp.getBizName());
metricResp.setDomainId(modelResp.getDomainId()); metricResp.setDomainId(modelResp.getDomainId());
List<Dim> timeDims = modelResp.getTimeDimension();
if (CollectionUtils.isNotEmpty(timeDims)) {
metricResp.setContainsPartitionDimensions(true);
}
} }
metricResp.setIsCollect(collect != null && collect.contains(metricDO.getId())); metricResp.setIsCollect(collect != null && collect.contains(metricDO.getId()));
metricResp.setClassifications(metricDO.getClassifications()); metricResp.setClassifications(metricDO.getClassifications());
metricResp.setRelateDimension(JSONObject.parseObject(metricDO.getRelateDimensions(), metricResp.setRelateDimension(JSONObject.parseObject(metricDO.getRelateDimensions(),