Skip to content

fix: 修复管道聚合超过两个字段时丢失后续聚合字段的问题 (#167) #173

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
Hugo-DDT wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: 修复管道聚合超过两个字段时丢失后续聚合字段的问题 (#167) #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
72 changes: 48 additions & 24 deletions easy-es-core/src/main/java/org/dromara/easyes/core/kernel/WrapperProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,41 +898,65 @@ private static void setAggregations(Wrapper<?> wrapper, Map<String, String> mapp
return;
}

// 构建聚合树
String rootName = null;
Aggregation.Builder.ContainerBuilder root = null;
Aggregation.Builder.ContainerBuilder cursor = null;
// 拆分管道聚合与普通聚合
List<AggregationParam> pipelineList = new ArrayList<>();
List<AggregationParam> normalList = new ArrayList<>();
for (AggregationParam aggParam : aggregationParamList) {
if (aggParam.isEnablePipeline()) {
pipelineList.add(aggParam);
} else {
normalList.add(aggParam);
}
}

// 非管道聚合, 平铺到顶层
for (AggregationParam aggParam : normalList) {
String realField = getRealFieldAndSuffix(aggParam.getField(), mappingColumnMap, entityInfo);
Aggregation.Builder.ContainerBuilder builder = getRealAggregationBuilder(
aggParam.getAggregationType(), realField, wrapper.size, wrapper.bucketOrders);
// 解决同一个字段聚合多次，如min(starNum), max(starNum) 字段名重复问题
String aggName = aggParam.getName() + aggParam.getAggregationType().getValue();
if (aggParam.isEnablePipeline()) {
// 管道聚合, 构造聚合树
if (root == null) {
root = builder;
rootName = aggName;
cursor = root;
} else {
Aggregation agg = builder.build();
cursor.aggregations(aggName, agg);
// 解决max、min、avg和sum聚合函数不支持sub-aggregations的问题
if (agg._kind().equals(Aggregation.Kind.Terms)) {
cursor = builder;
}
searchSourceBuilder.aggregations(aggName, builder.build());
}

// 管道聚合: 按 terms 分层, metric 挂在当前最深层; 自底向上构建嵌套树,
// 避免过早 build 导致第 3 个及之后的字段丢失 (issue #167)
Aggregation innerAgg = null;
String innerName = null;
String rootName = null;
List<String> metricNames = new ArrayList<>();
List<Aggregation.Builder.ContainerBuilder> metricBuilders = new ArrayList<>();
for (int i = pipelineList.size() - 1; i >= 0; i--) {
AggregationParam aggParam = pipelineList.get(i);
String realField = getRealFieldAndSuffix(aggParam.getField(), mappingColumnMap, entityInfo);
Aggregation.Builder.ContainerBuilder builder = getRealAggregationBuilder(
aggParam.getAggregationType(), realField, wrapper.size, wrapper.bucketOrders);
String aggName = aggParam.getName() + aggParam.getAggregationType().getValue();
if (aggParam.getAggregationType() == AggregationTypeEnum.TERMS) {
for (int m = 0; m < metricBuilders.size(); m++) {
builder.aggregations(metricNames.get(m), metricBuilders.get(m).build());
}
} else {
// 非管道聚合
if (builder != null) {
searchSourceBuilder.aggregations(aggName, builder.build());
metricNames.clear();
metricBuilders.clear();
if (innerAgg != null) {
builder.aggregations(innerName, innerAgg);
}
rootName = aggName;
innerAgg = builder.build();
innerName = aggName;
} else {
metricNames.add(aggName);
metricBuilders.add(builder);
}

}
if (root != null) {
searchSourceBuilder.aggregations(rootName, root.build());
// 管道聚合中未挂在 terms 下的 metric(首个或全部为 metric 的罕见场景), 平铺到顶层
for (int m = 0; m < metricBuilders.size(); m++) {
searchSourceBuilder.aggregations(metricNames.get(m), metricBuilders.get(m).build());
}
if (innerAgg != null) {
searchSourceBuilder.aggregations(rootName, innerAgg);
}


if (!GlobalConfigCache.getGlobalConfig().getDbConfig().isEnableAggHits()) {
// 配置关闭了聚合返回结果集Hits, 可提升查询效率
Expand Down