Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2194 -- calculate correct value for JoinDocFreqValueSource when using a SubReader 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1027226 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan McKinley 2010-10-25 18:23:07 +00:00
parent e69d35f095
commit d2263013e9
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
solr/src/java/org/apache/solr/search/function/JoinDocFreqValueSource.java
View File

@ -24,6 +24,7 @@ import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.FieldCache.DocTerms;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import org.apache.solr.search.SolrIndexReader;
/**
* Use a field value and find the Document Frequency within another field.
@ -45,19 +46,31 @@ public class JoinDocFreqValueSource extends FieldCacheSource {
return NAME + "(" + field +":("+qfield+"))";
}
public DocValues getValues(Map context, final IndexReader reader) throws IOException
public DocValues getValues(Map context, IndexReader reader) throws IOException
{
final DocTerms terms = cache.getTerms(reader, field, true );
int offset = 0;
IndexReader topReader = reader;
if (topReader instanceof SolrIndexReader) {
SolrIndexReader r = (SolrIndexReader)topReader;
while (r.getParent() != null) {
offset += r.getBase();
r = r.getParent();
}
topReader = r;
}
final IndexReader top = topReader;
return new DocValues() {
BytesRef ref = new BytesRef();
public int intVal(int doc)
{
try {
BytesRef ref = new BytesRef();
terms.getTerm(doc, ref);
int v = reader.docFreq( qfield, ref );
//System.out.println( NAME+"["+ref.utf8ToString()+"="+v+"]" );
int v = top.docFreq( qfield, ref );
//System.out.println( NAME+"["+field+"="+ref.utf8ToString()+"=("+qfield+":"+v+")]" );
return v;
}
catch (IOException e) {

1
solr/src/test/org/apache/solr/search/function/SortByFunctionTest.java
View File

@ -94,6 +94,7 @@ public class SortByFunctionTest extends AbstractSolrTestCase {
{
assertU(adoc("id", "4", "id_s", "D", "links_mfacet", "A", "links_mfacet", "B", "links_mfacet", "C" ) );
assertU(adoc("id", "3", "id_s", "C", "links_mfacet", "A", "links_mfacet", "B" ) );
assertU(commit()); // Make sure it uses two readers
assertU(adoc("id", "2", "id_s", "B", "links_mfacet", "A" ) );
assertU(adoc("id", "1", "id_s", "A" ) );
assertU(commit());