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

(opt)(headless)Fetching dimension values should use partition time field to do filtering.
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
2025-09-22 17:02:32 +08:00
parent 3dd53bad89
commit 353c8d8b16
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -422,33 +422,25 @@ public class DictUtils {
return joiner.toString(); return joiner.toString();
} }
public String defaultDateFilter(DateConf dateConf) {
String format = itemValueDateFormat;
String start = LocalDate.now().minusDays(itemValueDateStart)
.format(DateTimeFormatter.ofPattern(format));
String end = LocalDate.now().minusDays(itemValueDateEnd)
.format(DateTimeFormatter.ofPattern(format));
if (Objects.nonNull(dateConf)) {
return String.format("( %s >= '%s' and %s <= '%s' )", dateConf.getDateField(), start,
dateConf.getDateField(), end);
} else {
return String.format("( %s >= '%s' and %s <= '%s' )", "dt", start, "dt", end);
}
}
private String generateDictDateFilter(DictItemResp dictItemResp) { private String generateDictDateFilter(DictItemResp dictItemResp) {
ItemValueConfig config = dictItemResp.getConfig(); Dimension partitionTimeDimension = getPartitionTimeDimension(dictItemResp.getModelId());
if (config == null) { // 如果没有设置数据时间维度，则无法做时间分区过滤
if (partitionTimeDimension == null) {
return ""; return "";
} }
if (!partitionedModel(dictItemResp.getModelId())) { ItemValueConfig config = dictItemResp.getConfig();
return ""; // 默认使用数据时间维度进行时间分区过滤
}
// 未进行设置
if (Objects.isNull(config) || Objects.isNull(config.getDateConf())) { if (Objects.isNull(config) || Objects.isNull(config.getDateConf())) {
return defaultDateFilter(null); String startDate = LocalDate.now().minusDays(itemValueDateStart)
.format(DateTimeFormatter.ofPattern(partitionTimeDimension.getDateFormat()));
String endDate = LocalDate.now().minusDays(itemValueDateEnd)
.format(DateTimeFormatter.ofPattern(partitionTimeDimension.getDateFormat()));
return String.format("( %s >= '%s' and %s <= '%s' )",
partitionTimeDimension.getBizName(), startDate,
partitionTimeDimension.getBizName(), endDate);
} }
// 全表扫描 // 全表扫描
if (DateConf.DateMode.ALL.equals(config.getDateConf().getDateMode())) { if (DateConf.DateMode.ALL.equals(config.getDateConf().getDateMode())) {
return ""; return "";
@@ -467,15 +459,15 @@ public class DictUtils {
return ""; return "";
} }
private boolean partitionedModel(Long modelId) { private Dimension getPartitionTimeDimension(Long modelId) {
ModelResp model = modelService.getModel(modelId); ModelResp model = modelService.getModel(modelId);
if (Objects.nonNull(model)) { if (Objects.nonNull(model)) {
List<Dimension> timeDims = model.getTimeDimension(); List<Dimension> timeDims = model.getTimeDimension();
if (!CollectionUtils.isEmpty(timeDims)) { if (!CollectionUtils.isEmpty(timeDims)) {
return true; return timeDims.get(0);
} }
} }
return false; return null;
} }
private String generateDictDateFilterRecent(DictItemResp dictItemResp) { private String generateDictDateFilterRecent(DictItemResp dictItemResp) {