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

(improvement)(chat) add addAggregateToMetric in GlobalAfterCorrector and fix getAgg null (#152)

Browse Source
This commit is contained in:
lexluo09
2023-09-27 12:55:59 +08:00
committed by GitHub
parent 24e8e756de
commit df7fea9ee3
4 changed files with 51 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/CatalogImpl.java
View File

@@ -23,6 +23,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -103,22 +104,33 @@ public class CatalogImpl implements Catalog {
@Override
public String getAgg(Long modelId, String metricBizName) {
List<MetricResp> metricResps = getMetrics(modelId);
if (!CollectionUtils.isEmpty(metricResps)) {
Optional<MetricResp> metric = metricResps.stream()
.filter(m -> m.getBizName().equalsIgnoreCase(metricBizName)).findFirst();
if (metric.isPresent() && Objects.nonNull(metric.get().getTypeParams()) && !CollectionUtils.isEmpty(
metric.get().getTypeParams().getMeasures())) {
List<MeasureResp> measureRespList = datasourceService.getMeasureListOfModel(modelId);
if (!CollectionUtils.isEmpty(measureRespList)) {
String measureName = metric.get().getTypeParams().getMeasures().get(0).getBizName();
Optional<MeasureResp> measure = measureRespList.stream()
.filter(m -> m.getBizName().equalsIgnoreCase(measureName)).findFirst();
if (measure.isPresent()) {
return measure.get().getAgg();
try {
List<MetricResp> metricResps = getMetrics(modelId);
if (!CollectionUtils.isEmpty(metricResps)) {
Optional<MetricResp> metric = metricResps.stream()
.filter(m -> m.getBizName().equalsIgnoreCase(metricBizName)).findFirst();
if (metric.isPresent() && Objects.nonNull(metric.get().getTypeParams()) && !CollectionUtils.isEmpty(
metric.get().getTypeParams().getMeasures())) {
List<MeasureResp> measureRespList = datasourceService.getMeasureListOfModel(modelId);
if (!CollectionUtils.isEmpty(measureRespList)) {
String measureName = metric.get().getTypeParams().getMeasures().get(0).getBizName();
Optional<MeasureResp> measure = measureRespList.stream()
.filter(Objects::nonNull)
.filter(m -> {
if (StringUtils.isNotEmpty(m.getBizName())) {
return m.getBizName().equalsIgnoreCase(measureName);
}
return false;
})
.findFirst();
if (measure.isPresent()) {
return measure.get().getAgg();
}
}
}
}
} catch (Exception e) {
log.error("getAgg:", e);
}
return "";
}