Merge aaf2d46a56 into 75f623404d

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

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