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

query parser should take into account using all, since all creates a specialized "term query" which boosts based on the boost level associated with a term. Generalized it so mappers can control when query is used for term query.

This commit is contained in:
kimchy 2010-03-18 00:53:36 +02:00
parent a8be04b334
commit 1107df9ab6
4 changed files with 55 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/FieldMapper.java
View File

@ -22,6 +22,7 @@ package org.elasticsearch.index.mapper;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query;
import org.apache.lucene.util.StringHelper;
@ -143,8 +144,16 @@ public interface FieldMapper<T> {
*/
boolean useFieldQueryWithQueryString();
/**
* A field query for the specified value.
*/
Query fieldQuery(String value);
/**
* A term query to use when parsing a query string. Can return <tt>null</tt>.
*/
Query queryStringTermQuery(Term term);
Filter fieldFilter(String value);
/**

7
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonAllFieldMapper.java
View File

@ -23,6 +23,8 @@ import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.Fieldable;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.elasticsearch.index.analysis.NamedAnalyzer;
import org.elasticsearch.index.mapper.AllFieldMapper;
import org.elasticsearch.index.mapper.DocumentMapper;
@ -30,6 +32,7 @@ import org.elasticsearch.index.mapper.MergeMappingException;
import org.elasticsearch.util.json.JsonBuilder;
import org.elasticsearch.util.lucene.Lucene;
import org.elasticsearch.util.lucene.all.AllAnalyzer;
import org.elasticsearch.util.lucene.all.AllTermQuery;
import java.io.IOException;
@ -106,6 +109,10 @@ public class JsonAllFieldMapper extends JsonFieldMapper<Void> implements AllFiel
return this.enabled;
}
@Override public Query queryStringTermQuery(Term term) {
return new AllTermQuery(term);
}
@Override protected Field parseCreateField(JsonParseContext jsonContext) throws IOException {
if (!enabled) {
return null;

4
modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/json/JsonFieldMapper.java
View File

@ -308,6 +308,10 @@ public abstract class JsonFieldMapper<T> implements FieldMapper<T>, JsonMapper {
return new TermQuery(new Term(names.indexName(), indexedValue(value)));
}
@Override public Query queryStringTermQuery(Term term) {
return null;
}
@Override public Filter fieldFilter(String value) {
return new TermFilter(new Term(names.indexName(), indexedValue(value)));
}

48
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/support/MapperQueryParser.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.index.query.support;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.index.Term;
import org.apache.lucene.queryParser.ParseException;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.BooleanClause;
@ -52,6 +53,8 @@ public class MapperQueryParser extends QueryParser {
private final FilterCache filterCache;
private FieldMapper currentMapper;
public MapperQueryParser(String defaultField, Analyzer analyzer,
@Nullable MapperService mapperService,
@Nullable FilterCache filterCache) {
@ -61,17 +64,28 @@ public class MapperQueryParser extends QueryParser {
setMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT);
}
@Override protected Query newTermQuery(Term term) {
if (currentMapper != null) {
Query termQuery = currentMapper.queryStringTermQuery(term);
if (termQuery != null) {
return termQuery;
}
}
return super.newTermQuery(term);
}
@Override public Query getFieldQuery(String field, String queryText) throws ParseException {
currentMapper = null;
if (mapperService != null) {
MapperService.SmartNameFieldMappers fieldMappers = mapperService.smartName(field);
if (fieldMappers != null) {
FieldMapper mapper = fieldMappers.fieldMappers().mapper();
if (mapper != null) {
currentMapper = fieldMappers.fieldMappers().mapper();
if (currentMapper != null) {
Query query;
if (mapper.useFieldQueryWithQueryString()) {
query = fieldMappers.fieldMappers().mapper().fieldQuery(queryText);
if (currentMapper.useFieldQueryWithQueryString()) {
query = currentMapper.fieldQuery(queryText);
} else {
query = super.getFieldQuery(mapper.names().indexName(), queryText);
query = super.getFieldQuery(currentMapper.names().indexName(), queryText);
}
return wrapSmartNameQuery(query, fieldMappers, filterCache);
}
@ -87,11 +101,13 @@ public class MapperQueryParser extends QueryParser {
if ("*".equals(part2)) {
part2 = null;
}
currentMapper = null;
if (mapperService != null) {
MapperService.SmartNameFieldMappers fieldMappers = mapperService.smartName(field);
if (fieldMappers != null) {
if (fieldMappers.fieldMappers().mapper() != null) {
Query rangeQuery = fieldMappers.fieldMappers().mapper().rangeQuery(part1, part2, inclusive, inclusive);
currentMapper = fieldMappers.fieldMappers().mapper();
if (currentMapper != null) {
Query rangeQuery = currentMapper.rangeQuery(part1, part2, inclusive, inclusive);
return wrapSmartNameQuery(rangeQuery, fieldMappers, filterCache);
}
}
@ -101,11 +117,13 @@ public class MapperQueryParser extends QueryParser {
@Override protected Query getPrefixQuery(String field, String termStr) throws ParseException {
String indexedNameField = field;
currentMapper = null;
if (mapperService != null) {
MapperService.SmartNameFieldMappers fieldMappers = mapperService.smartName(field);
if (fieldMappers != null) {
if (fieldMappers.fieldMappers().mapper() != null) {
indexedNameField = fieldMappers.fieldMappers().mapper().names().indexName();
currentMapper = fieldMappers.fieldMappers().mapper();
if (currentMapper != null) {
indexedNameField = currentMapper.names().indexName();
}
return wrapSmartNameQuery(super.getPrefixQuery(indexedNameField, termStr), fieldMappers, filterCache);
}
@ -115,11 +133,13 @@ public class MapperQueryParser extends QueryParser {
@Override protected Query getFuzzyQuery(String field, String termStr, float minSimilarity) throws ParseException {
String indexedNameField = field;
currentMapper = null;
if (mapperService != null) {
MapperService.SmartNameFieldMappers fieldMappers = mapperService.smartName(field);
if (fieldMappers != null) {
if (fieldMappers.fieldMappers().mapper() != null) {
indexedNameField = fieldMappers.fieldMappers().mapper().names().indexName();
currentMapper = fieldMappers.fieldMappers().mapper();
if (currentMapper != null) {
indexedNameField = currentMapper.names().indexName();
}
return wrapSmartNameQuery(super.getFuzzyQuery(indexedNameField, termStr, minSimilarity), fieldMappers, filterCache);
}
@ -129,11 +149,13 @@ public class MapperQueryParser extends QueryParser {
@Override protected Query getWildcardQuery(String field, String termStr) throws ParseException {
String indexedNameField = field;
currentMapper = null;
if (mapperService != null) {
MapperService.SmartNameFieldMappers fieldMappers = mapperService.smartName(field);
if (fieldMappers != null) {
if (fieldMappers.fieldMappers().mapper() != null) {
indexedNameField = fieldMappers.fieldMappers().mapper().names().indexName();
currentMapper = fieldMappers.fieldMappers().mapper();
if (currentMapper != null) {
indexedNameField = currentMapper.names().indexName();
}
return wrapSmartNameQuery(super.getWildcardQuery(indexedNameField, termStr), fieldMappers, filterCache);
}