honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Small) optimization to has_child filter, closes #880.

This commit is contained in:
kimchy 2011-04-25 17:37:56 +03:00
parent 49ac30801e
commit f3e032315f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/type/child/ChildCollector.java
View File

@ -24,6 +24,7 @@ import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.util.OpenBitSet;
import org.elasticsearch.common.BytesWrap;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.index.cache.id.IdReaderTypeCache;
import org.elasticsearch.search.internal.SearchContext;
@ -40,7 +41,7 @@ public class ChildCollector extends Collector {
private final SearchContext context;
private final Map<Object, IdReaderTypeCache> typeCacheMap;
private final Tuple<IndexReader, IdReaderTypeCache>[] readers;
private final Map<Object, OpenBitSet> parentDocs;
@ -52,9 +53,10 @@ public class ChildCollector extends Collector {
this.parentDocs = new HashMap<Object, OpenBitSet>();
// create a specific type map lookup for faster lookup operations per doc
this.typeCacheMap = new HashMap<Object, IdReaderTypeCache>(context.searcher().subReaders().length);
for (IndexReader indexReader : context.searcher().subReaders()) {
typeCacheMap.put(indexReader.getCoreCacheKey(), context.idCache().reader(indexReader).type(parentType));
this.readers = new Tuple[context.searcher().subReaders().length];
for (int i = 0; i < readers.length; i++) {
IndexReader reader = context.searcher().subReaders()[i];
readers[i] = new Tuple<IndexReader, IdReaderTypeCache>(reader, context.idCache().reader(reader).type(parentType));
}
}
@ -71,8 +73,9 @@ public class ChildCollector extends Collector {
if (parentId == null) {
return;
}
for (IndexReader indexReader : context.searcher().subReaders()) {
IdReaderTypeCache idReaderTypeCache = typeCacheMap.get(indexReader.getCoreCacheKey());
for (Tuple<IndexReader, IdReaderTypeCache> tuple : readers) {
IndexReader indexReader = tuple.v1();
IdReaderTypeCache idReaderTypeCache = tuple.v2();
if (idReaderTypeCache == null) { // might be if we don't have that doc with that type in this reader
continue;
}
@ -90,7 +93,7 @@ public class ChildCollector extends Collector {
}
@Override public void setNextReader(IndexReader reader, int docBase) throws IOException {
typeCache = typeCacheMap.get(reader.getCoreCacheKey());
typeCache = context.idCache().reader(reader).type(parentType);
}
@Override public boolean acceptsDocsOutOfOrder() {

7
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/type/child/HasChildFilter.java
View File

@ -81,11 +81,8 @@ public class HasChildFilter extends Filter implements ScopePhase.CollectorPhase
}
@Override public DocIdSet getDocIdSet(IndexReader reader) throws IOException {
DocIdSet docIdSet = parentDocs.get(reader.getCoreCacheKey());
if (docIdSet == null) {
return DocIdSet.EMPTY_DOCIDSET;
}
return docIdSet;
// ok to return null
return parentDocs.get(reader.getCoreCacheKey());
}
@Override public String toString() {