You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/07 07:49:23 UTC
[14/50] [abbrv] lucene-solr:jira/http2: LUCENE-6228: Missed
refactoring of CollapsingQParserPlugin delegating collector
LUCENE-6228: Missed refactoring of CollapsingQParserPlugin delegating collector
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3b1a335f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3b1a335f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3b1a335f
Branch: refs/heads/jira/http2
Commit: 3b1a335fb3dfc9d4f085740d30095ff07f48f25c
Parents: b1b0963
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Sep 5 08:14:18 2018 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Wed Sep 5 08:14:39 2018 +0100
----------------------------------------------------------------------
.../org/apache/solr/search/CollapsingQParserPlugin.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3b1a335f/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
----------------------------------------------------------------------
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 5c0848a..54664fb 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);
}