Removed Scorer#getWeight

lucene/CHANGES.txt

@@ -110,6 +110,8 @@ API Changes
   I/O for top-level disjunctions. Weight#bulkScorer() still exists for compatibility, but delegates
   to ScorerSupplier#bulkScorer(). (Adrien Grand)
 
+* GITHUB#13410: Removed Scorer#getWeight (Sanjay Dutt, Adrien Grand)
+
 New Features
 ---------------------
 
@@ -458,7 +460,8 @@ API Changes
   IndexSearcher#search(Query, CollectorManager) for TopFieldCollectorManager
   and TopScoreDocCollectorManager. (Zach Chen, Adrien Grand, Michael McCandless, Greg Miller, Luca Cavanna)
 
-* GITHUB#12854: Mark DrillSideways#createDrillDownFacetsCollector as @Deprecated. (Greg Miller)
+* GITHUB#12854: Mark DrillSideways#createDrillDownFacetsCollector as @
+Deprecated. (Greg Miller)
 
 New Features
 ---------------------

lucene/MIGRATE.md

@@ -779,3 +779,9 @@ to manage the indexed data on their own and create new `Facet` implementations t
 The `Weight#scorerSupplier` method is now declared abstract, compelling child classes to implement the ScorerSupplier 
 interface. Additionally, `Weight#scorer` is now declared final, with its implementation being delegated to 
 `Weight#scorerSupplier` for the scorer.
+
+### `Scorer#getWeight` is removed (GITHUB#13410)
+
+The `Scorer#getWeight` method has been removed. Callers must now keep track of the Weight instance 
+that created the Scorer if they need it instead of relying on `Scorer`.
+

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

@@ -39,15 +39,6 @@ protected Scorer(Weight weight) {
     this.weight = Objects.requireNonNull(weight);
   }
 
-  /**
-   * returns parent Weight
-   *
-   * @lucene.experimental
-   */
-  public Weight getWeight() {
-    return weight;
-  }
-
   /** Returns the doc ID that is currently being scored. */
   public abstract int docID();
 

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

@@ -256,9 +256,9 @@ public void testGetChildrenMinShouldMatchSumScorer() throws IOException {
           "ConjunctionScorer\n"
               + "    MUST ConstantScoreScorer\n"
               + "    MUST WANDScorer\n"
-              + "            SHOULD TermScorer body:crawler\n"
-              + "            SHOULD TermScorer body:web\n"
-              + "            SHOULD TermScorer body:nutch",
+              + "            SHOULD TermScorer\n"
+              + "            SHOULD TermScorer\n"
+              + "            SHOULD TermScorer",
           summary);
     }
   }
@@ -272,7 +272,7 @@ public void testGetChildrenBoosterScorer() throws IOException {
     assertEquals(1, scoreSummary.numHits.get());
     assertFalse(scoreSummary.summaries.isEmpty());
     for (String summary : scoreSummary.summaries) {
-      assertEquals("TermScorer body:nutch", summary);
+      assertEquals("TermScorer", summary);
     }
   }
 
@@ -329,14 +329,6 @@ public void collect(int doc) {
     private static void summarizeScorer(
         final StringBuilder builder, final Scorable scorer, final int indent) throws IOException {
       builder.append(scorer.getClass().getSimpleName());
-      if (scorer instanceof TermScorer) {
-        TermQuery termQuery = (TermQuery) ((Scorer) scorer).getWeight().getQuery();
-        builder
-            .append(" ")
-            .append(termQuery.getTerm().field())
-            .append(":")
-            .append(termQuery.getTerm().text());
-      }
       for (final Scorable.ChildScorable childScorer : scorer.getChildren()) {
         indent(builder, indent + 1).append(childScorer.relationship).append(" ");
         summarizeScorer(builder, childScorer.child, indent + 2);

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

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.lucene.analysis.Analyzer;
@@ -147,15 +148,14 @@ private static class TestCollector extends SimpleCollector {
     private final AtomicBoolean setScorerCalled = new AtomicBoolean(false);
 
     @Override
-    public void setScorer(Scorable s) throws IOException {
-      Collection<Scorer.ChildScorable> childScorers = s.getChildren();
-      setScorerCalled.set(true);
-      assertEquals(2, childScorers.size());
+    public void setWeight(Weight weight) {
+      BooleanQuery query = (BooleanQuery) weight.getQuery();
+      List<BooleanClause> clauseList = query.clauses();
+      assertEquals(2, clauseList.size());
       Set<String> terms = new HashSet<>();
-      for (Scorer.ChildScorable childScorer : childScorers) {
-        Query query = ((Scorer) childScorer.child).getWeight().getQuery();
-        assertTrue(query instanceof TermQuery);
-        Term term = ((TermQuery) query).getTerm();
+      for (BooleanClause clause : clauseList) {
+        assert (clause.query() instanceof TermQuery);
+        Term term = ((TermQuery) clause.query()).getTerm();
         assertEquals("field", term.field());
         terms.add(term.text());
       }
@@ -164,6 +164,13 @@ public void setScorer(Scorable s) throws IOException {
       assertTrue(terms.contains("b"));
     }
 
+    @Override
+    public void setScorer(Scorable s) throws IOException {
+      Collection<Scorer.ChildScorable> childScorers = s.getChildren();
+      setScorerCalled.set(true);
+      assertEquals(2, childScorers.size());
+    }
+
     @Override
     public void collect(int doc) {}
 

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

@@ -205,10 +205,9 @@ ConstantScoreScorer constantScoreScorer(Query query, float score, ScoreMode scor
       Scorer scorer = weight.scorer(context);
 
       if (scorer.twoPhaseIterator() == null) {
-        return new ConstantScoreScorer(scorer.getWeight(), score, scoreMode, scorer.iterator());
+        return new ConstantScoreScorer(weight, score, scoreMode, scorer.iterator());
       } else {
-        return new ConstantScoreScorer(
-            scorer.getWeight(), score, scoreMode, scorer.twoPhaseIterator());
+        return new ConstantScoreScorer(weight, score, scoreMode, scorer.twoPhaseIterator());
       }
     }