You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kr...@apache.org on 2017/01/03 18:48:27 UTC
[16/50] lucene-solr:jira/solr-8593: LUCENE-7607:
FieldLeafComparator.setScorer() should throw IOException
LUCENE-7607: FieldLeafComparator.setScorer() should throw IOException
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/87b6c2c8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/87b6c2c8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/87b6c2c8
Branch: refs/heads/jira/solr-8593
Commit: 87b6c2c8fcdc3a5f4adc3516f249af89b479d77a
Parents: 12aff1c
Author: Alan Woodward <ro...@apache.org>
Authored: Wed Dec 28 19:48:16 2016 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Thu Dec 29 12:22:40 2016 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../org/apache/lucene/search/LeafFieldComparator.java | 2 +-
.../apache/lucene/search/SimpleFieldComparator.java | 2 +-
.../apache/solr/search/CollapsingQParserPlugin.java | 14 +++++++-------
4 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87b6c2c8/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 7a118f1..35314db 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -65,6 +65,9 @@ API Changes
* LUCENE-7533: Classic query parser no longer allows autoGeneratePhraseQueries
to be set to true when splitOnWhitespace is false (and vice-versa).
+* LUCENE-7607: LeafFieldComparator.setScorer and SimpleFieldComparator.setScorer
+ are declared as throwing IOException (Alan Woodward)
+
New features
* LUCENE-5867: Added BooleanSimilarity. (Robert Muir, Adrien Grand)
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87b6c2c8/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java b/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java
index 6019376..677639c 100644
--- a/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/LeafFieldComparator.java
@@ -114,6 +114,6 @@ public interface LeafFieldComparator {
*
* @param scorer Scorer instance that you should use to
* obtain the current hit's score, if necessary. */
- void setScorer(Scorer scorer);
+ void setScorer(Scorer scorer) throws IOException;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87b6c2c8/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java b/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java
index 3f1e6c2..a258e24 100644
--- a/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java
+++ b/lucene/core/src/java/org/apache/lucene/search/SimpleFieldComparator.java
@@ -38,5 +38,5 @@ public abstract class SimpleFieldComparator<T> extends FieldComparator<T> implem
}
@Override
- public void setScorer(Scorer scorer) {}
+ public void setScorer(Scorer scorer) throws IOException {}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/87b6c2c8/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 f6bc18e..44aade5 100644
--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -965,7 +965,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
@Override public boolean needsScores() { return needsScores || super.needsScores(); }
- public void setScorer(Scorer scorer) {
+ public void setScorer(Scorer scorer) throws IOException {
this.collapseStrategy.setScorer(scorer);
}
@@ -1147,7 +1147,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
@Override public boolean needsScores() { return needsScores || super.needsScores(); }
- public void setScorer(Scorer scorer) {
+ public void setScorer(Scorer scorer) throws IOException {
this.collapseStrategy.setScorer(scorer);
}
@@ -1523,7 +1523,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
return collapsedSet;
}
- public void setScorer(Scorer scorer) {
+ public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
@@ -1952,7 +1952,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
}
@Override
- public void setScorer(Scorer s) {
+ public void setScorer(Scorer s) throws IOException {
super.setScorer(s);
this.compareState.setScorer(s);
}
@@ -2100,7 +2100,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
return collapsedSet;
}
- public void setScorer(Scorer scorer) {
+ public void setScorer(Scorer scorer) throws IOException {
this.scorer = scorer;
}
@@ -2522,7 +2522,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
}
@Override
- public void setScorer(Scorer s) {
+ public void setScorer(Scorer s) throws IOException {
super.setScorer(s);
this.compareState.setScorer(s);
}
@@ -2673,7 +2673,7 @@ public class CollapsingQParserPlugin extends QParserPlugin {
leafFieldComparators[clause] = fieldComparators[clause].getLeafComparator(context);
}
}
- public void setScorer(Scorer s) {
+ public void setScorer(Scorer s) throws IOException {
for (int clause = 0; clause < numClauses; clause++) {
leafFieldComparators[clause].setScorer(s);
}