Skip to content

Check self references in metric agg after last doc collection (#33593) #34001

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

Merged
merged 8 commits into from
Oct 25, 2018
Merged

Check self references in metric agg after last doc collection (#33593) #34001

Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0aff5a3
Check self references in metric agg after last doc collection (#33593)
cbismuth Sep 24, 2018
cb6e307
Revert 0aff5a30c5dbad9f476be14f34b81e2d1991bb0f (#33593)
cbismuth Sep 26, 2018
cc10fec
Check self refs in metric agg only once in post collection hook (#33593)
cbismuth Sep 26, 2018
1b63f10
Merge branch 'master' into 33593_no_ensure_self_ref_after_scripted_me…
cbismuth Oct 1, 2018
4bfa3c3
Merge branch 'master' into 33593_no_ensure_self_ref_after_scripted_me…
cbismuth Oct 9, 2018
572fac7
Merge branch 'master' into 33593_no_ensure_self_ref_after_scripted_me…
cbismuth Oct 24, 2018
671d6c6
Remove unnecessary mocking (#33593)
cbismuth Oct 24, 2018
56a3ea7
Merge branch 'master' into 33593_no_ensure_self_ref_after_scripted_me…
cbismuth Oct 25, 2018
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
7 changes: 6 additions & 1 deletion ...src/main/java/org/elasticsearch/search/aggregations/metrics/ScriptedMetricAggregator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public void collect(int doc, long bucket) throws IOException {

leafMapScript.setDocument(doc);
leafMapScript.execute();
CollectionUtils.ensureNoSelfReferences(aggState, "Scripted metric aggs map script");
}
};
}
Expand All @@ -103,4 +102,10 @@ public InternalAggregation buildEmptyAggregation() {
return new InternalScriptedMetric(name, null, reduceScript, pipelineAggregators(), metaData());
}

@Override
protected void doPostCollection() throws IOException {
CollectionUtils.ensureNoSelfReferences(aggState, "Scripted metric aggs map script");

super.doPostCollection();
}
}