You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/04/27 10:39:51 UTC
svn commit: r1331296 - in /lucene/dev/branches/lucene_solr_3_6/lucene: ./
core/src/java/org/apache/lucene/search/
Author: uschindler
Date: Fri Apr 27 08:39:50 2012
New Revision: 1331296
URL: http://svn.apache.org/viewvc?rev=1331296&view=rev
Log:
LUCENE-4023: Make Scorer.visitSubScorers() public, as it was protected which makes it impossible to implement it on a composite scorer in another package; fix DisjunctionMaxScorer to implement it
Modified:
lucene/dev/branches/lucene_solr_3_6/lucene/CHANGES.txt
lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/Scorer.java
Modified: lucene/dev/branches/lucene_solr_3_6/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/CHANGES.txt?rev=1331296&r1=1331295&r2=1331296&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/CHANGES.txt Fri Apr 27 08:39:50 2012
@@ -14,6 +14,15 @@ Bug Fixes:
* LUCENE-3971: MappingCharFilter could return invalid final token position.
(Dawid Weiss, Robert Muir)
+* LUCENE-4023: DisjunctionMaxScorer now implements visitSubScorers().
+ (Uwe Schindler)
+
+API Changes
+
+* LUCENE-4023: Changed the visibility of Scorer#visitSubScorers() to
+ public, otherwise it's impossible to implement Scorers outside
+ the Lucene package. (Uwe Schindler)
+
Tests:
* LUCENE-3873: add MockGraphTokenFilter, testing analyzers with
@@ -22,6 +31,7 @@ Tests:
* LUCENE-3968: factor out LookaheadTokenFilter from
MockGraphTokenFilter (Mike Mccandless)
+
======================= Lucene 3.6.0 =======================
More information about this release, including any errata related to the
release notes, upgrade instructions, or other changes may be found online at:
Modified: lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java?rev=1331296&r1=1331295&r2=1331296&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java Fri Apr 27 08:39:50 2012
@@ -333,7 +333,7 @@ final class BooleanScorer extends Scorer
}
@Override
- protected void visitSubScorers(Query parent, Occur relationship, ScorerVisitor<Query, Query, Scorer> visitor) {
+ public void visitSubScorers(Query parent, Occur relationship, ScorerVisitor<Query, Query, Scorer> visitor) {
super.visitSubScorers(parent, relationship, visitor);
final Query q = weight.getQuery();
SubScorer sub = scorers;
Modified: lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java?rev=1331296&r1=1331295&r2=1331296&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/BooleanScorer2.java Fri Apr 27 08:39:50 2012
@@ -321,7 +321,7 @@ class BooleanScorer2 extends Scorer {
}
@Override
- protected void visitSubScorers(Query parent, Occur relationship, ScorerVisitor<Query, Query, Scorer> visitor) {
+ public void visitSubScorers(Query parent, Occur relationship, ScorerVisitor<Query, Query, Scorer> visitor) {
super.visitSubScorers(parent, relationship, visitor);
final Query q = weight.getQuery();
for (Scorer s : optionalScorers) {
Modified: lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java?rev=1331296&r1=1331295&r2=1331296&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/DisjunctionMaxScorer.java Fri Apr 27 08:39:50 2012
@@ -186,4 +186,13 @@ class DisjunctionMaxScorer extends Score
}
}
+ @Override
+ public void visitSubScorers(Query parent, BooleanClause.Occur relationship, ScorerVisitor<Query, Query, Scorer> visitor) {
+ super.visitSubScorers(parent, relationship, visitor);
+ final Query q = weight.getQuery();
+ for (int i = 0; i < numScorers; i++) {
+ subScorers[i].visitSubScorers(q, BooleanClause.Occur.SHOULD, visitor);
+ }
+ }
+
}
Modified: lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/Scorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/Scorer.java?rev=1331296&r1=1331295&r2=1331296&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/Scorer.java (original)
+++ lucene/dev/branches/lucene_solr_3_6/lucene/core/src/java/org/apache/lucene/search/Scorer.java Fri Apr 27 08:39:50 2012
@@ -198,7 +198,7 @@ public abstract class Scorer extends Doc
*
* @lucene.experimental
*/
- protected void visitSubScorers(Query parent, Occur relationship,
+ public void visitSubScorers(Query parent, Occur relationship,
ScorerVisitor<Query, Query, Scorer> visitor) {
if (weight == null)
throw new UnsupportedOperationException();