address review

elastic · Jan 15, 2018 · 90b7e20 · 90b7e20
1 parent 7f2da98
commit 90b7e20
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/...main/java/org/elasticsearch/search/aggregations/bucket/composite/CompositeAggregator.java b/...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);
             }