topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-01-08 18:57:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[improvement][launcher]Use API to get element ID avoiding hard-code.

Browse Source
This commit is contained in:
jerryjzhang
2024-11-27 22:26:30 +08:00
parent 25559fdaa5
commit 111304486b
5 changed files with 45 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/converter/SqlQueryConverter.java
View File

@@ -87,7 +87,7 @@ public class SqlQueryConverter implements QueryConverter {
if (!SqlSelectFunctionHelper.hasAggregateFunction(sql) && !SqlSelectHelper.hasGroupBy(sql)
&& !SqlSelectHelper.hasWith(sql) && !SqlSelectHelper.hasSubSelect(sql)) {
log.debug("getAggOption simple sql set to DEFAULT");
return AggOption.DEFAULT;
return AggOption.NATIVE;
}
// if there is no group by in S2SQL,set MetricTable's aggOption to "NATIVE"
@@ -107,7 +107,7 @@ public class SqlQueryConverter implements QueryConverter {
.count();
if (defaultAggNullCnt > 0) {
log.debug("getAggOption find null defaultAgg metric set to NATIVE");
return AggOption.OUTER;
return AggOption.DEFAULT;
}
return AggOption.DEFAULT;
}

10
headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/rest/SqlQueryApiController.java
View File

@@ -39,7 +39,7 @@ public class SqlQueryApiController {
@PostMapping("/sql")
public Object queryBySql(@RequestBody QuerySqlReq querySqlReq, HttpServletRequest request,
HttpServletResponse response) throws Exception {
HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
String sql = querySqlReq.getSql();
querySqlReq.setSql(StringUtil.replaceBackticks(sql));
@@ -49,7 +49,7 @@ public class SqlQueryApiController {
@PostMapping("/sqls")
public Object queryBySqls(@RequestBody QuerySqlsReq querySqlsReq, HttpServletRequest request,
HttpServletResponse response) throws Exception {
HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
List<SemanticQueryReq> semanticQueryReqs = querySqlsReq.getSqls().stream().map(sql -> {
QuerySqlReq querySqlReq = new QuerySqlReq();
@@ -73,7 +73,7 @@ public class SqlQueryApiController {
@PostMapping("/sqlsWithException")
public Object queryBySqlsWithException(@RequestBody QuerySqlsReq querySqlsReq,
HttpServletRequest request, HttpServletResponse response) throws Exception {
HttpServletRequest request, HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
List<SemanticQueryReq> semanticQueryReqs = querySqlsReq.getSqls().stream().map(sql -> {
QuerySqlReq querySqlReq = new QuerySqlReq();
@@ -97,7 +97,7 @@ public class SqlQueryApiController {
@PostMapping("/validate")
public Object validate(@RequestBody QuerySqlReq querySqlReq, HttpServletRequest request,
HttpServletResponse response) throws Exception {
HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
String sql = querySqlReq.getSql();
querySqlReq.setSql(StringUtil.replaceBackticks(sql));
@@ -106,7 +106,7 @@ public class SqlQueryApiController {
@PostMapping("/validateAndQuery")
public Object validateAndQuery(@RequestBody QuerySqlsReq querySqlsReq,
HttpServletRequest request, HttpServletResponse response) throws Exception {
HttpServletRequest request, HttpServletResponse response) throws Exception {
User user = UserHolder.findUser(request, response);
List<QuerySqlReq> convert = convert(querySqlsReq);
for (QuerySqlReq querySqlReq : convert) {