honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 06:16:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Query DSL: ids filter/parse to automatically use types provided as part of the search, closes #1188.

Browse Source
This commit is contained in:
Shay Banon 2011-08-01 13:06:05 +03:00
parent c25d9a7842
commit 2afe7f80a1
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsFilterParser.java
View File

@ -25,9 +25,11 @@ import org.elasticsearch.common.collect.Iterables;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.search.UidFilter;
import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@ -86,7 +88,12 @@ public class IdsFilterParser implements FilterParser {
}
if (types == null || types.isEmpty()) {
types = parseContext.mapperService().types();
SearchContext searchContext = SearchContext.current();
if (searchContext.hasTypes()) {
types = Arrays.asList(searchContext.types());
} else {
types = parseContext.mapperService().types();
}
} else if (types.size() == 1 && Iterables.getFirst(types, null).equals("_all")) {
types = parseContext.mapperService().types();
}

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/IdsQueryParser.java
View File

@ -26,9 +26,11 @@ import org.elasticsearch.common.collect.Iterables;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.search.UidFilter;
import org.elasticsearch.search.internal.SearchContext;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@ -90,7 +92,12 @@ public class IdsQueryParser implements QueryParser {
}
if (types == null || types.isEmpty()) {
types = parseContext.mapperService().types();
SearchContext searchContext = SearchContext.current();
if (searchContext.hasTypes()) {
types = Arrays.asList(searchContext.types());
} else {
types = parseContext.mapperService().types();
}
} else if (types.size() == 1 && Iterables.getFirst(types, null).equals("_all")) {
types = parseContext.mapperService().types();
}

4
modules/elasticsearch/src/main/java/org/elasticsearch/search/internal/SearchContext.java
View File

@ -209,6 +209,10 @@ public class SearchContext implements Releasable {
return this.numberOfShards;
}
public boolean hasTypes() {
return types != null && types.length > 0;
}
public String[] types() {
return types;
}