fix some warning (#859)

This commit is contained in:
Guangdong Liu
2024-03-25 20:32:53 +08:00
committed by GitHub
parent f6aefe2fb0
commit cf4f58c7e9

View File

@@ -1,5 +1,6 @@
package com.tencent.supersonic.headless.core.parser; package com.tencent.supersonic.headless.core.parser;
import cn.hutool.core.exceptions.ExceptionUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.tencent.supersonic.common.util.StringUtil; import com.tencent.supersonic.common.util.StringUtil;
import com.tencent.supersonic.headless.api.pojo.MetricTable; import com.tencent.supersonic.headless.api.pojo.MetricTable;
@@ -67,7 +68,7 @@ public class DefaultQueryParser implements QueryParser {
try { try {
if (!CollectionUtils.isEmpty(dataSetQueryParam.getTables())) { if (!CollectionUtils.isEmpty(dataSetQueryParam.getTables())) {
List<String[]> tables = new ArrayList<>(); List<String[]> tables = new ArrayList<>();
Boolean isSingleTable = dataSetQueryParam.getTables().size() == 1; boolean isSingleTable = dataSetQueryParam.getTables().size() == 1;
for (MetricTable metricTable : dataSetQueryParam.getTables()) { for (MetricTable metricTable : dataSetQueryParam.getTables()) {
QueryStatement tableSql = parserSql(metricTable, isSingleTable, dataSetQueryParam, queryStatement); QueryStatement tableSql = parserSql(metricTable, isSingleTable, dataSetQueryParam, queryStatement);
if (isSingleTable && Objects.nonNull(tableSql.getDataSetQueryParam()) if (isSingleTable && Objects.nonNull(tableSql.getDataSetQueryParam())
@@ -79,11 +80,10 @@ public class DefaultQueryParser implements QueryParser {
tables.add(new String[]{metricTable.getAlias(), tableSql.getSql()}); tables.add(new String[]{metricTable.getAlias(), tableSql.getSql()});
} }
if (!tables.isEmpty()) { if (!tables.isEmpty()) {
String sql = ""; String sql;
if (dataSetQueryParam.isSupportWith()) { if (dataSetQueryParam.isSupportWith()) {
sql = "with " + String.join(",", sql = "with " + tables.stream().map(t -> String.format("%s as (%s)", t[0], t[1])).collect(
tables.stream().map(t -> String.format("%s as (%s)", t[0], t[1])).collect( Collectors.joining(",")) + "\n" + dataSetQueryParam.getSql();
Collectors.toList())) + "\n" + dataSetQueryParam.getSql();
} else { } else {
sql = dataSetQueryParam.getSql(); sql = dataSetQueryParam.getSql();
for (String[] tb : tables) { for (String[] tb : tables) {
@@ -97,7 +97,7 @@ public class DefaultQueryParser implements QueryParser {
} }
} }
} catch (Exception e) { } catch (Exception e) {
log.error("physicalSql error {}", e); log.error("physicalSql error {}", ExceptionUtil.getMessage(e));
queryStatement.setErrMsg(e.getMessage()); queryStatement.setErrMsg(e.getMessage());
} }
return queryStatement; return queryStatement;
@@ -114,7 +114,7 @@ public class DefaultQueryParser implements QueryParser {
return ComponentFactory.getSqlParser().explain(queryStatement, isAgg); return ComponentFactory.getSqlParser().explain(queryStatement, isAgg);
} catch (Exception e) { } catch (Exception e) {
queryStatement.setErrMsg(e.getMessage()); queryStatement.setErrMsg(e.getMessage());
log.error("parser error metricQueryReq[{}] error [{}]", metricQueryParam, e); log.error("parser error metricQueryReq[{}] error [{}]", metricQueryParam, ExceptionUtil.getMessage(e));
} }
return queryStatement; return queryStatement;
} }