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

Revert changes made to IndexQueryParserService, fixed upstream meanwhile

This commit is contained in:
javanna 2015-10-15 14:35:16 +02:00 committed by Luca Cavanna
parent 8a87448758
commit 0cab4a25fb
1 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/main/java/org/elasticsearch/index/query/IndexQueryParserService.java
View File

@ -153,27 +153,6 @@ public class IndexQueryParserService extends AbstractIndexComponent {
return indicesQueriesRegistry; return indicesQueriesRegistry;
} }
public ParsedQuery parse(QueryBuilder<?> queryBuilder) {
QueryShardContext context = cache.get();
context.reset();
context.parseFieldMatcher(parseFieldMatcher);
try {
return innerParse(context, queryBuilder);
} catch (ParsingException e) {
throw e;
} catch (Exception e) {
throw new QueryShardException(context, "failed to create query: {}", e, queryBuilder);
}
}
private static ParsedQuery innerParse(QueryShardContext context, QueryBuilder<?> queryBuilder) throws IOException, QueryShardException {
Query query = queryBuilder.toQuery(context);
if (query == null) {
query = Queries.newMatchNoDocsQuery();
}
return new ParsedQuery(query, context.copyNamedQueries());
}
public ParsedQuery parse(BytesReference source) { public ParsedQuery parse(BytesReference source) {
QueryShardContext context = cache.get(); QueryShardContext context = cache.get();
XContentParser parser = null; XContentParser parser = null;
@ -279,7 +258,7 @@ public class IndexQueryParserService extends AbstractIndexComponent {
public Query parseInnerQuery(QueryShardContext context) throws IOException { public Query parseInnerQuery(QueryShardContext context) throws IOException {
return toQuery(context.parseContext().parseInnerQueryBuilder(), context); return toQuery(context.parseContext().parseInnerQueryBuilder(), context);
} }
public ParsedQuery toQuery(QueryBuilder<?> queryBuilder) { public ParsedQuery toQuery(QueryBuilder<?> queryBuilder) {
QueryShardContext context = cache.get(); QueryShardContext context = cache.get();