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

SOLR-3104: get sortfield values for fsv in docid order 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1241537 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2012-02-07 18:01:54 +00:00
parent 29329e1787
commit a26d3d1d4c
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
View File

@ -581,7 +581,7 @@ public class QueryComponent extends SearchComponent
if(fsv){
Sort sort = searcher.weightSort(rb.getSortSpec().getSort());
SortField[] sortFields = sort==null ? new SortField[]{SortField.FIELD_SCORE} : sort.getSort();
NamedList<List> sortVals = new NamedList<List>(); // order is important for the sort fields
NamedList<Object[]> sortVals = new NamedList<Object[]>(); // order is important for the sort fields
Field field = new StringField("dummy", ""); // a dummy Field
IndexReaderContext topReaderContext = searcher.getTopReaderContext();
AtomicReaderContext[] leaves = ReaderUtil.leaves(topReaderContext);
@ -592,35 +592,49 @@ public class QueryComponent extends SearchComponent
leaves=null;
}
DocList docList = rb.getResults().docList;
// sort ids from lowest to highest so we can access them in order
int nDocs = docList.size();
long[] sortedIds = new long[nDocs];
DocIterator it = rb.getResults().docList.iterator();
for (int i=0; i<nDocs; i++) {
sortedIds[i] = (((long)it.nextDoc()) << 32) | i;
}
Arrays.sort(sortedIds);
for (SortField sortField: sortFields) {
SortField.Type type = sortField.getType();
if (type==SortField.Type.SCORE || type==SortField.Type.DOC) continue;
FieldComparator comparator = null;
FieldComparator comparators[] = (leaves==null) ? null : new FieldComparator[leaves.length];
String fieldname = sortField.getField();
FieldType ft = fieldname==null ? null : req.getSchema().getFieldTypeNoEx(fieldname);
DocList docList = rb.getResults().docList;
List<Object> vals = new ArrayList<Object>(docList.size());
DocIterator it = rb.getResults().docList.iterator();
Object[] vals = new Object[nDocs];
int lastIdx = -1;
int idx = 0;
while(it.hasNext()) {
int doc = it.nextDoc();
for (long idAndPos : sortedIds) {
int doc = (int)(idAndPos >>> 32);
int position = (int)idAndPos;
if (leaves != null) {
idx = ReaderUtil.subIndex(doc, leaves);
currentLeaf = leaves[idx];
comparator = comparators[idx];
if (idx != lastIdx) {
// we switched segments. invalidate comparator.
comparator = null;
}
}
if (comparator == null) {
comparator = sortField.getComparator(1,0);
comparator = comparator.setNextReader(currentLeaf);
if (comparators != null)
comparators[idx] = comparator;
}
doc -= currentLeaf.docBase; // adjust for what segment this is in
@ -647,7 +661,7 @@ public class QueryComponent extends SearchComponent
val = ft.toObject(field);
}
vals.add(val);
vals[position] = val;
}
sortVals.add(fieldname, vals);