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

Merge pull request #193 from jipeli/master

Browse Source 
(improvement)(semantic) metric table add agg option
This commit is contained in:
jipeli
2023-10-11 14:51:46 +08:00
committed by GitHub
parent 6b2a14e589 c14d4e59d4
commit 65f48dd789
9 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/enums/AggOption.java Normal file
View File

@@ -0,0 +1,15 @@
package com.tencent.supersonic.semantic.api.query.enums;
public enum AggOption {
NATIVE,
AGGREGATION,
DEFAULT;
public static AggOption getAggregation(boolean isNativeQuery) {
return isNativeQuery ? NATIVE : AGGREGATION;
}
public static boolean isAgg(AggOption aggOption) {
return NATIVE.equals(aggOption) ? false : true;
}
}

3
semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/pojo/MetricTable.java
View File

@@ -1,5 +1,6 @@
package com.tencent.supersonic.semantic.api.query.pojo;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import java.util.List;
import lombok.Data;
@@ -10,6 +11,6 @@ public class MetricTable {
private List<String> metrics;
private List<String> dimensions;
private String where;
private boolean isAgg = false;
private AggOption aggOption = AggOption.DEFAULT;
}

7
semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/QueryParser.java
View File

@@ -1,5 +1,6 @@
package com.tencent.supersonic.semantic.query.parser;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.pojo.MetricTable;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq;
@@ -60,7 +61,7 @@ public class QueryParser {
metricReq.setDimensions(metricTable.getDimensions());
metricReq.setWhere(formatWhere(metricTable.getWhere()));
metricReq.setRootPath(sqlCommend.getRootPath());
QueryStatement tableSql = parser(metricReq, metricTable.isAgg());
QueryStatement tableSql = parser(metricReq, metricTable.getAggOption());
if (!tableSql.isOk()) {
queryStatement.setErrMsg(String.format("parser table [%s] error [%s]", metricTable.getAlias(),
tableSql.getErrMsg()));
@@ -96,10 +97,10 @@ public class QueryParser {
}
public QueryStatement parser(MetricReq metricCommand) {
return parser(metricCommand, !metricCommand.isNativeQuery());
return parser(metricCommand, AggOption.getAggregation(metricCommand.isNativeQuery()));
}
public QueryStatement parser(MetricReq metricCommand, boolean isAgg) {
public QueryStatement parser(MetricReq metricCommand, AggOption isAgg) {
log.info("parser MetricReq [{}] isAgg [{}]", metricCommand, isAgg);
QueryStatement queryStatement = new QueryStatement();
if (metricCommand.getRootPath().isEmpty()) {

3
semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/SqlParser.java
View File

@@ -1,9 +1,10 @@
package com.tencent.supersonic.semantic.query.parser;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
import com.tencent.supersonic.semantic.model.domain.Catalog;
import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement;
public interface SqlParser {
QueryStatement explain(MetricReq metricReq, boolean isAgg, Catalog catalog) throws Exception;
QueryStatement explain(MetricReq metricReq, AggOption aggOption, Catalog catalog) throws Exception;
}

3
semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/CalciteSqlParser.java
View File

@@ -1,5 +1,6 @@
package com.tencent.supersonic.semantic.query.parser.calcite;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
import com.tencent.supersonic.semantic.model.domain.Catalog;
import com.tencent.supersonic.semantic.query.parser.SqlParser;
@@ -19,7 +20,7 @@ public class CalciteSqlParser implements SqlParser {
}
@Override
public QueryStatement explain(MetricReq metricReq, boolean isAgg, Catalog catalog) throws Exception {
public QueryStatement explain(MetricReq metricReq, AggOption isAgg, Catalog catalog) throws Exception {
QueryStatement queryStatement = new QueryStatement();
SemanticModel semanticModel = semanticSchemaManager.get(metricReq.getRootPath());
if (semanticModel == null) {

25
semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/AggPlanner.java
View File

@@ -1,6 +1,7 @@
package com.tencent.supersonic.semantic.query.parser.calcite.planner;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
import com.tencent.supersonic.semantic.query.parser.calcite.dsl.Constants;
import com.tencent.supersonic.semantic.query.parser.calcite.dsl.DataSource;
@@ -30,7 +31,8 @@ public class AggPlanner implements Planner {
private Stack<TableView> dataSets = new Stack<>();
private SqlNode parserNode;
private String sourceId;
private boolean isAgg = true;
private boolean isAgg = false;
private AggOption aggOption = AggOption.DEFAULT;
public AggPlanner(SemanticSchema schema) {
this.schema = schema;
@@ -44,10 +46,7 @@ public class AggPlanner implements Planner {
if (datasource == null || datasource.isEmpty()) {
throw new Exception("datasource not found");
}
if (Objects.nonNull(datasource.get(0).getAggTime()) && !datasource.get(0).getAggTime().equalsIgnoreCase(
Constants.DIMENSION_TYPE_TIME_GRANULARITY_NONE)) {
isAgg = true;
}
isAgg = getAgg(datasource.get(0));
sourceId = String.valueOf(datasource.get(0).getSourceId());
// build level by level
@@ -78,9 +77,21 @@ public class AggPlanner implements Planner {
return DataSourceNode.getMatchDataSources(scope, schema, metricCommand);
}
private boolean getAgg(DataSource dataSource) {
if (!AggOption.DEFAULT.equals(aggOption)) {
return AggOption.isAgg(aggOption);
}
// default by dataSource time aggregation
if (Objects.nonNull(dataSource.getAggTime()) && !dataSource.getAggTime().equalsIgnoreCase(
Constants.DIMENSION_TYPE_TIME_GRANULARITY_NONE)) {
return true;
}
return isAgg;
}
@Override
public void explain(MetricReq metricCommand, boolean isAgg) throws Exception {
public void explain(MetricReq metricCommand, AggOption aggOption) throws Exception {
this.metricCommand = metricCommand;
if (metricCommand.getMetrics() == null) {
metricCommand.setMetrics(new ArrayList<>());
@@ -91,7 +102,7 @@ public class AggPlanner implements Planner {
if (metricCommand.getLimit() == null) {
metricCommand.setLimit(0L);
}
this.isAgg = isAgg;
this.aggOption = aggOption;
// build a parse Node
parse();
// optimizer

3
semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/calcite/planner/Planner.java
View File

@@ -1,11 +1,12 @@
package com.tencent.supersonic.semantic.query.parser.calcite.planner;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
public interface Planner {
public void explain(MetricReq metricCommand, boolean isAgg) throws Exception;
public void explain(MetricReq metricCommand, AggOption aggOption) throws Exception;
public String getSql();

5
semantic/query/src/main/java/com/tencent/supersonic/semantic/query/parser/convert/CalculateAggConverter.java
View File

@@ -6,6 +6,7 @@ import com.tencent.supersonic.common.pojo.Constants;
import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
import com.tencent.supersonic.common.util.ContextUtils;
import com.tencent.supersonic.semantic.api.model.response.DatabaseResp;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.pojo.MetricTable;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq;
@@ -75,7 +76,7 @@ public class CalculateAggConverter implements SemanticConverter {
String where = queryStructUtils.generateWhere(queryStructCmd);
log.info("in generateSqlCommand, complete where:{}", where);
metricTable.setWhere(where);
metricTable.setAgg(true);
metricTable.setAggOption(AggOption.AGGREGATION);
sqlCommand.setTables(new ArrayList<>(Collections.singletonList(metricTable)));
String sql = String.format("select %s from %s %s %s %s", sqlGenerateUtils.getSelect(queryStructCmd),
metricTableName,
@@ -159,7 +160,7 @@ public class CalculateAggConverter implements SemanticConverter {
String where = queryStructUtils.generateWhere(queryStructCmd);
log.info("in generateSqlCommend, complete where:{}", where);
metricTable.setWhere(where);
metricTable.setAgg(true);
metricTable.setAggOption(AggOption.AGGREGATION);
sqlCommand.setTables(new ArrayList<>(Collections.singletonList(metricTable)));
boolean isOver = isOverRatio(queryStructCmd);
String sql = "";

3
semantic/query/src/test/java/com/tencent/supersonic/semantic/query/domain/calcite/SemanticParserServiceTest.java
View File

@@ -8,6 +8,7 @@ import com.tencent.supersonic.semantic.api.model.yaml.MeasureYamlTpl;
import com.tencent.supersonic.semantic.api.model.yaml.MetricTypeParamsYamlTpl;
import com.tencent.supersonic.semantic.api.model.yaml.MetricYamlTpl;
import com.tencent.supersonic.semantic.api.model.response.SqlParserResp;
import com.tencent.supersonic.semantic.api.query.enums.AggOption;
import com.tencent.supersonic.semantic.api.query.request.MetricReq;
import com.tencent.supersonic.common.pojo.ColumnOrder;
import com.tencent.supersonic.semantic.query.parser.calcite.SemanticSchemaManager;
@@ -37,7 +38,7 @@ class SemanticParserServiceTest {
return sqlParser;
}
AggPlanner aggBuilder = new AggPlanner(semanticSchema);
aggBuilder.explain(metricCommand, isAgg);
aggBuilder.explain(metricCommand, AggOption.getAggregation(!isAgg));
sqlParser.setSql(aggBuilder.getSql());
sqlParser.setSourceId(aggBuilder.getSourceId());
} catch (Exception e) {