Skip to content
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

Adjust DateHistogram's bucket accounting to be iteratively #101012

Merged
merged 3 commits into from
Oct 18, 2023
Merged

Adjust DateHistogram's bucket accounting to be iteratively #101012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51230c1
Adjust DateHistogram's consumeBucketsAndMaybeBreak to be iteratively …
martijnvg Oct 17, 2023
ef2826b
Update docs/changelog/101012.yaml
martijnvg Oct 18, 2023
5fd07af
Merge remote-tracking branch 'es/main' into aggs/date_histogram/consu…
martijnvg Oct 18, 2023
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
5 changes: 5 additions & 0 deletions docs/changelog/101012.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 101012
summary: Adjust `DateHistogram's` bucket accounting to be iteratively
area: Aggregations
type: bug
issues: []
18 changes: 11 additions & 7 deletions ...in/java/org/elasticsearch/search/aggregations/bucket/histogram/InternalDateHistogram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,7 @@ protected boolean lessThan(IteratorAndCurrent<Bucket> a, IteratorAndCurrent<Buck
}
}

int consumeBucketCount = 0;
List<Bucket> reducedBuckets = new ArrayList<>();
if (pq.size() > 0) {
// list of buckets coming from different shards that have the same key
Expand All @@ -323,6 +324,10 @@ protected boolean lessThan(IteratorAndCurrent<Bucket> a, IteratorAndCurrent<Buck
// the key changes, reduce what we already buffered and reset the buffer for current buckets
final Bucket reduced = reduceBucket(currentBuckets, reduceContext);
if (reduced.getDocCount() >= minDocCount || reduceContext.isFinalReduce() == false) {
if (consumeBucketCount++ >= REPORT_EMPTY_EVERY) {
reduceContext.consumeBucketsAndMaybeBreak(consumeBucketCount);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should only do this is is final reduce?

consumeBucketCount = 0;
}
reducedBuckets.add(reduced);
}
currentBuckets.clear();
Expand All @@ -344,10 +349,14 @@ protected boolean lessThan(IteratorAndCurrent<Bucket> a, IteratorAndCurrent<Buck
final Bucket reduced = reduceBucket(currentBuckets, reduceContext);
if (reduced.getDocCount() >= minDocCount || reduceContext.isFinalReduce() == false) {
reducedBuckets.add(reduced);
if (consumeBucketCount++ >= REPORT_EMPTY_EVERY) {
reduceContext.consumeBucketsAndMaybeBreak(consumeBucketCount);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should only do this is is final reduce?

consumeBucketCount = 0;
}
}
}
}

reduceContext.consumeBucketsAndMaybeBreak(consumeBucketCount);
return reducedBuckets;
}

Expand Down Expand Up @@ -387,7 +396,7 @@ private void addEmptyBuckets(List<Bucket> list, AggregationReduceContext reduceC
* consumeBucketsAndMaybeBreak.
*/
class Counter implements LongConsumer {
private int size = list.size();
private int size;

@Override
public void accept(long key) {
Expand Down Expand Up @@ -490,11 +499,9 @@ private void iterateEmptyBuckets(List<Bucket> list, ListIterator<Bucket> iter, L
@Override
public InternalAggregation reduce(List<InternalAggregation> aggregations, AggregationReduceContext reduceContext) {
List<Bucket> reducedBuckets = reduceBuckets(aggregations, reduceContext);
boolean alreadyAccountedForBuckets = false;
if (reduceContext.isFinalReduce()) {
if (minDocCount == 0) {
addEmptyBuckets(reducedBuckets, reduceContext);
alreadyAccountedForBuckets = true;
}
if (InternalOrder.isKeyDesc(order)) {
// we just need to reverse here...
Expand All @@ -508,9 +515,6 @@ public InternalAggregation reduce(List<InternalAggregation> aggregations, Aggreg
CollectionUtil.introSort(reducedBuckets, order.comparator());
}
}
if (false == alreadyAccountedForBuckets) {
reduceContext.consumeBucketsAndMaybeBreak(reducedBuckets.size());
}
return new InternalDateHistogram(
getName(),
reducedBuckets,
Expand Down