Skip to content

优化 Terms Agg 的 limit 设置逻辑，修复范围查询 IP 类型和时间类型转换的问题 #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zat366 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

优化 Terms Agg 的 limit 设置逻辑，修复范围查询 IP 类型和时间类型转换的问题 #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f151d3
feat(聚合策略): 优化 Terms Agg 的 limit 设置逻辑
zat366 Aug 21, 2025
9865756
fix(range): 修复范围查询 IP 类型和时间类型转换的问题- 优化 IP 类型判断逻辑，优先使用 low 值判断，low 为 n…
zat366 Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/main/java/com/ly/ckibana/strategy/aggs/TermsAggStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,17 @@ public CkRequest buildCkRequest(CkRequestContext ckRequestContext) {
if (getSize() == null) {
setSize(10);
}
//若子aggs的有额外group by条件，size条件失效
if (isSubAggGroupByEmpty()) {
result.limit(getSize());

// 对于特殊的聚合组合（terms+子terms, range+子terms），应用 ES API 的 size 限制
// 其他复杂嵌套场景仍使用 maxResultRow 保证数据完整性
if (isSubAggGroupByEmpty() || isIgnoreSubAggCondition()) {
int actualLimit = getSize();
if (ckRequestContext.getMaxResultRow() > 0) {
actualLimit = Math.min(getSize(), ckRequestContext.getMaxResultRow());
}
result.limit(actualLimit);
}

return result;
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/ly/ckibana/strategy/clause/converter/QueryStringClauseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private String generateRangeSql() {
return String.format(LOGICALOP_RANGE_TEMPLATE_DEFAULT,
logicalOp,
SqlUtils.getCompareSql(field.getCkName(), includeThreshold ? Constants.Symbol.GTE : Constants.Symbol.GT, from),
SqlUtils.getCompareSql(field.getCkName(), includeThreshold ? Constants.Symbol.LTE : Constants.Symbol.GT, to));
SqlUtils.getCompareSql(field.getCkName(), includeThreshold ? Constants.Symbol.LTE : Constants.Symbol.LT, to));
}

/**
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/ly/ckibana/util/ProxyUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,11 @@ public static Range getRangeWrappedBySqlFunction(Range orgRange, boolean isTimeF
rangeConverted.setHigh(generateTimeFieldSqlWithFormatDateTime64ZoneShangHai(orgRange.getHigh(), ckFieldType));
rangeConverted.setLow(generateTimeFieldSqlWithFormatDateTime64ZoneShangHai(orgRange.getLow(), ckFieldType));
} else {
//ip
IPType ipType = ProxyUtils.getIpType(orgRange.getCkFieldType(), orgRange.getLow().toString());
//ip - 优先使用low值判断IP类型，如果low为null则使用high值
IPType ipType = null;
if (orgRange.getLow() != null) {
ipType = ProxyUtils.getIpType(orgRange.getCkFieldType(), orgRange.getLow().toString());
}
if (null != ipType) {
rangeConverted.setCkFieldName(SqlUtils.generateIpSql(ckFieldName, ipType, false));
rangeConverted.setHigh(SqlUtils.generateIpSql(orgRange.getHigh(), ipType, true));
Expand Down