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

fix queryType error (#811)

Browse Source
This commit is contained in:
daikon
2024-03-13 10:26:09 +08:00
committed by GitHub
parent 8a8370164f
commit 6c3370b0d2
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java
View File

@@ -59,6 +59,14 @@ import static com.tencent.supersonic.common.pojo.Constants.COMMA;
import static com.tencent.supersonic.common.pojo.Constants.POUND;
import static com.tencent.supersonic.common.pojo.Constants.SPACE;
import com.tencent.supersonic.headless.server.service.TagMetaService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@Slf4j
@Component
public class DictUtils {
@@ -242,12 +250,10 @@ public class DictUtils {
private SemanticQueryReq constructQueryReq(DictItemResp dictItemResp) {
if (TypeEnums.DIMENSION.equals(dictItemResp.getType())) {
QuerySqlReq querySqlReq = constructDimQueryReq(dictItemResp);
querySqlReq.setQueryType(QueryType.METRIC);
return querySqlReq;
}
if (TypeEnums.TAG.equals(dictItemResp.getType())) {
QuerySqlReq querySqlReq = constructTagQueryReq(dictItemResp);
querySqlReq.setQueryType(QueryType.TAG);
return querySqlReq;
}
log.warn("constructQueryReq failed");
@@ -265,16 +271,17 @@ public class DictUtils {
dictItemResp.getConfig().getLimit();
// todo 自定义指标
Set<Long> modelIds = new HashSet<>();
String metric = "count(1)";
if (Objects.nonNull(dictItemResp.getConfig()) && Objects.nonNull(dictItemResp.getConfig().getMetricId())) {
Long metricId = dictItemResp.getConfig().getMetricId();
MetricResp metricResp = metricService.getMetric(metricId);
String metricBizName = metricResp.getBizName();
metric = String.format("sum(%s)", metricBizName);
modelIds.add(metricResp.getModelId());
}
String sql = String.format(sqlPattern, bizName, metric, where, bizName, metric, limit);
Set<Long> modelIds = new HashSet<>();
modelIds.add(dictItemResp.getModelId());
QuerySqlReq querySqlReq = new QuerySqlReq();
querySqlReq.setSql(sql);
@@ -295,7 +302,6 @@ public class DictUtils {
}
private QuerySqlReq constructQuerySqlReq(DictItemResp dictItemResp) {
// todo tag
String sqlPattern = "select %s,count(1) from tbl %s group by %s order by count(1) desc limit %d";
String bizName = dictItemResp.getBizName();
@@ -319,8 +325,6 @@ public class DictUtils {
QueryStructReq queryStructReq = new QueryStructReq();
Set<Long> modelIds = new HashSet<>(Arrays.asList(dictItemResp.getModelId()));
queryStructReq.setModelIds(modelIds);
List<String> groups = new ArrayList<>(Arrays.asList(dictItemResp.getBizName()));
queryStructReq.setGroups(groups);
@@ -333,6 +337,8 @@ public class DictUtils {
String metricBizName = metric.getBizName();
aggregators.add(new Aggregator(metricBizName, AggOperatorEnum.SUM));
queryStructReq.setAggregators(aggregators);
modelIds.add(metric.getModelId());
queryStructReq.setModelIds(modelIds);
List<Order> orders = new ArrayList<>();
orders.add(new Order(metricBizName, Constants.DESC_UPPER));

7
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/TagConverter.java
View File

@@ -44,7 +44,12 @@ public class TagConverter {
SemanticSchemaResp semanticSchemaResp) throws Exception {
QueryStatement queryStatement = new QueryStatement();
// covert to QueryReqConverter
BeanUtils.copyProperties(queryStructReq.convert(), queryStructReq);
QueryStructReq queryStructReq = new QueryStructReq();
BeanUtils.copyProperties(queryTagReq, queryStructReq);
// queryStructReq.setModelIds(queryTagReq.getModelIdSet());
if (!CollectionUtils.isEmpty(queryTagReq.getTagFilters())) {
queryStructReq.setDimensionFilters(queryTagReq.getTagFilters());
}
QuerySqlReq querySqlReq = queryStructReq.convert();
convert(querySqlReq, semanticSchemaResp, queryStatement, queryStructReq);
QueryParam queryParam = new QueryParam();

1
launchers/standalone/src/test/java/com/tencent/supersonic/headless/TagTest.java
View File

@@ -102,6 +102,7 @@ public class TagTest extends BaseTest {
TagResp tag = queryTagRespByBizName(bizName);
ItemValueReq itemValueReq = new ItemValueReq();
itemValueReq.setItemId(tag.getId());
// tagQueryService.queryTagValue(itemValueReq, User.getFakeUser());
tagMetaService.delete(tag.getId(), User.getFakeUser());
}