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

fix faceting's use of flex: term() is undefined after next() returns null 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@940661 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-05-03 22:51:05 +00:00
parent 031e726a3f
commit 7949e3e218
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
solr/src/java/org/apache/solr/request/SimpleFacets.java
View File

@ -516,6 +516,7 @@ public class SimpleFacets {
Terms terms = fields==null ? null : fields.terms(field);
TermsEnum termsEnum = null;
BytesRef term = null;
if (terms != null) {
termsEnum = terms.iterator();
@ -525,10 +526,12 @@ public class SimpleFacets {
if (startTermBytes != null) {
if (termsEnum.seek(startTermBytes, true) == TermsEnum.SeekStatus.END) {
termsEnum = null;
} else {
term = termsEnum.term();
}
} else {
// position termsEnum on first term
termsEnum.next();
term = termsEnum.next();
}
}
@ -536,11 +539,8 @@ public class SimpleFacets {
DocsEnum docsEnum = null;
if (termsEnum != null && docs.size() >= mincount) {
for(;;) {
BytesRef term = termsEnum.term();
if (term == null)
break;
if (docs.size() >= mincount) {
while (term != null) {
if (startTermBytes != null && !term.startsWith(startTermBytes))
break;
@ -597,7 +597,7 @@ public class SimpleFacets {
}
}
termsEnum.next();
term = termsEnum.next();
}
}

31
solr/src/java/org/apache/solr/search/SolrIndexSearcher.java
View File

@ -18,12 +18,11 @@
package org.apache.solr.search;
import org.apache.lucene.document.*;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.*;
import org.apache.lucene.search.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.SolrConfig;
@ -631,21 +630,29 @@ public class SolrIndexSearcher extends IndexSearcher implements SolrInfoMBean {
Term t = ((TermQuery)query).getTerm();
SolrIndexReader[] readers = reader.getLeafReaders();
int[] offsets = reader.getLeafOffsets();
int[] arr = new int[256];
int[] freq = new int[256];
for (int i=0; i<readers.length; i++) {
SolrIndexReader sir = readers[i];
int offset = offsets[i];
collector.setNextReader(sir, offset);
TermDocs tdocs = sir.termDocs(t);
for(;;) {
int num = tdocs.read(arr, freq);
if (num==0) break;
for (int j=0; j<num; j++) {
collector.collect(arr[j]);
Fields fields = sir.fields();
Terms terms = fields.terms(t.field());
BytesRef termBytes = new BytesRef(t.text());
DocsEnum docsEnum = terms==null ? null : terms.docs(null, termBytes, null);
if (docsEnum != null) {
DocsEnum.BulkReadResult readResult = docsEnum.getBulkResult();
for (;;) {
int n = docsEnum.read();
if (n==0) break;
int[] arr = readResult.docs.ints;
int end = readResult.docs.offset + n;
for (int j=readResult.docs.offset; j<end; j++) {
collector.collect(arr[j]);
}
}
}
tdocs.close();
}
} else {
super.search(query,null,collector);