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

Changed common terms query to also support camelCased parameters

Browse Source 
and renamed disable_coords to disable_coord, to be consistent with
the bool query

Closes #3074
This commit is contained in:
Clinton Gormley 2013-05-22 16:51:11 +02:00
parent 927fda8a61
commit bb9871bcb5
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/elasticsearch/index/query/CommonTermsQueryParser.java
View File

@ -48,15 +48,15 @@ import org.elasticsearch.index.mapper.MapperService;
public class CommonTermsQueryParser implements QueryParser { public class CommonTermsQueryParser implements QueryParser {
public static final String NAME = "common"; public static final String NAME = "common";
static final float DEFAULT_MAX_TERM_DOC_FREQ = 0.01f; static final float DEFAULT_MAX_TERM_DOC_FREQ = 0.01f;
static final Occur DEFAULT_HIGH_FREQ_OCCUR = Occur.MUST; static final Occur DEFAULT_HIGH_FREQ_OCCUR = Occur.MUST;
static final Occur DEFAULT_LOW_FREQ_OCCUR = Occur.MUST; static final Occur DEFAULT_LOW_FREQ_OCCUR = Occur.MUST;
static final boolean DEFAULT_DISABLE_COORDS = true; static final boolean DEFAULT_DISABLE_COORDS = true;
@Inject @Inject
public CommonTermsQueryParser() { public CommonTermsQueryParser() {
@ -98,11 +98,11 @@ public class CommonTermsQueryParser implements QueryParser {
throw new QueryParsingException(parseContext.index(), "[common] analyzer [" + parser.text() + "] not found"); throw new QueryParsingException(parseContext.index(), "[common] analyzer [" + parser.text() + "] not found");
} }
queryAnalyzer = analyzer; queryAnalyzer = analyzer;
} else if ("disable_coords".equals(currentFieldName)) { } else if ("disable_coord".equals(currentFieldName) || "disableCoord".equals(currentFieldName)) {
disableCoords = parser.booleanValue(); disableCoords = parser.booleanValue();
} else if ("boost".equals(currentFieldName)) { } else if ("boost".equals(currentFieldName)) {
boost = parser.floatValue(); boost = parser.floatValue();
} else if ("high_freq_operator".equals(currentFieldName)) { } else if ("high_freq_operator".equals(currentFieldName) || "highFreqOperator".equals(currentFieldName)) {
String op = parser.text(); String op = parser.text();
if ("or".equalsIgnoreCase(op)) { if ("or".equalsIgnoreCase(op)) {
highFreqOccur = BooleanClause.Occur.SHOULD; highFreqOccur = BooleanClause.Occur.SHOULD;
@ -112,7 +112,7 @@ public class CommonTermsQueryParser implements QueryParser {
throw new QueryParsingException(parseContext.index(), throw new QueryParsingException(parseContext.index(),
"[common] query requires operator to be either 'and' or 'or', not [" + op + "]"); "[common] query requires operator to be either 'and' or 'or', not [" + op + "]");
} }
} else if ("low_freq_operator".equals(currentFieldName)) { } else if ("low_freq_operator".equals(currentFieldName) || "lowFreqOperator".equals(currentFieldName)) {
String op = parser.text(); String op = parser.text();
if ("or".equalsIgnoreCase(op)) { if ("or".equalsIgnoreCase(op)) {
lowFreqOccur = BooleanClause.Occur.SHOULD; lowFreqOccur = BooleanClause.Occur.SHOULD;
@ -150,11 +150,11 @@ public class CommonTermsQueryParser implements QueryParser {
query.setBoost(boost); query.setBoost(boost);
return parseQueryString(query, value.toString(), fieldName, parseContext, queryAnalyzer, minimumShouldMatch); return parseQueryString(query, value.toString(), fieldName, parseContext, queryAnalyzer, minimumShouldMatch);
} }
private final Query parseQueryString(ExtendedCommonTermsQuery query, String queryString, String fieldName, QueryParseContext parseContext, private final Query parseQueryString(ExtendedCommonTermsQuery query, String queryString, String fieldName, QueryParseContext parseContext,
String queryAnalyzer, String minimumShouldMatch) throws IOException { String queryAnalyzer, String minimumShouldMatch) throws IOException {
FieldMapper<?> mapper = null; FieldMapper<?> mapper = null;
String field; String field;
MapperService.SmartNameFieldMappers smartNameFieldMappers = parseContext.smartFieldMappers(fieldName); MapperService.SmartNameFieldMappers smartNameFieldMappers = parseContext.smartFieldMappers(fieldName);
@ -195,7 +195,7 @@ public class CommonTermsQueryParser implements QueryParser {
query.add(new Term(field, ref)); query.add(new Term(field, ref));
count++; count++;
} }
if (count == 0) { if (count == 0) {
return null; return null;
} }