Revert "Remove Scorable#docID implementations"

This reverts commit 55ed03f.

Author: cbuescher

modules/lang-painless/src/test/java/org/elasticsearch/painless/ScriptedMetricAggContextsTests.java

@@ -73,6 +73,11 @@ public void testMapBasic() throws IOException {
         Map<String, Object> state = new HashMap<>();
 
         Scorable scorer = new Scorable() {
+            @Override
+            public int docID() {
+                return 0;
+            }
+
             @Override
             public float score() {
                 return 0.5f;

modules/parent-join/src/main/java/org/elasticsearch/join/aggregations/ParentJoinAggregator.java

@@ -133,6 +133,11 @@ protected void prepareSubAggs(long[] ordsToCollect) throws IOException {
                 public float score() {
                     return 1f;
                 }
+
+                @Override
+                public int docID() {
+                    return childDocsIter.docID();
+                }
             });
 
             final Bits liveDocs = ctx.reader().getLiveDocs();

server/src/main/java/org/elasticsearch/search/aggregations/bucket/nested/NestedAggregator.java

@@ -206,12 +206,19 @@ void processBufferedChildBuckets() throws IOException {
     }
 
     private static class CachedScorable extends Scorable {
+        int doc;
         float score;
 
         @Override
         public final float score() {
             return score;
         }
+
+        @Override
+        public int docID() {
+            return doc;
+        }
+
     }
 
 }

server/src/main/java/org/elasticsearch/search/aggregations/bucket/sampler/BestDocsDeferringCollector.java

@@ -213,6 +213,7 @@ class PerSegmentCollects extends Scorable {
         private final AggregationExecutionContext aggCtx;
         int maxDocId = Integer.MIN_VALUE;
         private float currentScore;
+        private int currentDocId = -1;
         private Scorable currentScorer;
 
         PerSegmentCollects(AggregationExecutionContext aggCtx) throws IOException {
@@ -247,6 +248,7 @@ public void replayRelatedMatches(List<ScoreDoc> sd) throws IOException {
                 leafCollector.setScorer(this);
 
                 currentScore = 0;
+                currentDocId = -1;
                 if (maxDocId < 0) {
                     return;
                 }
@@ -256,6 +258,7 @@ public void replayRelatedMatches(List<ScoreDoc> sd) throws IOException {
                     int rebased = scoreDoc.doc - aggCtx.getLeafReaderContext().docBase;
                     if ((rebased >= 0) && (rebased <= maxDocId)) {
                         currentScore = scoreDoc.score;
+                        currentDocId = rebased;
                         // We stored the bucket ID in Lucene's shardIndex property
                         // for convenience.
                         leafCollector.collect(rebased, scoreDoc.shardIndex);
@@ -272,6 +275,11 @@ public float score() throws IOException {
             return currentScore;
         }
 
+        @Override
+        public int docID() {
+            return currentDocId;
+        }
+
         public void collect(int docId, long parentBucket) throws IOException {
             perBucketSamples = bigArrays.grow(perBucketSamples, parentBucket + 1);
             PerParentBucketSamples sampler = perBucketSamples.get((int) parentBucket);

server/src/test/java/org/elasticsearch/search/aggregations/MultiBucketCollectorTests.java

@@ -32,8 +32,14 @@
 import static org.hamcrest.Matchers.equalTo;
 
 public class MultiBucketCollectorTests extends ESTestCase {
-    private static class Score extends Scorable {
+    private static class ScoreAndDoc extends Scorable {
         float score;
+        int doc = -1;
+
+        @Override
+        public int docID() {
+            return doc;
+        }
 
         @Override
         public float score() {
@@ -240,7 +246,7 @@ public void testSetScorerAfterCollectionTerminated() throws IOException {
         collector1 = new TerminateAfterBucketCollector(collector1, 1);
         collector2 = new TerminateAfterBucketCollector(collector2, 2);
 
-        Scorable scorer = new Score();
+        Scorable scorer = new ScoreAndDoc();
 
         List<BucketCollector> collectors = Arrays.asList(collector1, collector2);
         Collections.shuffle(collectors, random());

server/src/test/java/org/elasticsearch/search/query/QueryPhaseCollectorTests.java

@@ -1138,6 +1138,11 @@ public void testSetScorerAfterCollectionTerminated() throws IOException {
             public float score() {
                 return 0;
             }
+
+            @Override
+            public int docID() {
+                return 0;
+            }
         };
 
         QueryPhaseCollector queryPhaseCollector = new QueryPhaseCollector(
@@ -1467,6 +1472,11 @@ public float score() throws IOException {
             return 0;
         }
 
+        @Override
+        public int docID() {
+            return 0;
+        }
+
         @Override
         public void setMinCompetitiveScore(float minScore) {
             setMinCompetitiveScoreCalled = true;

server/src/test/java/org/elasticsearch/search/sort/BucketedSortForFloatsTests.java

@@ -120,12 +120,18 @@ public void testScorer() throws IOException {
     }
 
     private class MockScorable extends Scorable {
+        private int doc;
         private float score;
 
         @Override
         public float score() throws IOException {
             return score;
         }
+
+        @Override
+        public int docID() {
+            return doc;
+        }
     }
 
     /**