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

[improvement][headless]Simplify query sql and fix demo.
Some checks failed
supersonic CentOS CI / build (21) (push) Has been cancelled
Details
supersonic mac CI / build (21) (push) Has been cancelled
Details
supersonic ubuntu CI / build (21) (push) Has been cancelled
Details
supersonic windows CI / build (21) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
jerryjzhang
2024-12-31 09:13:56 +08:00
parent a2f54d4c80
commit a46e89af56
7 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/SqlQueryParser.java
View File

@@ -65,7 +65,7 @@ public class SqlQueryParser implements QueryParser {
// check if there are fields not matched with any metric or dimension
if (allFields.size() > metricSchemas.size() + dimensions.size()) {
queryStatement
.setErrMsg("There are fields in the SQL not matched with any semantic column.");
.setErrMsg("There are querying columns in the SQL not matched with any semantic field.");
queryStatement.setStatus(1);
return;
}

5
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/node/DimensionNode.java
View File

@@ -14,7 +14,10 @@ public class DimensionNode extends SemanticNode {
public static SqlNode build(Dimension dimension, SqlValidatorScope scope, EngineType engineType)
throws Exception {
SqlNode sqlNode = parse(dimension.getExpr(), scope, engineType);
return buildAs(dimension.getName(), sqlNode);
if (!dimension.getName().equals(dimension.getExpr())) {
sqlNode = buildAs(dimension.getName(), sqlNode);
}
return sqlNode;
}
public static List<SqlNode> expand(Dimension dimension, SqlValidatorScope scope,

6
headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/node/MeasureNode.java
View File

@@ -9,7 +9,11 @@ public class MeasureNode extends SemanticNode {
public static SqlNode buildNonAgg(String alias, Measure measure, SqlValidatorScope scope,
EngineType engineType) throws Exception {
return buildAs(measure.getName(), getExpr(measure, alias, scope, engineType));
if (measure.getExpr() == null) {
return getExpr(measure, alias, scope, engineType);
} else {
return buildAs(measure.getName(), getExpr(measure, alias, scope, engineType));
}
}
public static SqlNode buildAgg(Measure measure, boolean noAgg, SqlValidatorScope scope,

8
headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java
View File

@@ -317,12 +317,12 @@ public class SqlGenerateUtils {
public String getExpr(Measure measure, AggOption aggOption) {
if (AggOperatorEnum.COUNT_DISTINCT.getOperator().equalsIgnoreCase(measure.getAgg())) {
return AggOption.NATIVE.equals(aggOption) ? measure.getBizName()
return AggOption.NATIVE.equals(aggOption) ? measure.getExpr()
: AggOperatorEnum.COUNT.getOperator() + " ( " + AggOperatorEnum.DISTINCT + " "
+ measure.getBizName() + " ) ";
+ measure.getExpr() + " ) ";
}
return AggOption.NATIVE.equals(aggOption) ? measure.getBizName()
: measure.getAgg() + " ( " + measure.getBizName() + " ) ";
return AggOption.NATIVE.equals(aggOption) ? measure.getExpr()
: measure.getAgg() + " ( " + measure.getExpr() + " ) ";
}
public String getExpr(MetricResp metricResp) {

23
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
View File

@@ -28,11 +28,11 @@ public class ModelConverter {
public static ModelDO convert(ModelReq modelReq, User user) {
ModelDO modelDO = new ModelDO();
ModelDetail modelDetail = createModelDetail(modelReq);
// ModelDetail modelDetail = createModelDetail(modelReq);
modelReq.createdBy(user.getName());
BeanMapper.mapper(modelReq, modelDO);
modelDO.setStatus(StatusEnum.ONLINE.getCode());
modelDO.setModelDetail(JSONObject.toJSONString(modelDetail));
modelDO.setModelDetail(JSONObject.toJSONString(modelReq.getModelDetail()));
modelDO.setDrillDownDimensions(JSONObject.toJSONString(modelReq.getDrillDownDimensions()));
if (modelReq.getExt() != null) {
modelDO.setExt(JSONObject.toJSONString(modelReq.getExt()));
@@ -264,17 +264,14 @@ public class ModelConverter {
private static ModelDetail createModelDetail(ModelReq modelReq) {
ModelDetail modelDetail = new ModelDetail();
List<Measure> measures = modelReq.getModelDetail().getMeasures();
if (measures == null) {
measures = Lists.newArrayList();
}
for (Measure measure : measures) {
if (StringUtils.isBlank(measure.getBizName())) {
continue;
}
measure.setExpr(measure.getBizName());
measure.setBizName(String.format("%s_%s", modelReq.getBizName(), measure.getExpr()));
}
// List<Measure> measures = modelReq.getModelDetail().getMeasures();
// for (Measure measure : measures) {
// if (StringUtils.isBlank(measure.getBizName())) {
// continue;
// }
// measure.setExpr(measure.getBizName());
// measure.setBizName(String.format("%s_%", modelReq.getBizName(), measure.getExpr()));
// }
BeanMapper.mapper(modelReq.getModelDetail(), modelDetail);
return modelDetail;
}

10
launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2VisitsDemo.java
View File

@@ -307,10 +307,9 @@ public class S2VisitsDemo extends S2BaseDemo {
metricReq.setDescription("停留时长");
metricReq.setClassifications(Collections.singletonList("核心指标"));
MetricDefineByMeasureParams metricTypeParams = new MetricDefineByMeasureParams();
metricTypeParams.setExpr("s2_stay_time_statis_stay_hours");
metricTypeParams.setExpr("stay_hours");
List<Measure> measures = new ArrayList<>();
Measure measure = new Measure("停留时长", "s2_stay_time_statis_stay_hours",
AggOperatorEnum.SUM.getOperator(), 0);
Measure measure = new Measure("停留时长", "stay_hours", AggOperatorEnum.SUM.getOperator(), 0);
measures.add(measure);
metricTypeParams.setMeasures(measures);
metricReq.setMetricDefineByMeasureParams(metricTypeParams);
@@ -329,10 +328,9 @@ public class S2VisitsDemo extends S2BaseDemo {
metricReq.setBizName("pv");
metricReq.setDescription("一段时间内用户的访问次数");
MetricDefineByMeasureParams metricTypeParams = new MetricDefineByMeasureParams();
metricTypeParams.setExpr("s2_pv_uv_statis_pv");
metricTypeParams.setExpr("pv");
List<Measure> measures = new ArrayList<>();
Measure measure =
new Measure("访问次数", "s2_pv_uv_statis_pv", AggOperatorEnum.SUM.getOperator(), 0);
Measure measure = new Measure("访问次数", "pv", AggOperatorEnum.SUM.getOperator(), 0);
measures.add(measure);
metricTypeParams.setMeasures(measures);
metricReq.setMetricDefineByMeasureParams(metricTypeParams);

1
launchers/standalone/src/test/java/com/tencent/supersonic/chat/MetricTest.java
View File

@@ -60,6 +60,7 @@ public class MetricTest extends BaseTest {
}
@Test
@SetSystemProperty(key = "s2.test", value = "true")
public void testMetricFilter() throws Exception {
QueryResult actualResult = submitNewChat("alice的访问次数", agent.getId());