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

SOLR-651: fix - get the searcher and schema from the request instead of the core 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@708621 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2008-10-28 17:56:12 +00:00
parent 1dfb5f4d58
commit 9c3ab6d75f
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/java/org/apache/solr/handler/component/TermVectorComponent.java
View File

@ -107,30 +107,26 @@ public class TermVectorComponent extends SearchComponent implements SolrCoreAwar
DocList list = listAndSet.docList;
iter = list.iterator();
}
SolrCore core = rb.req.getCore();
RefCounted<SolrIndexSearcher> searcher = core.getSearcher();
try {
IndexReader reader = searcher.get().getReader();
//the TVMapper is a TermVectorMapper which can be used to optimize loading of Term Vectors
TVMapper mapper = new TVMapper(fields, reader, termFreq, positions, offsets, idf, tfIdf);
IndexSchema schema = core.getSchema();
String uniqFieldName = schema.getUniqueKeyField().getName();
//Only load the id field
SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(Collections.singleton(uniqFieldName), Collections.emptySet());
while (iter.hasNext()) {
Integer docId = iter.next();
NamedList docNL = new NamedList();
termVectors.add("doc-" + docId, docNL);
mapper.docNL = docNL;
Document document = reader.document(docId, fieldSelector);
String uniqId = document.get(uniqFieldName);
docNL.add("uniqueKey", uniqId);
reader.getTermFreqVector(docId, mapper);
}
termVectors.add("uniqueKeyFieldName", uniqFieldName);
} finally {
searcher.decref();
SolrIndexSearcher searcher = rb.req.getSearcher();
IndexReader reader = searcher.getReader();
//the TVMapper is a TermVectorMapper which can be used to optimize loading of Term Vectors
TVMapper mapper = new TVMapper(fields, reader, termFreq, positions, offsets, idf, tfIdf);
IndexSchema schema = rb.req.getSchema();
String uniqFieldName = schema.getUniqueKeyField().getName();
//Only load the id field
SetBasedFieldSelector fieldSelector = new SetBasedFieldSelector(Collections.singleton(uniqFieldName), Collections.emptySet());
while (iter.hasNext()) {
Integer docId = iter.next();
NamedList docNL = new NamedList();
termVectors.add("doc-" + docId, docNL);
mapper.docNL = docNL;
Document document = reader.document(docId, fieldSelector);
String uniqId = document.get(uniqFieldName);
docNL.add("uniqueKey", uniqId);
reader.getTermFreqVector(docId, mapper);
}
termVectors.add("uniqueKeyFieldName", uniqFieldName);
}
private List<Integer> getInts(String[] vals) {