Revert "Merge branch 'opt_term_query' into int_score"

This reverts commit 212d73d, reversing
changes made to ac598df.

Author: gf2121

lucene/core/src/java/org/apache/lucene/search/BatchScoreBulkScorer.java

@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.lucene.search;
+
+import java.io.IOException;
+import org.apache.lucene.util.Bits;
+
+/**
+ * A bulk scorer used when {@link ScoreMode#needsScores()} is true and {@link
+ * Scorer#nextDocsAndScores} has optimizations to run faster than one-by-one iteration.
+ */
+class BatchScoreBulkScorer extends BulkScorer {
+
+  private final SimpleScorable scorable = new SimpleScorable();
+  private final DocAndScoreBuffer buffer = new DocAndScoreBuffer();
+  private final Scorer scorer;
+
+  BatchScoreBulkScorer(Scorer scorer) {
+    this.scorer = scorer;
+  }
+
+  @Override
+  public int score(LeafCollector collector, Bits acceptDocs, int min, int max) throws IOException {
+    if (collector.competitiveIterator() != null) {
+      return new Weight.DefaultBulkScorer(scorer).score(collector, acceptDocs, min, max);
+    }
+
+    collector.setScorer(scorable);
+    scorer.setMinCompetitiveScore(scorable.minCompetitiveScore);
+
+    if (scorer.docID() < min) {
+      scorer.iterator().advance(min);
+    }
+
+    for (scorer.nextDocsAndScores(max, acceptDocs, buffer);
+        buffer.size > 0;
+        scorer.nextDocsAndScores(max, acceptDocs, buffer)) {
+      for (int i = 0, size = buffer.size; i < size; i++) {
+        float score = scorable.score = buffer.scores[i];
+        if (score >= scorable.minCompetitiveScore) {
+          collector.collect(buffer.docs[i]);
+        }
+      }
+      scorer.setMinCompetitiveScore(scorable.minCompetitiveScore);
+    }
+
+    return scorer.docID();
+  }
+
+  @Override
+  public long cost() {
+    return scorer.iterator().cost();
+  }
+}

lucene/core/src/java/org/apache/lucene/search/TermQuery.java

@@ -173,7 +173,7 @@ public BulkScorer bulkScorer() throws IOException {
             return ConstantScoreScorerSupplier.fromIterator(iterator, 0f, scoreMode, maxDoc)
                 .bulkScorer();
           }
-          return new DefaultBulkScorer(get(Long.MAX_VALUE), scoreMode);
+          return new BatchScoreBulkScorer(get(Long.MAX_VALUE));
         }
 
         @Override

lucene/core/src/java/org/apache/lucene/search/Weight.java

@@ -231,25 +231,16 @@ protected static class DefaultBulkScorer extends BulkScorer {
     private final Scorer scorer;
     private final DocIdSetIterator iterator;
     private final TwoPhaseIterator twoPhase;
-    private final ScoreMode scoreMode;
-    private DocAndScoreBuffer buffer;
-    private SimpleScorable scorable;
 
     /** Sole constructor. */
     public DefaultBulkScorer(Scorer scorer) {
-      this(scorer, null);
-    }
-
-    /** Sole constructor. */
-    public DefaultBulkScorer(Scorer scorer, ScoreMode scoreMode) {
       this.scorer = Objects.requireNonNull(scorer);
       this.twoPhase = scorer.twoPhaseIterator();
       if (twoPhase == null) {
         this.iterator = scorer.iterator();
       } else {
         this.iterator = twoPhase.approximation();
       }
-      this.scoreMode = scoreMode;
     }
 
     @Override
@@ -260,13 +251,8 @@ public long cost() {
     @Override
     public int score(LeafCollector collector, Bits acceptDocs, int min, int max)
         throws IOException {
-      DocIdSetIterator competitiveIterator = collector.competitiveIterator();
-
-      if (scoreMode != null && scoreMode.needsScores() && competitiveIterator == null) {
-        return batchScore(collector, acceptDocs, min, max);
-      }
-
       collector.setScorer(scorer);
+      DocIdSetIterator competitiveIterator = collector.competitiveIterator();
 
       if (competitiveIterator != null) {
         if (competitiveIterator.docID() > min) {
@@ -304,37 +290,6 @@ public int score(LeafCollector collector, Bits acceptDocs, int min, int max)
       return iterator.docID();
     }
 
-    private int batchScore(LeafCollector collector, Bits acceptDocs, int min, int max)
-        throws IOException {
-      if (buffer == null) {
-        buffer = new DocAndScoreBuffer();
-      }
-      if (scorable == null) {
-        scorable = new SimpleScorable();
-      }
-
-      collector.setScorer(scorable);
-      scorer.setMinCompetitiveScore(scorable.minCompetitiveScore);
-
-      if (scorer.docID() < min) {
-        scorer.iterator().advance(min);
-      }
-
-      for (scorer.nextDocsAndScores(max, acceptDocs, buffer);
-          buffer.size > 0;
-          scorer.nextDocsAndScores(max, acceptDocs, buffer)) {
-        for (int i = 0, size = buffer.size; i < size; i++) {
-          float score = scorable.score = buffer.scores[i];
-          if (score >= scorable.minCompetitiveScore) {
-            collector.collect(buffer.docs[i]);
-          }
-        }
-        scorer.setMinCompetitiveScore(scorable.minCompetitiveScore);
-      }
-
-      return scorer.docID();
-    }
-
     private static void scoreIterator(
         LeafCollector collector, Bits acceptDocs, DocIdSetIterator iterator, int max)
         throws IOException {

lucene/core/src/test/org/apache/lucene/search/TestBooleanScorer.java

@@ -201,7 +201,7 @@ public void testOptimizeTopLevelClauseOrNull() throws IOException {
     weight = searcher.createWeight(searcher.rewrite(query), ScoreMode.COMPLETE, 1);
     ss = weight.scorerSupplier(ctx);
     scorer = ((BooleanScorerSupplier) ss).booleanScorer();
-    assertThat(scorer, instanceOf(DefaultBulkScorer.class)); // term scorer
+    assertThat(scorer, instanceOf(BatchScoreBulkScorer.class)); // term scorer
 
     w.close();
     reader.close();