Skip to content

Commit

Permalink
[QUERY] Separate parsing impl from setter in SearchParseElement
Browse files Browse the repository at this point in the history 
This commit makes it easier to reuse the inner highlighting, fetch
and rescore parsing logic by plugins or other internal parts.

Closes #3602
  • Loading branch information
@synhershko @s1monw
synhershko authored and s1monw committed Jul 28, 2014
1 parent 578760f commit f2ac6cc
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 25 deletions.
17 changes: 9 additions & 8 deletions src/main/java/org/elasticsearch/search/fetch/source/FetchSourceParseElement.java
View file
Expand Up @@ -25,6 +25,7 @@
import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.internal.SearchContext;

import java.io.IOException;
import java.util.ArrayList;
import java.util.List;

Expand All @@ -43,17 +44,19 @@ public class FetchSourceParseElement implements SearchParseElement {

@Override
public void parse(XContentParser parser, SearchContext context) throws Exception {
context.fetchSourceContext(parse(parser));
}

public FetchSourceContext parse(XContentParser parser) throws IOException {
XContentParser.Token token;

List<String> includes = null, excludes = null;
String currentFieldName = null;
token = parser.currentToken(); // we get it on the value
if (parser.isBooleanValue()) {
context.fetchSourceContext(new FetchSourceContext(parser.booleanValue()));
return;
return new FetchSourceContext(parser.booleanValue());
} else if (token == XContentParser.Token.VALUE_STRING) {
context.fetchSourceContext(new FetchSourceContext(new String[]{parser.text()}));
return;
return new FetchSourceContext(new String[]{parser.text()});
} else if (token == XContentParser.Token.START_ARRAY) {
includes = new ArrayList<>();
while ((token = parser.nextToken()) != XContentParser.Token.END_ARRAY) {
Expand Down Expand Up @@ -87,10 +90,8 @@ public void parse(XContentParser parser, SearchContext context) throws Exception
throw new ElasticsearchParseException("source element value can be of type " + token.name());
}


context.fetchSourceContext(new FetchSourceContext(
return new FetchSourceContext(
includes == null ? Strings.EMPTY_ARRAY : includes.toArray(new String[includes.size()]),
excludes == null ? Strings.EMPTY_ARRAY : excludes.toArray(new String[excludes.size()])));

excludes == null ? Strings.EMPTY_ARRAY : excludes.toArray(new String[excludes.size()]));
}
}
41 changes: 25 additions & 16 deletions src/main/java/org/elasticsearch/search/highlight/HighlighterParseElement.java
View file
Expand Up @@ -22,8 +22,10 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.apache.lucene.search.vectorhighlight.SimpleBoundaryScanner;
import org.elasticsearch.ElasticsearchIllegalArgumentException;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.query.IndexQueryParserService;
import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.SearchParseException;
import org.elasticsearch.search.internal.SearchContext;
Expand Down Expand Up @@ -66,11 +68,19 @@ public class HighlighterParseElement implements SearchParseElement {

@Override
public void parse(XContentParser parser, SearchContext context) throws Exception {
try {
context.highlight(parse(parser, context.queryParserService()));
} catch (ElasticsearchIllegalArgumentException ex) {
throw new SearchParseException(context, "Error while trying to parse Highlighter element in request");
}
}

public SearchContextHighlight parse(XContentParser parser, IndexQueryParserService queryParserService) throws IOException {
XContentParser.Token token;
String topLevelFieldName = null;
List<Tuple<String, SearchContextHighlight.FieldOptions.Builder>> fieldsOptions = newArrayList();
final List<Tuple<String, SearchContextHighlight.FieldOptions.Builder>> fieldsOptions = newArrayList();

SearchContextHighlight.FieldOptions.Builder globalOptionsBuilder = new SearchContextHighlight.FieldOptions.Builder()
final SearchContextHighlight.FieldOptions.Builder globalOptionsBuilder = new SearchContextHighlight.FieldOptions.Builder()
.preTags(DEFAULT_PRE_TAGS).postTags(DEFAULT_POST_TAGS).scoreOrdered(false).highlightFilter(false)
.requireFieldMatch(false).forceSource(false).fragmentCharSize(100).numberOfFragments(5)
.encoder("default").boundaryMaxScan(SimpleBoundaryScanner.DEFAULT_MAX_SCAN)
Expand Down Expand Up @@ -100,15 +110,15 @@ public void parse(XContentParser parser, SearchContext context) throws Exception
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) {
if (highlightFieldName != null) {
throw new SearchParseException(context, "If highlighter fields is an array it must contain objects containing a single field");
throw new ElasticsearchIllegalArgumentException("If highlighter fields is an array it must contain objects containing a single field");
}
highlightFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_OBJECT) {
fieldsOptions.add(Tuple.tuple(highlightFieldName, parseFields(parser, context)));
fieldsOptions.add(Tuple.tuple(highlightFieldName, parseFields(parser, queryParserService)));
}
}
} else {
throw new SearchParseException(context, "If highlighter fields is an array it must contain objects containing a single field");
throw new ElasticsearchIllegalArgumentException("If highlighter fields is an array it must contain objects containing a single field");
}
}
}
Expand Down Expand Up @@ -160,33 +170,32 @@ public void parse(XContentParser parser, SearchContext context) throws Exception
if (token == XContentParser.Token.FIELD_NAME) {
highlightFieldName = parser.currentName();
} else if (token == XContentParser.Token.START_OBJECT) {
fieldsOptions.add(Tuple.tuple(highlightFieldName, parseFields(parser, context)));
fieldsOptions.add(Tuple.tuple(highlightFieldName, parseFields(parser, queryParserService)));
}
}
} else if ("highlight_query".equals(topLevelFieldName) || "highlightQuery".equals(topLevelFieldName)) {
globalOptionsBuilder.highlightQuery(context.queryParserService().parse(parser).query());
globalOptionsBuilder.highlightQuery(queryParserService.parse(parser).query());
}
}
}

