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

Merge pull request #11308 from jpountz/fix/term_vs_terms_query 

Search: Do not specialize TermQuery vs. TermsQuery.
This commit is contained in:
Adrien Grand 2015-05-29 09:45:09 +02:00
parent 5600757f3e aa98ae5240
commit 1bf2a44044
3 changed files with 5 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/elasticsearch/index/mapper/core/AbstractFieldMapper.java
View File

@ -478,23 +478,11 @@ public abstract class AbstractFieldMapper implements FieldMapper {
@Override
public Query termsQuery(List values, @Nullable QueryParseContext context) {
switch (values.size()) {
case 0:
return Queries.newMatchNoDocsQuery();
case 1:
// When there is a single term, it's important to return a term filter so that
// it can return a DocIdSet that is directly backed by a postings list, instead
// of loading everything into a bit set and returning an iterator based on the
// bit set
return termQuery(values.get(0), context);
default:
BytesRef[] bytesRefs = new BytesRef[values.size()];
for (int i = 0; i < bytesRefs.length; i++) {
bytesRefs[i] = indexedValueForSearch(values.get(i));
}
return new TermsQuery(names.indexName(), bytesRefs);
}
}
@Override

4
src/main/java/org/elasticsearch/index/mapper/internal/IdFieldMapper.java
View File

@ -188,12 +188,8 @@ public class IdFieldMapper extends AbstractFieldMapper implements RootMapper {
return super.termQuery(value, context);
}
final BytesRef[] uids = Uid.createUidsForTypesAndId(context.queryTypes(), value);
if (uids.length == 1) {
return new TermQuery(new Term(UidFieldMapper.NAME, uids[0]));
} else {
return new TermsQuery(UidFieldMapper.NAME, uids);
}
}
@Override
public Query termsQuery(List values, @Nullable QueryParseContext context) {

14
src/test/java/org/elasticsearch/index/mapper/string/SimpleStringMappingTests.java
View File

@ -518,18 +518,4 @@ public class SimpleStringMappingTests extends ElasticsearchSingleNodeTest {
assertTrue(mergeResult.buildConflicts()[0].contains("cannot enable norms"));
}
public void testTermsQuery() throws Exception {
String mapping = XContentFactory.jsonBuilder().startObject().startObject("type")
.startObject("properties").startObject("field").field("type", "string").field("index", "not_analyzed").endObject().endObject()
.endObject().endObject().string();
DocumentMapper defaultMapper = parser.parse(mapping);
FieldMapper mapper = defaultMapper.mappers().getMapper("field");
assertNotNull(mapper);
assertTrue(mapper instanceof StringFieldMapper);
assertEquals(Queries.newMatchNoDocsQuery(), mapper.termsQuery(Collections.emptyList(), null));
assertEquals(new TermQuery(new Term("field", "value")), mapper.termsQuery(Collections.singletonList("value"), null));
assertEquals(new TermsQuery(new Term("field", "value1"), new Term("field", "value2")), mapper.termsQuery(Arrays.asList("value1", "value2"), null));
}
}