You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2012/03/23 11:33:17 UTC
svn commit: r1304269 - in
/lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join:
ToParentBlockJoinCollector.java ToParentBlockJoinQuery.java
Author: mikemccand
Date: Fri Mar 23 10:33:17 2012
New Revision: 1304269
URL: http://svn.apache.org/viewvc?rev=1304269&view=rev
Log:
make the connetion between TPBJC's trackScores and TPBJQ's ScoreMode more transparent
Modified:
lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
Modified: lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java?rev=1304269&r1=1304268&r2=1304269&view=diff
==============================================================================
--- lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java (original)
+++ lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinCollector.java Fri Mar 23 10:33:17 2012
@@ -18,7 +18,7 @@ package org.apache.lucene.search.join;
*/
import org.apache.lucene.index.AtomicReaderContext;
-import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriter; // javadocs
import org.apache.lucene.search.*;
import org.apache.lucene.search.Scorer.ChildScorer;
import org.apache.lucene.search.grouping.GroupDocs;
@@ -100,7 +100,9 @@ public class ToParentBlockJoinCollector
private float maxScore = Float.NaN;
/* Creates a ToParentBlockJoinCollector. The provided sort must
- * not be null. */
+ * not be null. If you pass true trackScores, all
+ * ToParentBlockQuery instances must not use
+ * ScoreMode.None. */
public ToParentBlockJoinCollector(Sort sort, int numParentHits, boolean trackScores, boolean trackMaxScore) throws IOException {
// TODO: allow null sort to be specialized to relevance
// only collector
Modified: lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java?rev=1304269&r1=1304268&r2=1304269&view=diff
==============================================================================
--- lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java (original)
+++ lucene/dev/trunk/modules/join/src/java/org/apache/lucene/search/join/ToParentBlockJoinQuery.java Fri Mar 23 10:33:17 2012
@@ -267,7 +267,7 @@ public class ToParentBlockJoinQuery exte
float[] swapChildScores(float[] other) {
if (scoreMode == ScoreMode.None) {
- throw new IllegalStateException("ScoreMode is None");
+ throw new IllegalStateException("ScoreMode is None; you must pass trackScores=false to ToParentBlockJoinCollector");
}
final float[] ret = pendingChildScores;
if (other == null) {