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][headless] Fix the null pointer issue when handling execution permissions and retrieving recommended metrics (#1780)

Browse Source
This commit is contained in:
lexluo09
2024-10-10 23:22:48 +08:00
committed by GitHub
parent 484861571f
commit 0fe7f0e1a7
4 changed files with 72 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java
View File

@@ -43,6 +43,7 @@ import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors;
import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT;
import static com.tencent.supersonic.common.pojo.Constants.DAY_FORMAT_INT;
@@ -51,7 +52,9 @@ import static com.tencent.supersonic.common.pojo.Constants.MONTH_FORMAT_INT;
import static com.tencent.supersonic.common.pojo.Constants.TIMES_FORMAT;
import static com.tencent.supersonic.common.pojo.Constants.TIME_FORMAT;
/** Add ratio queries for metric queries. */
/**
* Add ratio queries for metric queries.
*/
@Slf4j
public class MetricRatioProcessor implements ExecuteResultProcessor {
@@ -71,10 +74,8 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
public AggregateInfo getAggregateInfo(User user, SemanticParseInfo semanticParseInfo,
QueryResult queryResult) {
Set<String> resultMetricNames = getResultMetricNames(queryResult);
Set<String> resultMetricNames = new HashSet<>();
queryResult.getQueryColumns().stream().forEach(
c -> resultMetricNames.addAll(SqlSelectHelper.getColumnFromExpr(c.getNameEn())));
Optional<SchemaElement> ratioMetric = semanticParseInfo.getMetrics().stream()
.filter(m -> resultMetricNames.contains(m.getBizName())).findFirst();
@@ -92,17 +93,20 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
if (!lastDayOp.isPresent()) {
return new AggregateInfo();
}
Optional<Map<String, Object>> lastValue = queryResult.getQueryResults().stream()
.filter(r -> r.get(dateField).toString().equals(lastDayOp.get())).findFirst();
MetricInfo metricInfo = new MetricInfo();
metricInfo.setStatistics(new HashMap<>());
if (lastValue.isPresent()
&& lastValue.get().containsKey(ratioMetric.get().getBizName())) {
DecimalFormat df = new DecimalFormat("#.####");
metricInfo.setValue(df.format(lastValue.get().get(ratioMetric.get().getBizName())));
}
metricInfo.setDate(lastValue.get().get(dateField).toString());
lastValue.ifPresent(value -> {
if (value.containsKey(ratioMetric.get().getBizName())) {
DecimalFormat df = new DecimalFormat("#.####");
metricInfo.setValue(df.format(value.get(ratioMetric.get().getBizName())));
}
metricInfo.setDate(value.get(dateField).toString());
});
CompletableFuture<MetricInfo> metricInfoRoll =
CompletableFuture.supplyAsync(() -> queryRatio(user, semanticParseInfo,
@@ -110,11 +114,14 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
CompletableFuture<MetricInfo> metricInfoOver =
CompletableFuture.supplyAsync(() -> queryRatio(user, semanticParseInfo,
ratioMetric.get(), AggOperatorEnum.RATIO_OVER, queryResult));
CompletableFuture.allOf(metricInfoRoll, metricInfoOver);
CompletableFuture.allOf(metricInfoRoll, metricInfoOver).join();
metricInfo.setName(metricInfoRoll.get().getName());
metricInfo.setValue(metricInfoRoll.get().getValue());
metricInfo.getStatistics().putAll(metricInfoRoll.get().getStatistics());
metricInfo.getStatistics().putAll(metricInfoOver.get().getStatistics());
aggregateInfo.getMetricInfos().add(metricInfo);
} catch (Exception e) {
log.error("queryRatio error {}", e);
@@ -122,6 +129,15 @@ public class MetricRatioProcessor implements ExecuteResultProcessor {
return aggregateInfo;
}
private static Set<String> getResultMetricNames(QueryResult queryResult) {
if (queryResult.getQueryColumns() == null) {
return new HashSet<>();
}
return queryResult.getQueryColumns().stream()
.flatMap(c -> SqlSelectHelper.getColumnFromExpr(c.getNameEn()).stream())
.collect(Collectors.toSet());
}
@SneakyThrows
private MetricInfo queryRatio(User user, SemanticParseInfo semanticParseInfo,
SchemaElement metric, AggOperatorEnum aggOperatorEnum, QueryResult queryResult) {