From 90b7e20e022e06cac6dcd432bfa2aba0e69bacf5 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Mon, 15 Jan 2018 13:38:08 +0100 Subject: [PATCH] address review --- .../bucket/composite/CompositeAggregator.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java index e0f2ffbdda1d8..3467aaf318baf 100644 --- a/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java +++ b/server/src/main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java @@ -104,21 +104,20 @@ public InternalAggregation buildAggregation(long zeroBucket) throws IOException final CompositeValuesSource.Collector collector = array.getLeafCollector(context.ctx, getSecondPassCollector(context.subCollector)); int docID; - DocIdSetIterator docIt = null; - if (needsScores()) { + DocIdSetIterator scorerIt = null; + if (needsScores) { Scorer scorer = weight.scorer(context.ctx); // We don't need to check if the scorer is null // since we are sure that there are documents to replay (docIdSetIterator it not empty). - docIt = scorer.iterator(); + scorerIt = scorer.iterator(); context.subCollector.setScorer(scorer); } while ((docID = docIdSetIterator.nextDoc()) != DocIdSetIterator.NO_MORE_DOCS) { if (needsScores) { - if (docIt.docID() < docID) { - docIt.advance(docID); - } + assert scorerIt.docID() < docID; + scorerIt.advance(docID); // aggregations should only be replayed on matching documents - assert docIt.docID() == docID; + assert scorerIt.docID() == docID; } collector.collect(docID); }