Fix pharse suggest collate example to use correct script context/syntax

Closes #15675
This commit is contained in:
Simon Willnauer 2015-12-29 09:17:47 +01:00
parent 387bdbd322
commit 3b06cd8d92
2 changed files with 9 additions and 6 deletions

View File

@ -192,8 +192,10 @@ curl -XPOST 'localhost:9200/_search' -d {
} ], } ],
"collate": { "collate": {
"query": { <1> "query": { <1>
"match": { "inline" : {
"{{field_name}}" : "{{suggestion}}" <2> "match": {
"{{field_name}}" : "{{suggestion}}" <2>
}
} }
}, },
"params": {"field_name" : "title"}, <3> "params": {"field_name" : "title"}, <3>

View File

@ -82,12 +82,12 @@ import static org.hamcrest.Matchers.nullValue;
* request, modify again, request again, etc. This makes it very obvious what changes between requests. * request, modify again, request again, etc. This makes it very obvious what changes between requests.
*/ */
public class SuggestSearchTests extends ESIntegTestCase { public class SuggestSearchTests extends ESIntegTestCase {
@Override @Override
protected Collection<Class<? extends Plugin>> nodePlugins() { protected Collection<Class<? extends Plugin>> nodePlugins() {
return Collections.singleton(MustachePlugin.class); return Collections.singleton(MustachePlugin.class);
} }
// see #3196 // see #3196
public void testSuggestAcrossMultipleIndices() throws IOException { public void testSuggestAcrossMultipleIndices() throws IOException {
createIndex("test"); createIndex("test");
@ -618,7 +618,7 @@ public class SuggestSearchTests extends ESIntegTestCase {
// Check the name this time because we're repeating it which is funky // Check the name this time because we're repeating it which is funky
assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getText().string(), equalTo("Xor the Got-Jewel Xor the Got-Jewel Xor the Got-Jewel")); assertThat(searchSuggest.getSuggestion("simple_phrase").getEntries().get(0).getText().string(), equalTo("Xor the Got-Jewel Xor the Got-Jewel Xor the Got-Jewel"));
} }
private List<String> readMarvelHeroNames() throws IOException, URISyntaxException { private List<String> readMarvelHeroNames() throws IOException, URISyntaxException {
return Files.readAllLines(PathUtils.get(Suggest.class.getResource("/config/names.txt").toURI()), StandardCharsets.UTF_8); return Files.readAllLines(PathUtils.get(Suggest.class.getResource("/config/names.txt").toURI()), StandardCharsets.UTF_8);
} }
@ -1166,11 +1166,12 @@ public class SuggestSearchTests extends ESIntegTestCase {
String filterString = XContentFactory.jsonBuilder() String filterString = XContentFactory.jsonBuilder()
.startObject() .startObject()
.startObject("match_phrase") .startObject("match_phrase")
.field("title", "{{suggestion}}") .field("{{field}}", "{{suggestion}}")
.endObject() .endObject()
.endObject() .endObject()
.string(); .string();
PhraseSuggestionBuilder filteredQuerySuggest = suggest.collateQuery(filterString); PhraseSuggestionBuilder filteredQuerySuggest = suggest.collateQuery(filterString);
filteredQuerySuggest.collateParams(Collections.singletonMap("field", "title"));
searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", filteredQuerySuggest); searchSuggest = searchSuggest("united states house of representatives elections in washington 2006", filteredQuerySuggest);
assertSuggestionSize(searchSuggest, 0, 2, "title"); assertSuggestionSize(searchSuggest, 0, 2, "title");