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

Query DSL: Fuzzy Query - add max_expansions, closes #905.

This commit is contained in:
kimchy 2011-05-05 13:46:19 +03:00
parent d3076945ac
commit dffb11bdbf
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/FuzzyQueryParser.java
View File

@ -61,6 +61,7 @@ public class FuzzyQueryParser extends AbstractIndexComponent implements XContent
float boost = 1.0f; float boost = 1.0f;
float minSimilarity = FuzzyQuery.defaultMinSimilarity; float minSimilarity = FuzzyQuery.defaultMinSimilarity;
int prefixLength = FuzzyQuery.defaultPrefixLength; int prefixLength = FuzzyQuery.defaultPrefixLength;
int maxExpansions = FuzzyQuery.defaultMaxExpansions;
token = parser.nextToken(); token = parser.nextToken();
if (token == XContentParser.Token.START_OBJECT) { if (token == XContentParser.Token.START_OBJECT) {
String currentFieldName = null; String currentFieldName = null;
@ -78,6 +79,8 @@ public class FuzzyQueryParser extends AbstractIndexComponent implements XContent
minSimilarity = parser.floatValue(); minSimilarity = parser.floatValue();
} else if ("prefix_length".equals(currentFieldName) || "prefixLength".equals(currentFieldName)) { } else if ("prefix_length".equals(currentFieldName) || "prefixLength".equals(currentFieldName)) {
prefixLength = parser.intValue(); prefixLength = parser.intValue();
} else if ("max_expansions".equals(currentFieldName) || "maxExpansions".equals(currentFieldName)) {
maxExpansions = parser.intValue();
} }
} }
} }
@ -94,7 +97,7 @@ public class FuzzyQueryParser extends AbstractIndexComponent implements XContent
MapperService.SmartNameFieldMappers smartNameFieldMappers = parseContext.smartFieldMappers(fieldName); MapperService.SmartNameFieldMappers smartNameFieldMappers = parseContext.smartFieldMappers(fieldName);
FuzzyQuery fuzzyQuery = new FuzzyQuery(new Term(fieldName, value), minSimilarity, prefixLength); FuzzyQuery fuzzyQuery = new FuzzyQuery(new Term(fieldName, value), minSimilarity, prefixLength, maxExpansions);
fuzzyQuery.setBoost(boost); fuzzyQuery.setBoost(boost);
return wrapSmartNameQuery(fuzzyQuery, smartNameFieldMappers, parseContext); return wrapSmartNameQuery(fuzzyQuery, smartNameFieldMappers, parseContext);