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

(improvement)(headless) performParsed skip translation (#1222)

Browse Source
This commit is contained in:
jipeli
2024-06-25 20:40:41 +08:00
committed by GitHub
parent 5ce81b3724
commit db9a3fa056
14 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/ChatQueryServiceImpl.java
View File

@@ -240,6 +240,7 @@ public class ChatQueryServiceImpl implements ChatQueryService {
ExplainResp explain = semanticLayerService.explain(explainSqlReq, user);
if (StringUtils.isNotBlank(explain.getSql())) {
parseInfo.getSqlInfo().setQuerySQL(explain.getSql());
parseInfo.getSqlInfo().setSourceId(explain.getSourceId());
}
} else {
log.info("rule begin replace metrics and revise filters!");

1
headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/SqlInfoProcessor.java
View File

@@ -79,6 +79,7 @@ public class SqlInfoProcessor implements ResultProcessor {
sqlInfo.getS2SQL(), sqlInfo.getCorrectS2SQL(), explainSql);
}
sqlInfo.setQuerySQL(explainSql);
sqlInfo.setSourceId(explain.getSourceId());
}
}

6
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java
View File

@@ -151,19 +151,19 @@ public class QueryReqConverter {
if (!SqlSelectFunctionHelper.hasAggregateFunction(sql)
|| SqlSelectFunctionHelper.hasFunction(sql, "count")
|| SqlSelectFunctionHelper.hasFunction(sql, "count_distinct")) {
return AggOption.NATIVE;
return AggOption.OUTER;
}
if (databaseReq.isInnerLayerNative()) {
return AggOption.NATIVE;
}
if (SqlSelectHelper.hasSubSelect(sql) || SqlSelectHelper.hasWith(sql) || SqlSelectHelper.hasGroupBy(sql)) {
return AggOption.NATIVE;
return AggOption.OUTER;
}
long defaultAggNullCnt = metricSchemas.stream()
.filter(m -> Objects.isNull(m.getDefaultAgg()) || Strings.isBlank(m.getDefaultAgg())).count();
if (defaultAggNullCnt > 0) {
log.info("getAggOption find null defaultAgg metric set to NATIVE");
return AggOption.NATIVE;
return AggOption.OUTER;
}
return AggOption.DEFAULT;
}

24
headless/server/src/main/java/com/tencent/supersonic/headless/server/web/service/impl/S2SemanticLayerService.java
View File

@@ -18,6 +18,7 @@ import com.tencent.supersonic.headless.api.pojo.SchemaElement;
import com.tencent.supersonic.headless.api.pojo.SchemaElementType;
import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
import com.tencent.supersonic.headless.api.pojo.SemanticSchema;
import com.tencent.supersonic.headless.api.pojo.SqlInfo;
import com.tencent.supersonic.headless.api.pojo.TagTypeDefaultConfig;
import com.tencent.supersonic.headless.api.pojo.TimeDefaultConfig;
import com.tencent.supersonic.headless.api.pojo.request.ExplainSqlReq;
@@ -172,6 +173,10 @@ public class S2SemanticLayerService implements SemanticLayerService {
}
private QueryStatement buildQueryStatement(SemanticQueryReq semanticQueryReq, User user) throws Exception {
if (Objects.nonNull(semanticQueryReq.getSqlInfo()) && StringUtils.isNotBlank(
semanticQueryReq.getSqlInfo().getQuerySQL())) {
return buildSqlInfoStatement(semanticQueryReq.getSqlInfo(), semanticQueryReq.getDataSetId());
}
if (semanticQueryReq instanceof QuerySqlReq) {
return buildSqlQueryStatement((QuerySqlReq) semanticQueryReq, user);
}
@@ -215,6 +220,15 @@ public class S2SemanticLayerService implements SemanticLayerService {
return queryUtils.sqlParserUnion(queryMultiStructReq, sqlParsers);
}
private QueryStatement buildSqlInfoStatement(SqlInfo sqlInfo, Long dataSetId) {
QueryStatement queryStatement = new QueryStatement();
queryStatement.setSql(sqlInfo.getQuerySQL());
queryStatement.setSourceId(sqlInfo.getSourceId());
queryStatement.setDataSetId(dataSetId);
queryStatement.setIsTranslated(true);
return queryStatement;
}
private SchemaFilterReq buildSchemaFilterReq(SemanticQueryReq semanticQueryReq) {
SchemaFilterReq schemaFilterReq = new SchemaFilterReq();
schemaFilterReq.setDataSetId(semanticQueryReq.getDataSetId());
@@ -242,10 +256,12 @@ public class S2SemanticLayerService implements SemanticLayerService {
semanticTranslator.translate(queryStatement);
String sql = "";
String sorceId = "";
if (Objects.nonNull(queryStatement)) {
sql = queryStatement.getSql();
sorceId = queryStatement.getSourceId();
}
return ExplainResp.builder().sql(sql).build();
return ExplainResp.builder().sql(sql).sourceId(sorceId).build();
}
private QuerySqlReq buildQuerySqlReq(QueryDimValueReq queryDimValueReq) {
@@ -270,7 +286,9 @@ public class S2SemanticLayerService implements SemanticLayerService {
SemanticQueryResp semanticQueryResp = null;
try {
//1 translate
semanticTranslator.translate(queryStatement);
if (!queryStatement.isTranslated()) {
semanticTranslator.translate(queryStatement);
}
//2 execute
for (QueryExecutor queryExecutor : ComponentFactory.getQueryExecutors()) {
@@ -381,7 +399,7 @@ public class S2SemanticLayerService implements SemanticLayerService {
}
private SemanticQueryResp getQueryResultWithSchemaResp(EntityInfo entityInfo,
DataSetSchema dataSetSchema, User user) {
DataSetSchema dataSetSchema, User user) {
SemanticParseInfo semanticParseInfo = new SemanticParseInfo();
semanticParseInfo.setDataSet(dataSetSchema.getDataSet());
semanticParseInfo.setQueryType(QueryType.DETAIL);