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

(improvement)(Headless) Fix displaying the final executed SQL. (#667)

Browse Source
This commit is contained in:
lexluo09
2024-01-19 22:52:20 +08:00
committed by GitHub
parent 9c6bd7cf19
commit f154c2a2b4
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/QueryParser.java
View File

@@ -117,8 +117,7 @@ public class QueryParser {
return queryStatement; return queryStatement;
} }
try { try {
queryStatement = ComponentFactory.getSqlParser().explain(queryStatement, isAgg); return ComponentFactory.getSqlParser().explain(queryStatement, isAgg);
return queryStatement;
} catch (Exception e) { } catch (Exception e) {
queryStatement.setErrMsg(e.getMessage()); queryStatement.setErrMsg(e.getMessage());
log.error("parser error metricQueryReq[{}] error [{}]", metricQueryReq, e); log.error("parser error metricQueryReq[{}] error [{}]", metricQueryReq, e);

7
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/QueryServiceImpl.java
View File

@@ -316,6 +316,7 @@ public class QueryServiceImpl implements QueryService {
if (QueryType.SQL.equals(queryTypeEnum) && queryReq instanceof QuerySqlReq) { if (QueryType.SQL.equals(queryTypeEnum) && queryReq instanceof QuerySqlReq) {
QueryStatement queryStatement = convertToQueryStatement((QuerySqlReq) queryReq, user); QueryStatement queryStatement = convertToQueryStatement((QuerySqlReq) queryReq, user);
queryStatement = plan(queryStatement);
return getExplainResp(queryStatement); return getExplainResp(queryStatement);
} }
if (QueryType.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryStructReq) { if (QueryType.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryStructReq) {
@@ -326,6 +327,7 @@ public class QueryServiceImpl implements QueryService {
if (QueryType.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryMultiStructReq) { if (QueryType.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryMultiStructReq) {
QueryMultiStructReq queryMultiStructReq = (QueryMultiStructReq) queryReq; QueryMultiStructReq queryMultiStructReq = (QueryMultiStructReq) queryReq;
QueryStatement queryStatement = buildQueryStatement(queryMultiStructReq); QueryStatement queryStatement = buildQueryStatement(queryMultiStructReq);
queryStatement = plan(queryStatement);
return getExplainResp(queryStatement); return getExplainResp(queryStatement);
} }
@@ -453,11 +455,6 @@ public class QueryServiceImpl implements QueryService {
return querySQLReq; return querySQLReq;
} }
private String getKeyByModelIds(List<Long> modelIds) {
return String.join(",", modelIds.stream()
.map(Object::toString).collect(Collectors.toList()));
}
private QueryStatement plan(QueryStatement queryStatement) throws Exception { private QueryStatement plan(QueryStatement queryStatement) throws Exception {
queryStatement = queryParser.parse(queryStatement); queryStatement = queryParser.parse(queryStatement);
log.info("queryStatement:{}", queryStatement); log.info("queryStatement:{}", queryStatement);