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

Query DSL: Allow to directly wrap a query with a constant_score query, closes #857.

This commit is contained in:
kimchy 2011-04-14 14:19:24 +03:00
parent e5c1ab0ca6
commit 7550fc570e
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/elasticsearch/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java
View File

@ -75,7 +75,12 @@ public class CustomFieldQuery extends FieldQuery {
flatQueries.add(termQuery); flatQueries.add(termQuery);
} }
} else if (sourceQuery instanceof ConstantScoreQuery) { } else if (sourceQuery instanceof ConstantScoreQuery) {
flatten(((ConstantScoreQuery) sourceQuery).getFilter(), flatQueries); ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) sourceQuery;
if (constantScoreQuery.getFilter() != null) {
flatten(constantScoreQuery.getFilter(), flatQueries);
} else {
flatten(constantScoreQuery.getQuery(), flatQueries);
}
} else if (sourceQuery instanceof DeletionAwareConstantScoreQuery) { } else if (sourceQuery instanceof DeletionAwareConstantScoreQuery) {
flatten(((DeletionAwareConstantScoreQuery) sourceQuery).getFilter(), flatQueries); flatten(((DeletionAwareConstantScoreQuery) sourceQuery).getFilter(), flatQueries);
} else if (sourceQuery instanceof FunctionScoreQuery) { } else if (sourceQuery instanceof FunctionScoreQuery) {

16
modules/elasticsearch/src/main/java/org/elasticsearch/index/query/xcontent/ConstantScoreQueryParser.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.index.query.xcontent; package org.elasticsearch.index.query.xcontent;
import org.apache.lucene.search.ConstantScoreQuery;
import org.apache.lucene.search.DeletionAwareConstantScoreQuery; import org.apache.lucene.search.DeletionAwareConstantScoreQuery;
import org.apache.lucene.search.Filter; import org.apache.lucene.search.Filter;
import org.apache.lucene.search.Query; import org.apache.lucene.search.Query;
@ -52,6 +53,7 @@ public class ConstantScoreQueryParser extends AbstractIndexComponent implements
XContentParser parser = parseContext.parser(); XContentParser parser = parseContext.parser();
Filter filter = null; Filter filter = null;
Query query = null;
float boost = 1.0f; float boost = 1.0f;
boolean cache = false; boolean cache = false;
@ -63,6 +65,8 @@ public class ConstantScoreQueryParser extends AbstractIndexComponent implements
} else if (token == XContentParser.Token.START_OBJECT) { } else if (token == XContentParser.Token.START_OBJECT) {
if ("filter".equals(currentFieldName)) { if ("filter".equals(currentFieldName)) {
filter = parseContext.parseInnerFilter(); filter = parseContext.parseInnerFilter();
} else if ("query".equals(currentFieldName)) {
query = parseContext.parseInnerQuery();
} }
} else if (token.isValue()) { } else if (token.isValue()) {
if ("boost".equals(currentFieldName)) { if ("boost".equals(currentFieldName)) {
@ -72,16 +76,22 @@ public class ConstantScoreQueryParser extends AbstractIndexComponent implements
} }
} }
} }
if (filter == null) { if (filter == null && query == null) {
throw new QueryParsingException(index, "[constant_score] requires 'filter' element"); throw new QueryParsingException(index, "[constant_score] requires either 'filter' or 'query' element");
} }
if (filter != null) {
// cache the filter if possible needed // cache the filter if possible needed
if (cache) { if (cache) {
filter = parseContext.cacheFilter(filter); filter = parseContext.cacheFilter(filter);
} }
Query query = new DeletionAwareConstantScoreQuery(filter); Query query1 = new DeletionAwareConstantScoreQuery(filter);
query1.setBoost(boost);
return query1;
}
// Query
query = new ConstantScoreQuery(query);
query.setBoost(boost); query.setBoost(boost);
return query; return query;
} }

5
modules/elasticsearch/src/main/java/org/elasticsearch/search/facet/query/QueryFacetCollector.java
View File

@ -77,7 +77,10 @@ public class QueryFacetCollector extends AbstractFacetCollector {
} else if (query instanceof DeletionAwareConstantScoreQuery) { } else if (query instanceof DeletionAwareConstantScoreQuery) {
return ((DeletionAwareConstantScoreQuery) query).getFilter(); return ((DeletionAwareConstantScoreQuery) query).getFilter();
} else if (query instanceof ConstantScoreQuery) { } else if (query instanceof ConstantScoreQuery) {
return ((ConstantScoreQuery) query).getFilter(); ConstantScoreQuery constantScoreQuery = (ConstantScoreQuery) query;
if (constantScoreQuery.getFilter() != null) {
return constantScoreQuery.getFilter();
}
} }
return null; return null;
} }