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

[improvement][headless]Rename metric and tag query type to aggregate and detail respectively.

Browse Source
This commit is contained in:
jerryjzhang
2024-09-26 20:29:51 +08:00
parent 066b9cc1f7
commit 35030aeb23
14 changed files with 77 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/MetricTypeDefaultConfig.java → headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/AggregateTypeDefaultConfig.java
View File

@@ -5,7 +5,7 @@ import com.tencent.supersonic.common.pojo.enums.TimeMode;
import lombok.Data;
@Data
public class MetricTypeDefaultConfig {
public class AggregateTypeDefaultConfig {
private TimeDefaultConfig timeDefaultConfig =
new TimeDefaultConfig(7, DatePeriodEnum.DAY, TimeMode.RECENT);

32
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DataSetSchema.java
View File

@@ -75,38 +75,38 @@ public class DataSetSchema {
if (queryConfig == null) {
return null;
}
if (queryConfig.getTagTypeDefaultConfig() == null) {
if (queryConfig.getDetailTypeDefaultConfig() == null) {
return null;
}
return queryConfig.getTagTypeDefaultConfig().getTimeDefaultConfig();
return queryConfig.getDetailTypeDefaultConfig().getTimeDefaultConfig();
}
public TimeDefaultConfig getMetricTypeTimeDefaultConfig() {
if (queryConfig == null) {
return null;
}
if (queryConfig.getMetricTypeDefaultConfig() == null) {
if (queryConfig.getAggregateTypeDefaultConfig() == null) {
return null;
}
return queryConfig.getMetricTypeDefaultConfig().getTimeDefaultConfig();
return queryConfig.getAggregateTypeDefaultConfig().getTimeDefaultConfig();
}
public TagTypeDefaultConfig getTagTypeDefaultConfig() {
public DetailTypeDefaultConfig getTagTypeDefaultConfig() {
if (queryConfig == null) {
return null;
}
return queryConfig.getTagTypeDefaultConfig();
return queryConfig.getDetailTypeDefaultConfig();
}
public List<SchemaElement> getTagDefaultDimensions() {
TagTypeDefaultConfig tagTypeDefaultConfig = getTagTypeDefaultConfig();
if (Objects.isNull(tagTypeDefaultConfig)
|| Objects.isNull(tagTypeDefaultConfig.getDefaultDisplayInfo())) {
DetailTypeDefaultConfig detailTypeDefaultConfig = getTagTypeDefaultConfig();
if (Objects.isNull(detailTypeDefaultConfig)
|| Objects.isNull(detailTypeDefaultConfig.getDefaultDisplayInfo())) {
return new ArrayList<>();
}
if (CollectionUtils.isNotEmpty(
tagTypeDefaultConfig.getDefaultDisplayInfo().getMetricIds())) {
return tagTypeDefaultConfig.getDefaultDisplayInfo().getMetricIds().stream()
detailTypeDefaultConfig.getDefaultDisplayInfo().getMetricIds())) {
return detailTypeDefaultConfig.getDefaultDisplayInfo().getMetricIds().stream()
.map(
id -> {
SchemaElement metric = getElement(SchemaElementType.METRIC, id);
@@ -119,14 +119,14 @@ public class DataSetSchema {
}
public List<SchemaElement> getTagDefaultMetrics() {
TagTypeDefaultConfig tagTypeDefaultConfig = getTagTypeDefaultConfig();
if (Objects.isNull(tagTypeDefaultConfig)
|| Objects.isNull(tagTypeDefaultConfig.getDefaultDisplayInfo())) {
DetailTypeDefaultConfig detailTypeDefaultConfig = getTagTypeDefaultConfig();
if (Objects.isNull(detailTypeDefaultConfig)
|| Objects.isNull(detailTypeDefaultConfig.getDefaultDisplayInfo())) {
return new ArrayList<>();
}
if (CollectionUtils.isNotEmpty(
tagTypeDefaultConfig.getDefaultDisplayInfo().getDimensionIds())) {
return tagTypeDefaultConfig.getDefaultDisplayInfo().getDimensionIds().stream()
detailTypeDefaultConfig.getDefaultDisplayInfo().getDimensionIds())) {
return detailTypeDefaultConfig.getDefaultDisplayInfo().getDimensionIds().stream()
.map(id -> getElement(SchemaElementType.DIMENSION, id))
.filter(Objects::nonNull)
.collect(Collectors.toList());

2
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/TagTypeDefaultConfig.java → headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/DetailTypeDefaultConfig.java
View File

@@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.api.pojo;
import lombok.Data;
@Data
public class TagTypeDefaultConfig {
public class DetailTypeDefaultConfig {
private DefaultDisplayInfo defaultDisplayInfo;

5
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/QueryConfig.java
View File

@@ -5,7 +5,8 @@ import lombok.Data;
@Data
public class QueryConfig {
private TagTypeDefaultConfig tagTypeDefaultConfig = new TagTypeDefaultConfig();
private DetailTypeDefaultConfig detailTypeDefaultConfig = new DetailTypeDefaultConfig();
private MetricTypeDefaultConfig metricTypeDefaultConfig = new MetricTypeDefaultConfig();
private AggregateTypeDefaultConfig aggregateTypeDefaultConfig =
new AggregateTypeDefaultConfig();
}

12
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/SemanticParseInfo.java
View File

@@ -77,9 +77,9 @@ public class SemanticParseInfo {
public Long getDetailLimit() {
Long limit = DEFAULT_DETAIL_LIMIT;
if (Objects.nonNull(queryConfig)
&& Objects.nonNull(queryConfig.getTagTypeDefaultConfig())
&& Objects.nonNull(queryConfig.getTagTypeDefaultConfig().getLimit())) {
limit = queryConfig.getTagTypeDefaultConfig().getLimit();
&& Objects.nonNull(queryConfig.getDetailTypeDefaultConfig())
&& Objects.nonNull(queryConfig.getDetailTypeDefaultConfig().getLimit())) {
limit = queryConfig.getDetailTypeDefaultConfig().getLimit();
}
return limit;
}
@@ -87,9 +87,9 @@ public class SemanticParseInfo {
public Long getMetricLimit() {
Long limit = DEFAULT_METRIC_LIMIT;
if (Objects.nonNull(queryConfig)
&& Objects.nonNull(queryConfig.getMetricTypeDefaultConfig())
&& Objects.nonNull(queryConfig.getMetricTypeDefaultConfig().getLimit())) {
limit = queryConfig.getMetricTypeDefaultConfig().getLimit();
&& Objects.nonNull(queryConfig.getAggregateTypeDefaultConfig())
&& Objects.nonNull(queryConfig.getAggregateTypeDefaultConfig().getLimit())) {
limit = queryConfig.getAggregateTypeDefaultConfig().getLimit();
}
return limit;
}