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

cbismuth · colings86 · commit 464e4ab322d2 · 2018-10-26T09:13:34.000+01:00
(#34001) * Check self references in metric agg after last doc collection (#33593) * Revert 0aff5a3 (#33593) * Check self refs in metric agg only once in post collection hook (#33593) * Remove unnecessary mocking (#33593)
diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/metrics/scripted/ScriptedMetricAggregator.java
@@ -75,7 +75,6 @@ public void collect(int doc, long bucket) throws IOException {
 
                 leafMapScript.setDocument(doc);
                 leafMapScript.execute();
-                CollectionUtils.ensureNoSelfReferences(aggState);
             }
         };
     }
@@ -98,4 +97,10 @@ public InternalAggregation buildEmptyAggregation() {
         return new InternalScriptedMetric(name, null, reduceScript, pipelineAggregators(), metaData());
     }
 
+    @Override
+    protected void doPostCollection() throws IOException {
+        CollectionUtils.ensureNoSelfReferences(aggState);
+
+        super.doPostCollection();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,6 @@ public void collect(int doc, long bucket) throws IOException {`
`75`	`75`
`76`	`76`	`leafMapScript.setDocument(doc);`
`77`	`77`	`leafMapScript.execute();`
`78`		`- CollectionUtils.ensureNoSelfReferences(aggState);`
`79`	`78`	`}`
`80`	`79`	`};`
`81`	`80`	`}`
`@@ -98,4 +97,10 @@ public InternalAggregation buildEmptyAggregation() {`
`98`	`97`	`return new InternalScriptedMetric(name, null, reduceScript, pipelineAggregators(), metaData());`
`99`	`98`	`}`
`100`	`99`
	`100`	`+ @Override`
	`101`	`+ protected void doPostCollection() throws IOException {`
	`102`	`+ CollectionUtils.ensureNoSelfReferences(aggState);`
	`103`	`+`
	`104`	`+ super.doPostCollection();`
	`105`	`+ }`
`101`	`106`	`}`