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

(fix)(headless)Fix NPE issue.
Some checks are pending
supersonic CentOS CI / build (21) (push) Waiting to run
Details
supersonic mac CI / build (21) (push) Waiting to run
Details
supersonic ubuntu CI / build (21) (push) Waiting to run
Details
supersonic windows CI / build (21) (push) Waiting to run
Details

Browse Source
This commit is contained in:
jerryjzhang
2025-02-23 11:39:44 +08:00
parent 75f623404d
commit 50ed340ae0
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
View File

@@ -73,15 +73,31 @@ public class SqlGenerateUtils {
public String getSelect(StructQuery structQuery) { public String getSelect(StructQuery structQuery) {
String aggStr = structQuery.getAggregators().stream().map(this::getSelectField) String aggStr = structQuery.getAggregators().stream().map(this::getSelectField)
.collect(Collectors.joining(",")); .collect(Collectors.joining(","));
return CollectionUtils.isEmpty(structQuery.getGroups()) ? aggStr String result = String.join(",", structQuery.getGroups());
: String.join(",", structQuery.getGroups()) + "," + aggStr; if (StringUtils.isNotBlank(aggStr)) {
if (!CollectionUtils.isEmpty(structQuery.getGroups())) {
result = String.join(",", structQuery.getGroups()) + "," + aggStr;
} else {
result = aggStr;
}
}
return result;
} }
public String getSelect(StructQuery structQuery, Map<String, String> deriveMetrics) { public String getSelect(StructQuery structQuery, Map<String, String> deriveMetrics) {
String aggStr = structQuery.getAggregators().stream() String aggStr = structQuery.getAggregators().stream()
.map(a -> getSelectField(a, deriveMetrics)).collect(Collectors.joining(",")); .map(a -> getSelectField(a, deriveMetrics)).collect(Collectors.joining(","));
return CollectionUtils.isEmpty(structQuery.getGroups()) ? aggStr String result = String.join(",", structQuery.getGroups());
: String.join(",", structQuery.getGroups()) + "," + aggStr; if (StringUtils.isNotBlank(aggStr)) {
if (!CollectionUtils.isEmpty(structQuery.getGroups())) {
result = String.join(",", structQuery.getGroups()) + "," + aggStr;
} else {
result = aggStr;
}
}
return result;
} }
public String getSelectField(final Aggregator agg) { public String getSelectField(final Aggregator agg) {
@@ -140,7 +156,10 @@ public class SqlGenerateUtils {
public String generateWhere(StructQuery structQuery, ItemDateResp itemDateResp) { public String generateWhere(StructQuery structQuery, ItemDateResp itemDateResp) {
String whereClauseFromFilter = String whereClauseFromFilter =
sqlFilterUtils.getWhereClause(structQuery.getDimensionFilters()); sqlFilterUtils.getWhereClause(structQuery.getDimensionFilters());
String whereFromDate = getDateWhereClause(structQuery.getDateInfo(), itemDateResp); String whereFromDate = "";
if (structQuery.getDateInfo() != null) {
whereFromDate = getDateWhereClause(structQuery.getDateInfo(), itemDateResp);
}
String mergedWhere = String mergedWhere =
mergeDateWhereClause(structQuery, whereClauseFromFilter, whereFromDate); mergeDateWhereClause(structQuery, whereClauseFromFilter, whereFromDate);
if (StringUtils.isNotBlank(mergedWhere)) { if (StringUtils.isNotBlank(mergedWhere)) {