From 3b1a335fb3dfc9d4f085740d30095ff07f48f25c Mon Sep 17 00:00:00 2001 From: Alan Woodward Date: Wed, 5 Sep 2018 08:14:18 +0100 Subject: [PATCH] LUCENE-6228: Missed refactoring of CollapsingQParserPlugin delegating collector --- .../org/apache/solr/search/CollapsingQParserPlugin.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java index 5c0848a5d11..54664fb4aa4 100644 --- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java @@ -1147,7 +1147,8 @@ public class CollapsingQParserPlugin extends QParserPlugin { @Override public ScoreMode scoreMode() { return needsScores ? ScoreMode.COMPLETE : super.scoreMode(); } - public void setScorer(Scorer scorer) throws IOException { + @Override + public void setScorer(Scorable scorer) throws IOException { this.collapseStrategy.setScorer(scorer); } @@ -2003,7 +2004,7 @@ public class CollapsingQParserPlugin extends QParserPlugin { private static abstract class IntFieldValueStrategy { protected int nullPolicy; protected IntIntHashMap cmap; - protected Scorer scorer; + protected Scorable scorer; protected FloatArrayList nullScores; protected float nullScore; protected float[] scores; @@ -2083,7 +2084,7 @@ public class CollapsingQParserPlugin extends QParserPlugin { return collapsedSet; } - public void setScorer(Scorer scorer) throws IOException { + public void setScorer(Scorable scorer) throws IOException { this.scorer = scorer; } @@ -2495,7 +2496,7 @@ public class CollapsingQParserPlugin extends QParserPlugin { } @Override - public void setScorer(Scorer s) throws IOException { + public void setScorer(Scorable s) throws IOException { super.setScorer(s); this.compareState.setScorer(s); }