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

(improvement)(chat) support show sum metric in chinese name and support multiple conditions in having and if not exist metirc than not addAggregateToMetric (#165)

Browse Source
This commit is contained in:
lexluo09
2023-09-30 23:35:58 +08:00
committed by GitHub
parent 2a6391a2ee
commit 741ed4191b
6 changed files with 46 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByReplaceVisitor.java
View File

@@ -2,6 +2,7 @@ package com.tencent.supersonic.common.util.jsqlparser;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import lombok.extern.slf4j.Slf4j;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.expression.Expression;
@@ -32,8 +33,12 @@ public class GroupByReplaceVisitor implements GroupByVisitor {
for (int i = 0; i < groupByExpressions.size(); i++) {
Expression expression = groupByExpressions.get(i);
String replaceColumn = parseVisitorHelper.getReplaceColumn(expression.toString(), fieldNameMap,
String columnName = expression.toString();
if (expression instanceof Function && Objects.nonNull(
((Function) expression).getParameters().getExpressions().get(0))) {
columnName = ((Function) expression).getParameters().getExpressions().get(0).toString();
}
String replaceColumn = parseVisitorHelper.getReplaceColumn(columnName, fieldNameMap,
exactReplace);
if (StringUtils.isNotEmpty(replaceColumn)) {
if (expression instanceof Column) {

7
common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserUpdateHelper.java
View File

@@ -468,7 +468,12 @@ public class SqlParserUpdateHelper {
List<Expression> waitingForAdds = visitor.getWaitingForAdds();
if (!CollectionUtils.isEmpty(waitingForAdds)) {
for (Expression waitingForAdd : waitingForAdds) {
plainSelect.setHaving(waitingForAdd);
Expression having = plainSelect.getHaving();
if (Objects.isNull(having)) {
plainSelect.setHaving(waitingForAdd);
} else {
plainSelect.setHaving(new AndExpression(having, waitingForAdd));
}
}
}
return selectStatement.toString();