SearchContextHighlight.FieldOptions globalOptions = globalOptionsBuilder.build();
final SearchContextHighlight.FieldOptions globalOptions = globalOptionsBuilder.build();
if (globalOptions.preTags() != null && globalOptions.postTags() == null) {
throw new SearchParseException(context, "Highlighter global preTags are set, but global postTags are not set");
throw new ElasticsearchIllegalArgumentException("Highlighter global preTags are set, but global postTags are not set");
}

List<SearchContextHighlight.Field> fields = Lists.newArrayList();
final List<SearchContextHighlight.Field> fields = Lists.newArrayList();
// now, go over and fill all fieldsOptions with default values from the global state
for (Tuple<String, SearchContextHighlight.FieldOptions.Builder> tuple : fieldsOptions) {
for (final Tuple<String, SearchContextHighlight.FieldOptions.Builder> tuple : fieldsOptions) {
fields.add(new SearchContextHighlight.Field(tuple.v1(), tuple.v2().merge(globalOptions).build()));
}

context.highlight(new SearchContextHighlight(fields));
return new SearchContextHighlight(fields);
}

private SearchContextHighlight.FieldOptions.Builder parseFields(XContentParser parser, SearchContext context) throws IOException {
protected SearchContextHighlight.FieldOptions.Builder parseFields(XContentParser parser, IndexQueryParserService queryParserService) throws IOException {
XContentParser.Token token;

SearchContextHighlight.FieldOptions.Builder fieldOptionsBuilder = new SearchContextHighlight.FieldOptions.Builder();
final SearchContextHighlight.FieldOptions.Builder fieldOptionsBuilder = new SearchContextHighlight.FieldOptions.Builder();
String fieldName = null;
while ((token = parser.nextToken()) != XContentParser.Token.END_OBJECT) {
if (token == XContentParser.Token.FIELD_NAME) {
Expand Down Expand Up @@ -246,7 +255,7 @@ private SearchContextHighlight.FieldOptions.Builder parseFields(XContentParser p
}
} else if (token == XContentParser.Token.START_OBJECT) {
if ("highlight_query".equals(fieldName) || "highlightQuery".equals(fieldName)) {
fieldOptionsBuilder.highlightQuery(context.queryParserService().parse(parser).query());
fieldOptionsBuilder.highlightQuery(queryParserService.parse(parser).query());
} else if ("options".equals(fieldName)) {
fieldOptionsBuilder.options(parser.map());
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/elasticsearch/search/rescore/RescoreParseElement.java
View file
Expand Up @@ -41,7 +41,7 @@ public void parse(XContentParser parser, SearchContext context) throws Exception
}
}

private void parseSingleRescoreContext(XContentParser parser, SearchContext context) throws Exception {
public void parseSingleRescoreContext(XContentParser parser, SearchContext context) throws Exception {
String fieldName = null;
RescoreSearchContext rescoreContext = null;
Integer windowSize = null;
Expand Down

0 comments on commit f2ac6cc

Please sign in to comment.