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 2013/01/15 22:20:23 UTC
svn commit: r1433656 - in /lucene/dev/branches/lucene_solr_4_1: ./ lucene/
lucene/CHANGES.txt lucene/core/
lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
Author: uschindler
Date: Tue Jan 15 21:20:22 2013
New Revision: 1433656
URL: http://svn.apache.org/viewvc?rev=1433656&view=rev
Log:
Merged revision(s) 1433653 from lucene/dev/branches/branch_4x:
LUCENE-4465: Let ConstantScoreQuery's Scorer return its child scorer.
Modified:
lucene/dev/branches/lucene_solr_4_1/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_1/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
Modified: lucene/dev/branches/lucene_solr_4_1/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_1/lucene/CHANGES.txt?rev=1433656&r1=1433655&r2=1433656&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_1/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_1/lucene/CHANGES.txt Tue Jan 15 21:20:22 2013
@@ -321,6 +321,9 @@ Bug Fixes
DEFAULT_ARTICLES list passed to ElisionFilter. (David Leunen via Steve Rowe)
* LUCENE-4671: Fix CharsRef.subSequence method. (Tim Smith via Robert Muir)
+
+* LUCENE-4465: Let ConstantScoreQuery's Scorer return its child scorer.
+ (selckin via Uwe Schindler)
Changes in Runtime Behavior
Modified: lucene/dev/branches/lucene_solr_4_1/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_1/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java?rev=1433656&r1=1433655&r2=1433656&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_1/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java (original)
+++ lucene/dev/branches/lucene_solr_4_1/lucene/core/src/java/org/apache/lucene/search/ConstantScoreQuery.java Tue Jan 15 21:20:22 2013
@@ -24,6 +24,8 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.ToStringUtils;
import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
/**
@@ -248,6 +250,14 @@ public class ConstantScoreQuery extends
return super.score(collector, max, firstDocID);
}
}
+
+ @Override
+ public Collection<ChildScorer> getChildren() {
+ if (docIdSetIterator instanceof Scorer)
+ return Collections.singletonList(new ChildScorer((Scorer) docIdSetIterator, "constant"));
+ else
+ return Collections.emptyList();
+ }
}
@Override