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

use AndFilter when there is both an alias filer and a filter

This commit is contained in:
kimchy 2011-05-25 03:06:03 +03:00
parent e3bffba327
commit e022f744ee
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/elasticsearch/src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
View File

@ -89,6 +89,7 @@ public class IndexAliasesService extends AbstractIndexComponent implements Itera
} }
return indexAlias.parsedFilter(); return indexAlias.parsedFilter();
} else { } else {
// we need to bench here a bit, to see maybe it makes sense to use OrFilter
XBooleanFilter combined = new XBooleanFilter(); XBooleanFilter combined = new XBooleanFilter();
for (String alias : aliases) { for (String alias : aliases) {
IndexAlias indexAlias = alias(alias); IndexAlias indexAlias = alias(alias);

17
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/ContextIndexSearcher.java
View File

@ -21,13 +21,21 @@ package org.elasticsearch.search.internal;
import org.apache.lucene.index.ExtendedIndexSearcher; import org.apache.lucene.index.ExtendedIndexSearcher;
import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexReader;
import org.apache.lucene.search.*; import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.TimeLimitingCollector;
import org.apache.lucene.search.TopFieldCollector;
import org.apache.lucene.search.TopFieldDocs;
import org.apache.lucene.search.Weight;
import org.elasticsearch.common.collect.ImmutableList;
import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Lists;
import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.collect.Maps;
import org.elasticsearch.common.lucene.MinimumScoreCollector; import org.elasticsearch.common.lucene.MinimumScoreCollector;
import org.elasticsearch.common.lucene.MultiCollector; import org.elasticsearch.common.lucene.MultiCollector;
import org.elasticsearch.common.lucene.search.AndFilter;
import org.elasticsearch.common.lucene.search.FilteredCollector; import org.elasticsearch.common.lucene.search.FilteredCollector;
import org.elasticsearch.common.lucene.search.XBooleanFilter;
import org.elasticsearch.index.engine.Engine; import org.elasticsearch.index.engine.Engine;
import org.elasticsearch.search.dfs.CachedDfSource; import org.elasticsearch.search.dfs.CachedDfSource;
@ -171,10 +179,7 @@ public class ContextIndexSearcher extends ExtendedIndexSearcher {
combinedFilter = searchContext.aliasFilter(); combinedFilter = searchContext.aliasFilter();
} else { } else {
if (searchContext.aliasFilter() != null) { if (searchContext.aliasFilter() != null) {
XBooleanFilter booleanFilter = new XBooleanFilter(); combinedFilter = new AndFilter(ImmutableList.of(filter, searchContext.aliasFilter()));
booleanFilter.add(new FilterClause(filter, BooleanClause.Occur.MUST));
booleanFilter.add(new FilterClause(searchContext.aliasFilter(), BooleanClause.Occur.MUST));
combinedFilter = booleanFilter;
} else { } else {
combinedFilter = filter; combinedFilter = filter;
} }