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

SOLR-1928: fix terms component index order tiebreak 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@948299 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-05-26 03:02:59 +00:00
parent 9e61dd591f
commit 9d4bd2af41
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solr/CHANGES.txt
View File

@ -307,6 +307,10 @@ Bug Fixes
* SOLR-1824: IndexSchema will now fail to initialize if there is a * SOLR-1824: IndexSchema will now fail to initialize if there is a
problem initializing one of the fields or field types. (hossman) problem initializing one of the fields or field types. (hossman)
* SOLR-1928: TermsComponent didn't correctly break ties for non-text
fields sorted by count. (yonik)
Other Changes Other Changes
---------------------- ----------------------

19
solr/src/java/org/apache/solr/handler/component/TermsComponent.java
View File

@ -164,7 +164,7 @@ public class TermsComponent extends SearchComponent {
} }
int i = 0; int i = 0;
BoundedTreeSet<CountPair<String, Integer>> queue = (sort ? new BoundedTreeSet<CountPair<String, Integer>>(limit) : null); BoundedTreeSet<CountPair<BytesRef, Integer>> queue = (sort ? new BoundedTreeSet<CountPair<BytesRef, Integer>>(limit) : null);
CharArr external = new CharArr(); CharArr external = new CharArr();
while (term != null && (i<limit || sort)) { while (term != null && (i<limit || sort)) {
@ -194,19 +194,18 @@ public class TermsComponent extends SearchComponent {
int docFreq = termsEnum.docFreq(); int docFreq = termsEnum.docFreq();
if (docFreq >= freqmin && docFreq <= freqmax) { if (docFreq >= freqmin && docFreq <= freqmax) {
// add the term to the list // add the term to the list
if (sort) {
queue.add(new CountPair<BytesRef, Integer>(new BytesRef(term), docFreq));
} else {
// TODO: handle raw somehow // TODO: handle raw somehow
if (!externalized) { if (!externalized) {
external.reset(); external.reset();
ft.indexedToReadable(term, external); ft.indexedToReadable(term, external);
} }
String label = external.toString(); String label = external.toString();
if (sort) {
// TODO: defer conversion to string until the end...
// using the label now is a bug since tiebreak will not be in index order
queue.add(new CountPair<String, Integer>(label, docFreq));
} else {
fieldTerms.add(label, docFreq); fieldTerms.add(label, docFreq);
i++; i++;
} }
@ -216,9 +215,11 @@ public class TermsComponent extends SearchComponent {
} }
if (sort) { if (sort) {
for (CountPair<String, Integer> item : queue) { for (CountPair<BytesRef, Integer> item : queue) {
if (i >= limit) break; if (i >= limit) break;
fieldTerms.add(item.key, item.val); external.reset();
ft.indexedToReadable(item.key, external);
fieldTerms.add(external.toString(), item.val);
i++; i++;
} }
} }