split out mustache methods so groovy works again
This commit is contained in:
Robert Muir
parent
7f06c12c7f
commit
3632ddf497
|
|
@ -27,16 +27,13 @@ import org.elasticsearch.action.ActionModule;
|
||||||
import org.elasticsearch.action.ActionRequest;
|
import org.elasticsearch.action.ActionRequest;
|
||||||
import org.elasticsearch.action.ActionRequestBuilder;
|
import org.elasticsearch.action.ActionRequestBuilder;
|
||||||
import org.elasticsearch.action.ActionResponse;
|
import org.elasticsearch.action.ActionResponse;
|
||||||
import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
|
|
||||||
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
|
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
|
||||||
import org.elasticsearch.action.get.GetRequest;
|
import org.elasticsearch.action.get.GetRequest;
|
||||||
import org.elasticsearch.action.index.IndexRequest;
|
import org.elasticsearch.action.index.IndexRequest;
|
||||||
import org.elasticsearch.action.index.IndexRequestBuilder;
|
|
||||||
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
|
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
|
||||||
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
|
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
|
||||||
import org.elasticsearch.action.percolate.PercolateResponse;
|
import org.elasticsearch.action.percolate.PercolateResponse;
|
||||||
import org.elasticsearch.action.search.SearchRequest;
|
import org.elasticsearch.action.search.SearchRequest;
|
||||||
import org.elasticsearch.action.search.SearchRequestBuilder;
|
|
||||||
import org.elasticsearch.action.search.SearchResponse;
|
import org.elasticsearch.action.search.SearchResponse;
|
||||||
import org.elasticsearch.action.support.ActionFilter;
|
import org.elasticsearch.action.support.ActionFilter;
|
||||||
import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
|
import org.elasticsearch.action.termvectors.MultiTermVectorsRequest;
|
||||||
|
|
@ -47,8 +44,6 @@ import org.elasticsearch.common.inject.Inject;
|
||||||
import org.elasticsearch.common.inject.Module;
|
import org.elasticsearch.common.inject.Module;
|
||||||
import org.elasticsearch.common.lucene.search.function.CombineFunction;
|
import org.elasticsearch.common.lucene.search.function.CombineFunction;
|
||||||
import org.elasticsearch.common.settings.Settings;
|
import org.elasticsearch.common.settings.Settings;
|
||||||
import org.elasticsearch.common.xcontent.XContentBuilder;
|
|
||||||
import org.elasticsearch.common.xcontent.XContentFactory;
|
|
||||||
import org.elasticsearch.http.HttpServerTransport;
|
import org.elasticsearch.http.HttpServerTransport;
|
||||||
import org.elasticsearch.index.query.BoolQueryBuilder;
|
import org.elasticsearch.index.query.BoolQueryBuilder;
|
||||||
import org.elasticsearch.index.query.GeoShapeQueryBuilder;
|
import org.elasticsearch.index.query.GeoShapeQueryBuilder;
|
||||||
|
|
@ -62,15 +57,8 @@ import org.elasticsearch.plugins.Plugin;
|
||||||
import org.elasticsearch.rest.RestController;
|
import org.elasticsearch.rest.RestController;
|
||||||
import org.elasticsearch.script.Script;
|
import org.elasticsearch.script.Script;
|
||||||
import org.elasticsearch.script.ScriptService.ScriptType;
|
import org.elasticsearch.script.ScriptService.ScriptType;
|
||||||
import org.elasticsearch.script.Template;
|
|
||||||
import org.elasticsearch.script.groovy.GroovyPlugin;
|
import org.elasticsearch.script.groovy.GroovyPlugin;
|
||||||
import org.elasticsearch.script.groovy.GroovyScriptEngineService;
|
import org.elasticsearch.script.groovy.GroovyScriptEngineService;
|
||||||
import org.elasticsearch.script.mustache.MustacheScriptEngineService;
|
|
||||||
import org.elasticsearch.search.aggregations.AggregationBuilders;
|
|
||||||
import org.elasticsearch.search.aggregations.pipeline.PipelineAggregatorBuilders;
|
|
||||||
import org.elasticsearch.search.suggest.Suggest;
|
|
||||||
import org.elasticsearch.search.suggest.SuggestBuilder;
|
|
||||||
import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder;
|
|
||||||
import org.elasticsearch.test.ESIntegTestCase;
|
import org.elasticsearch.test.ESIntegTestCase;
|
||||||
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
||||||
import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
|
import org.elasticsearch.test.rest.client.http.HttpRequestBuilder;
|
||||||
|
|
@ -79,13 +67,10 @@ import org.junit.After;
|
||||||
import org.junit.Before;
|
import org.junit.Before;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
|
||||||
import java.util.concurrent.CopyOnWriteArrayList;
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
|
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
|
||||||
|
|
@ -284,172 +269,6 @@ public class ContextAndHeaderTransportTests extends ESIntegTestCase {
|
||||||
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testThatIndexedScriptGetRequestInTemplateQueryContainsContextAndHeaders() throws Exception {
|
|
||||||
PutIndexedScriptResponse scriptResponse = transportClient()
|
|
||||||
.preparePutIndexedScript(
|
|
||||||
MustacheScriptEngineService.NAME,
|
|
||||||
"my_script",
|
|
||||||
jsonBuilder().startObject().field("script", "{ \"match\": { \"name\": \"Star Wars\" }}").endObject()
|
|
||||||
.string()).get();
|
|
||||||
assertThat(scriptResponse.isCreated(), is(true));
|
|
||||||
|
|
||||||
transportClient().prepareIndex(queryIndex, "type", "1")
|
|
||||||
.setSource(jsonBuilder().startObject().field("name", "Star Wars - The new republic").endObject()).get();
|
|
||||||
transportClient().admin().indices().prepareRefresh(queryIndex).get();
|
|
||||||
|
|
||||||
SearchResponse searchResponse = transportClient()
|
|
||||||
.prepareSearch(queryIndex)
|
|
||||||
.setQuery(
|
|
||||||
QueryBuilders.templateQuery(new Template("my_script", ScriptType.INDEXED,
|
|
||||||
MustacheScriptEngineService.NAME, null, null))).get();
|
|
||||||
assertNoFailures(searchResponse);
|
|
||||||
assertHitCount(searchResponse, 1);
|
|
||||||
|
|
||||||
assertGetRequestsContainHeaders(".scripts");
|
|
||||||
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testThatIndexedScriptGetRequestInReducePhaseContainsContextAndHeaders() throws Exception {
|
|
||||||
PutIndexedScriptResponse scriptResponse = transportClient().preparePutIndexedScript(GroovyScriptEngineService.NAME, "my_script",
|
|
||||||
jsonBuilder().startObject().field("script", "_value0 * 10").endObject().string()).get();
|
|
||||||
assertThat(scriptResponse.isCreated(), is(true));
|
|
||||||
|
|
||||||
transportClient().prepareIndex(queryIndex, "type", "1")
|
|
||||||
.setSource(jsonBuilder().startObject().field("s_field", "foo").field("l_field", 10).endObject()).get();
|
|
||||||
transportClient().admin().indices().prepareRefresh(queryIndex).get();
|
|
||||||
|
|
||||||
SearchResponse searchResponse = transportClient()
|
|
||||||
.prepareSearch(queryIndex)
|
|
||||||
.addAggregation(
|
|
||||||
AggregationBuilders
|
|
||||||
.terms("terms")
|
|
||||||
.field("s_field")
|
|
||||||
.subAggregation(AggregationBuilders.max("max").field("l_field"))
|
|
||||||
.subAggregation(
|
|
||||||
PipelineAggregatorBuilders.bucketScript("scripted").setBucketsPaths("max").script(
|
|
||||||
new Script("my_script", ScriptType.INDEXED, GroovyScriptEngineService.NAME, null)))).get();
|
|
||||||
assertNoFailures(searchResponse);
|
|
||||||
assertHitCount(searchResponse, 1);
|
|
||||||
|
|
||||||
assertGetRequestsContainHeaders(".scripts");
|
|
||||||
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testThatSearchTemplatesWithIndexedTemplatesGetRequestContainsContextAndHeaders() throws Exception {
|
|
||||||
PutIndexedScriptResponse scriptResponse = transportClient().preparePutIndexedScript(MustacheScriptEngineService.NAME, "the_template",
|
|
||||||
jsonBuilder().startObject().startObject("template").startObject("query").startObject("match")
|
|
||||||
.field("name", "{{query_string}}").endObject().endObject().endObject().endObject().string()
|
|
||||||
).get();
|
|
||||||
assertThat(scriptResponse.isCreated(), is(true));
|
|
||||||
|
|
||||||
transportClient().prepareIndex(queryIndex, "type", "1")
|
|
||||||
.setSource(jsonBuilder().startObject().field("name", "Star Wars - The new republic").endObject())
|
|
||||||
.get();
|
|
||||||
transportClient().admin().indices().prepareRefresh(queryIndex).get();
|
|
||||||
|
|
||||||
Map<String, Object> params = new HashMap<>();
|
|
||||||
params.put("query_string", "star wars");
|
|
||||||
|
|
||||||
SearchResponse searchResponse = transportClient().prepareSearch(queryIndex).setTemplate(new Template("the_template", ScriptType.INDEXED, MustacheScriptEngineService.NAME, null, params))
|
|
||||||
.get();
|
|
||||||
|
|
||||||
assertNoFailures(searchResponse);
|
|
||||||
assertHitCount(searchResponse, 1);
|
|
||||||
|
|
||||||
assertGetRequestsContainHeaders(".scripts");
|
|
||||||
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testThatIndexedScriptGetRequestInPhraseSuggestContainsContextAndHeaders() throws Exception {
|
|
||||||
CreateIndexRequestBuilder builder = transportClient().admin().indices().prepareCreate("test").setSettings(settingsBuilder()
|
|
||||||
.put(indexSettings())
|
|
||||||
.put(SETTING_NUMBER_OF_SHARDS, 1) // A single shard will help to keep the tests repeatable.
|
|
||||||
.put("index.analysis.analyzer.text.tokenizer", "standard")
|
|
||||||
.putArray("index.analysis.analyzer.text.filter", "lowercase", "my_shingle")
|
|
||||||
.put("index.analysis.filter.my_shingle.type", "shingle")
|
|
||||||
.put("index.analysis.filter.my_shingle.output_unigrams", true)
|
|
||||||
.put("index.analysis.filter.my_shingle.min_shingle_size", 2)
|
|
||||||
.put("index.analysis.filter.my_shingle.max_shingle_size", 3));
|
|
||||||
|
|
||||||
XContentBuilder mapping = XContentFactory.jsonBuilder()
|
|
||||||
.startObject()
|
|
||||||
.startObject("type1")
|
|
||||||
.startObject("properties")
|
|
||||||
.startObject("title")
|
|
||||||
.field("type", "string")
|
|
||||||
.field("analyzer", "text")
|
|
||||||
.endObject()
|
|
||||||
.endObject()
|
|
||||||
.endObject()
|
|
||||||
.endObject();
|
|
||||||
assertAcked(builder.addMapping("type1", mapping));
|
|
||||||
ensureGreen();
|
|
||||||
|
|
||||||
List<String> titles = new ArrayList<>();
|
|
||||||
|
|
||||||
titles.add("United States House of Representatives Elections in Washington 2006");
|
|
||||||
titles.add("United States House of Representatives Elections in Washington 2005");
|
|
||||||
titles.add("State");
|
|
||||||
titles.add("Houses of Parliament");
|
|
||||||
titles.add("Representative Government");
|
|
||||||
titles.add("Election");
|
|
||||||
|
|
||||||
List<IndexRequestBuilder> builders = new ArrayList<>();
|
|
||||||
for (String title: titles) {
|
|
||||||
transportClient().prepareIndex("test", "type1").setSource("title", title).get();
|
|
||||||
}
|
|
||||||
transportClient().admin().indices().prepareRefresh("test").get();
|
|
||||||
|
|
||||||
String filterStringAsFilter = XContentFactory.jsonBuilder()
|
|
||||||
.startObject()
|
|
||||||
.startObject("match_phrase")
|
|
||||||
.field("title", "{{suggestion}}")
|
|
||||||
.endObject()
|
|
||||||
.endObject()
|
|
||||||
.string();
|
|
||||||
|
|
||||||
PutIndexedScriptResponse scriptResponse = transportClient()
|
|
||||||
.preparePutIndexedScript(
|
|
||||||
MustacheScriptEngineService.NAME,
|
|
||||||
"my_script",
|
|
||||||
jsonBuilder().startObject().field("script", filterStringAsFilter).endObject()
|
|
||||||
.string()).get();
|
|
||||||
assertThat(scriptResponse.isCreated(), is(true));
|
|
||||||
|
|
||||||
PhraseSuggestionBuilder suggest = phraseSuggestion("title")
|
|
||||||
.field("title")
|
|
||||||
.addCandidateGenerator(PhraseSuggestionBuilder.candidateGenerator("title")
|
|
||||||
.suggestMode("always")
|
|
||||||
.maxTermFreq(.99f)
|
|
||||||
.size(10)
|
|
||||||
.maxInspections(200)
|
|
||||||
)
|
|
||||||
.confidence(0f)
|
|
||||||
.maxErrors(2f)
|
|
||||||
.shardSize(30000)
|
|
||||||
.size(10);
|
|
||||||
|
|
||||||
PhraseSuggestionBuilder filteredFilterSuggest = suggest.collateQuery(new Template("my_script", ScriptType.INDEXED,
|
|
||||||
MustacheScriptEngineService.NAME, null, null));
|
|
||||||
|
|
||||||
SearchRequestBuilder searchRequestBuilder = transportClient().prepareSearch("test").setSize(0);
|
|
||||||
SuggestBuilder suggestBuilder = new SuggestBuilder();
|
|
||||||
String suggestText = "united states house of representatives elections in washington 2006";
|
|
||||||
if (suggestText != null) {
|
|
||||||
suggestBuilder.setText(suggestText);
|
|
||||||
}
|
|
||||||
suggestBuilder.addSuggestion(filteredFilterSuggest);
|
|
||||||
searchRequestBuilder.suggest(suggestBuilder);
|
|
||||||
SearchResponse actionGet = searchRequestBuilder.execute().actionGet();
|
|
||||||
assertThat(Arrays.toString(actionGet.getShardFailures()), actionGet.getFailedShards(), equalTo(0));
|
|
||||||
Suggest searchSuggest = actionGet.getSuggest();
|
|
||||||
|
|
||||||
assertSuggestionSize(searchSuggest, 0, 2, "title");
|
|
||||||
|
|
||||||
assertGetRequestsContainHeaders(".scripts");
|
|
||||||
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void testThatRelevantHttpHeadersBecomeRequestHeaders() throws Exception {
|
public void testThatRelevantHttpHeadersBecomeRequestHeaders() throws Exception {
|
||||||
String releventHeaderName = "relevant_" + randomHeaderKey;
|
String releventHeaderName = "relevant_" + randomHeaderKey;
|
||||||
for (RestController restController : internalCluster().getDataNodeInstances(RestController.class)) {
|
for (RestController restController : internalCluster().getDataNodeInstances(RestController.class)) {
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@
|
||||||
renamed: core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/CardinalityTests.java
|
renamed: core/src/test/java/org/elasticsearch/search/aggregations/metrics/CardinalityIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/CardinalityTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/ChildQuerySearchTests.java
|
renamed: core/src/test/java/org/elasticsearch/search/child/ChildQuerySearchIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/ChildQuerySearchTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/ContextAndHeaderTransportTests.java
|
renamed: core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/ContextAndHeaderTransportTests.java
|
||||||
|
^^^^^ note: the methods from this test using mustache were moved to the mustache module under its messy tests package.
|
||||||
renamed: core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/DateHistogramTests.java
|
renamed: core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateHistogramIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/DateHistogramTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/DateRangeTests.java
|
renamed: core/src/test/java/org/elasticsearch/search/aggregations/bucket/DateRangeIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/DateRangeTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/DoubleTermsTests.java
|
renamed: core/src/test/java/org/elasticsearch/search/aggregations/bucket/DoubleTermsIT.java -> plugins/lang-groovy/src/test/java/org/elasticsearch/messy/tests/DoubleTermsTests.java
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ dependencies {
|
||||||
compile "com.github.spullara.mustache.java:compiler:0.9.1"
|
compile "com.github.spullara.mustache.java:compiler:0.9.1"
|
||||||
}
|
}
|
||||||
|
|
||||||
//compileTestJava.options.compilerArgs << '-Xlint:-rawtypes'
|
compileTestJava.options.compilerArgs << '-Xlint:-rawtypes,-unchecked'
|
||||||
|
|
||||||
integTest {
|
integTest {
|
||||||
cluster {
|
cluster {
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,389 @@
|
||||||
|
/*
|
||||||
|
* Licensed to Elasticsearch under one or more contributor
|
||||||
|
* license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright
|
||||||
|
* ownership. Elasticsearch licenses this file to you under
|
||||||
|
* the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
* not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing,
|
||||||
|
* software distributed under the License is distributed on an
|
||||||
|
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
* KIND, either express or implied. See the License for the
|
||||||
|
* specific language governing permissions and limitations
|
||||||
|
* under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.elasticsearch.messy.tests;
|
||||||
|
|
||||||
|
import org.elasticsearch.action.Action;
|
||||||
|
import org.elasticsearch.action.ActionListener;
|
||||||
|
import org.elasticsearch.action.ActionModule;
|
||||||
|
import org.elasticsearch.action.ActionRequest;
|
||||||
|
import org.elasticsearch.action.ActionRequestBuilder;
|
||||||
|
import org.elasticsearch.action.ActionResponse;
|
||||||
|
import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
|
||||||
|
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
|
||||||
|
import org.elasticsearch.action.get.GetRequest;
|
||||||
|
import org.elasticsearch.action.index.IndexRequest;
|
||||||
|
import org.elasticsearch.action.index.IndexRequestBuilder;
|
||||||
|
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptRequest;
|
||||||
|
import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptResponse;
|
||||||
|
import org.elasticsearch.action.search.SearchRequestBuilder;
|
||||||
|
import org.elasticsearch.action.search.SearchResponse;
|
||||||
|
import org.elasticsearch.action.support.ActionFilter;
|
||||||
|
import org.elasticsearch.client.Client;
|
||||||
|
import org.elasticsearch.client.FilterClient;
|
||||||
|
import org.elasticsearch.common.inject.AbstractModule;
|
||||||
|
import org.elasticsearch.common.inject.Inject;
|
||||||
|
import org.elasticsearch.common.inject.Module;
|
||||||
|
import org.elasticsearch.common.settings.Settings;
|
||||||
|
import org.elasticsearch.common.xcontent.XContentBuilder;
|
||||||
|
import org.elasticsearch.common.xcontent.XContentFactory;
|
||||||
|
import org.elasticsearch.index.query.QueryBuilders;
|
||||||
|
import org.elasticsearch.plugins.Plugin;
|
||||||
|
import org.elasticsearch.script.ScriptService.ScriptType;
|
||||||
|
import org.elasticsearch.script.Template;
|
||||||
|
import org.elasticsearch.script.mustache.MustachePlugin;
|
||||||
|
import org.elasticsearch.script.mustache.MustacheScriptEngineService;
|
||||||
|
import org.elasticsearch.search.suggest.Suggest;
|
||||||
|
import org.elasticsearch.search.suggest.SuggestBuilder;
|
||||||
|
import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder;
|
||||||
|
import org.elasticsearch.test.ESIntegTestCase;
|
||||||
|
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
||||||
|
import org.junit.After;
|
||||||
|
import org.junit.Before;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.Collections;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Locale;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.concurrent.CopyOnWriteArrayList;
|
||||||
|
|
||||||
|
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
|
||||||
|
import static org.elasticsearch.common.settings.Settings.settingsBuilder;
|
||||||
|
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
|
||||||
|
import static org.elasticsearch.node.Node.HTTP_ENABLED;
|
||||||
|
import static org.elasticsearch.search.suggest.SuggestBuilders.phraseSuggestion;
|
||||||
|
import static org.elasticsearch.test.ESIntegTestCase.Scope.SUITE;
|
||||||
|
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
|
||||||
|
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
|
||||||
|
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertNoFailures;
|
||||||
|
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertSuggestionSize;
|
||||||
|
import static org.hamcrest.Matchers.equalTo;
|
||||||
|
import static org.hamcrest.Matchers.greaterThan;
|
||||||
|
import static org.hamcrest.Matchers.hasSize;
|
||||||
|
import static org.hamcrest.Matchers.is;
|
||||||
|
|
||||||
|
@ClusterScope(scope = SUITE)
|
||||||
|
public class ContextAndHeaderTransportTests extends ESIntegTestCase {
|
||||||
|
private static final List<ActionRequest> requests = new CopyOnWriteArrayList<>();
|
||||||
|
private String randomHeaderKey = randomAsciiOfLength(10);
|
||||||
|
private String randomHeaderValue = randomAsciiOfLength(20);
|
||||||
|
private String queryIndex = "query-" + randomAsciiOfLength(10).toLowerCase(Locale.ROOT);
|
||||||
|
private String lookupIndex = "lookup-" + randomAsciiOfLength(10).toLowerCase(Locale.ROOT);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Settings nodeSettings(int nodeOrdinal) {
|
||||||
|
return settingsBuilder()
|
||||||
|
.put(super.nodeSettings(nodeOrdinal))
|
||||||
|
.put("script.indexed", "on")
|
||||||
|
.put(HTTP_ENABLED, true)
|
||||||
|
.build();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Collection<Class<? extends Plugin>> nodePlugins() {
|
||||||
|
return pluginList(ActionLoggingPlugin.class, MustachePlugin.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void createIndices() throws Exception {
|
||||||
|
String mapping = jsonBuilder().startObject().startObject("type")
|
||||||
|
.startObject("properties")
|
||||||
|
.startObject("location").field("type", "geo_shape").endObject()
|
||||||
|
.startObject("name").field("type", "string").endObject()
|
||||||
|
.endObject()
|
||||||
|
.endObject().endObject().string();
|
||||||
|
|
||||||
|
Settings settings = settingsBuilder()
|
||||||
|
.put(indexSettings())
|
||||||
|
.put(SETTING_NUMBER_OF_SHARDS, 1) // A single shard will help to keep the tests repeatable.
|
||||||
|
.build();
|
||||||
|
assertAcked(transportClient().admin().indices().prepareCreate(lookupIndex)
|
||||||
|
.setSettings(settings).addMapping("type", mapping));
|
||||||
|
assertAcked(transportClient().admin().indices().prepareCreate(queryIndex)
|
||||||
|
.setSettings(settings).addMapping("type", mapping));
|
||||||
|
ensureGreen(queryIndex, lookupIndex);
|
||||||
|
|
||||||
|
requests.clear();
|
||||||
|
}
|
||||||
|
|
||||||
|
@After
|
||||||
|
public void checkAllRequestsContainHeaders() {
|
||||||
|
assertRequestsContainHeader(IndexRequest.class);
|
||||||
|
assertRequestsContainHeader(RefreshRequest.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testThatIndexedScriptGetRequestInTemplateQueryContainsContextAndHeaders() throws Exception {
|
||||||
|
PutIndexedScriptResponse scriptResponse = transportClient()
|
||||||
|
.preparePutIndexedScript(
|
||||||
|
MustacheScriptEngineService.NAME,
|
||||||
|
"my_script",
|
||||||
|
jsonBuilder().startObject().field("script", "{ \"match\": { \"name\": \"Star Wars\" }}").endObject()
|
||||||
|
.string()).get();
|
||||||
|
assertThat(scriptResponse.isCreated(), is(true));
|
||||||
|
|
||||||
|
transportClient().prepareIndex(queryIndex, "type", "1")
|
||||||
|
.setSource(jsonBuilder().startObject().field("name", "Star Wars - The new republic").endObject()).get();
|
||||||
|
transportClient().admin().indices().prepareRefresh(queryIndex).get();
|
||||||
|
|
||||||
|
SearchResponse searchResponse = transportClient()
|
||||||
|
.prepareSearch(queryIndex)
|
||||||
|
.setQuery(
|
||||||
|
QueryBuilders.templateQuery(new Template("my_script", ScriptType.INDEXED,
|
||||||
|
MustacheScriptEngineService.NAME, null, null))).get();
|
||||||
|
assertNoFailures(searchResponse);
|
||||||
|
assertHitCount(searchResponse, 1);
|
||||||
|
|
||||||
|
assertGetRequestsContainHeaders(".scripts");
|
||||||
|
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testThatSearchTemplatesWithIndexedTemplatesGetRequestContainsContextAndHeaders() throws Exception {
|
||||||
|
PutIndexedScriptResponse scriptResponse = transportClient().preparePutIndexedScript(MustacheScriptEngineService.NAME, "the_template",
|
||||||
|
jsonBuilder().startObject().startObject("template").startObject("query").startObject("match")
|
||||||
|
.field("name", "{{query_string}}").endObject().endObject().endObject().endObject().string()
|
||||||
|
).get();
|
||||||
|
assertThat(scriptResponse.isCreated(), is(true));
|
||||||
|
|
||||||
|
transportClient().prepareIndex(queryIndex, "type", "1")
|
||||||
|
.setSource(jsonBuilder().startObject().field("name", "Star Wars - The new republic").endObject())
|
||||||
|
.get();
|
||||||
|
transportClient().admin().indices().prepareRefresh(queryIndex).get();
|
||||||
|
|
||||||
|
Map<String, Object> params = new HashMap<>();
|
||||||
|
params.put("query_string", "star wars");
|
||||||
|
|
||||||
|
SearchResponse searchResponse = transportClient().prepareSearch(queryIndex).setTemplate(new Template("the_template", ScriptType.INDEXED, MustacheScriptEngineService.NAME, null, params))
|
||||||
|
.get();
|
||||||
|
|
||||||
|
assertNoFailures(searchResponse);
|
||||||
|
assertHitCount(searchResponse, 1);
|
||||||
|
|
||||||
|
assertGetRequestsContainHeaders(".scripts");
|
||||||
|
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testThatIndexedScriptGetRequestInPhraseSuggestContainsContextAndHeaders() throws Exception {
|
||||||
|
CreateIndexRequestBuilder builder = transportClient().admin().indices().prepareCreate("test").setSettings(settingsBuilder()
|
||||||
|
.put(indexSettings())
|
||||||
|
.put(SETTING_NUMBER_OF_SHARDS, 1) // A single shard will help to keep the tests repeatable.
|
||||||
|
.put("index.analysis.analyzer.text.tokenizer", "standard")
|
||||||
|
.putArray("index.analysis.analyzer.text.filter", "lowercase", "my_shingle")
|
||||||
|
.put("index.analysis.filter.my_shingle.type", "shingle")
|
||||||
|
.put("index.analysis.filter.my_shingle.output_unigrams", true)
|
||||||
|
.put("index.analysis.filter.my_shingle.min_shingle_size", 2)
|
||||||
|
.put("index.analysis.filter.my_shingle.max_shingle_size", 3));
|
||||||
|
|
||||||
|
XContentBuilder mapping = XContentFactory.jsonBuilder()
|
||||||
|
.startObject()
|
||||||
|
.startObject("type1")
|
||||||
|
.startObject("properties")
|
||||||
|
.startObject("title")
|
||||||
|
.field("type", "string")
|
||||||
|
.field("analyzer", "text")
|
||||||
|
.endObject()
|
||||||
|
.endObject()
|
||||||
|
.endObject()
|
||||||
|
.endObject();
|
||||||
|
assertAcked(builder.addMapping("type1", mapping));
|
||||||
|
ensureGreen();
|
||||||
|
|
||||||
|
List<String> titles = new ArrayList<>();
|
||||||
|
|
||||||
|
titles.add("United States House of Representatives Elections in Washington 2006");
|
||||||
|
titles.add("United States House of Representatives Elections in Washington 2005");
|
||||||
|
titles.add("State");
|
||||||
|
titles.add("Houses of Parliament");
|
||||||
|
titles.add("Representative Government");
|
||||||
|
titles.add("Election");
|
||||||
|
|
||||||
|
List<IndexRequestBuilder> builders = new ArrayList<>();
|
||||||
|
for (String title: titles) {
|
||||||
|
transportClient().prepareIndex("test", "type1").setSource("title", title).get();
|
||||||
|
}
|
||||||
|
transportClient().admin().indices().prepareRefresh("test").get();
|
||||||
|
|
||||||
|
String filterStringAsFilter = XContentFactory.jsonBuilder()
|
||||||
|
.startObject()
|
||||||
|
.startObject("match_phrase")
|
||||||
|
.field("title", "{{suggestion}}")
|
||||||
|
.endObject()
|
||||||
|
.endObject()
|
||||||
|
.string();
|
||||||
|
|
||||||
|
PutIndexedScriptResponse scriptResponse = transportClient()
|
||||||
|
.preparePutIndexedScript(
|
||||||
|
MustacheScriptEngineService.NAME,
|
||||||
|
"my_script",
|
||||||
|
jsonBuilder().startObject().field("script", filterStringAsFilter).endObject()
|
||||||
|
.string()).get();
|
||||||
|
assertThat(scriptResponse.isCreated(), is(true));
|
||||||
|
|
||||||
|
PhraseSuggestionBuilder suggest = phraseSuggestion("title")
|
||||||
|
.field("title")
|
||||||
|
.addCandidateGenerator(PhraseSuggestionBuilder.candidateGenerator("title")
|
||||||
|
.suggestMode("always")
|
||||||
|
.maxTermFreq(.99f)
|
||||||
|
.size(10)
|
||||||
|
.maxInspections(200)
|
||||||
|
)
|
||||||
|
.confidence(0f)
|
||||||
|
.maxErrors(2f)
|
||||||
|
.shardSize(30000)
|
||||||
|
.size(10);
|
||||||
|
|
||||||
|
PhraseSuggestionBuilder filteredFilterSuggest = suggest.collateQuery(new Template("my_script", ScriptType.INDEXED,
|
||||||
|
MustacheScriptEngineService.NAME, null, null));
|
||||||
|
|
||||||
|
SearchRequestBuilder searchRequestBuilder = transportClient().prepareSearch("test").setSize(0);
|
||||||
|
SuggestBuilder suggestBuilder = new SuggestBuilder();
|
||||||
|
String suggestText = "united states house of representatives elections in washington 2006";
|
||||||
|
if (suggestText != null) {
|
||||||
|
suggestBuilder.setText(suggestText);
|
||||||
|
}
|
||||||
|
suggestBuilder.addSuggestion(filteredFilterSuggest);
|
||||||
|
searchRequestBuilder.suggest(suggestBuilder);
|
||||||
|
SearchResponse actionGet = searchRequestBuilder.execute().actionGet();
|
||||||
|
assertThat(Arrays.toString(actionGet.getShardFailures()), actionGet.getFailedShards(), equalTo(0));
|
||||||
|
Suggest searchSuggest = actionGet.getSuggest();
|
||||||
|
|
||||||
|
assertSuggestionSize(searchSuggest, 0, 2, "title");
|
||||||
|
|
||||||
|
assertGetRequestsContainHeaders(".scripts");
|
||||||
|
assertRequestsContainHeader(PutIndexedScriptRequest.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
private <T> List<T> getRequests(Class<T> clazz) {
|
||||||
|
List<T> results = new ArrayList<>();
|
||||||
|
for (ActionRequest request : requests) {
|
||||||
|
if (request.getClass().equals(clazz)) {
|
||||||
|
results.add((T) request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return results;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assertRequestsContainHeader(Class<? extends ActionRequest> clazz) {
|
||||||
|
List<? extends ActionRequest> classRequests = getRequests(clazz);
|
||||||
|
for (ActionRequest request : classRequests) {
|
||||||
|
assertRequestContainsHeader(request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assertGetRequestsContainHeaders() {
|
||||||
|
assertGetRequestsContainHeaders(this.lookupIndex);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assertGetRequestsContainHeaders(String index) {
|
||||||
|
List<GetRequest> getRequests = getRequests(GetRequest.class);
|
||||||
|
assertThat(getRequests, hasSize(greaterThan(0)));
|
||||||
|
|
||||||
|
for (GetRequest request : getRequests) {
|
||||||
|
if (!request.index().equals(index)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
assertRequestContainsHeader(request);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void assertRequestContainsHeader(ActionRequest request) {
|
||||||
|
String msg = String.format(Locale.ROOT, "Expected header %s to be in request %s", randomHeaderKey, request.getClass().getName());
|
||||||
|
if (request instanceof IndexRequest) {
|
||||||
|
IndexRequest indexRequest = (IndexRequest) request;
|
||||||
|
msg = String.format(Locale.ROOT, "Expected header %s to be in index request %s/%s/%s", randomHeaderKey,
|
||||||
|
indexRequest.index(), indexRequest.type(), indexRequest.id());
|
||||||
|
}
|
||||||
|
assertThat(msg, request.hasHeader(randomHeaderKey), is(true));
|
||||||
|
assertThat(request.getHeader(randomHeaderKey).toString(), is(randomHeaderValue));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* a transport client that adds our random header
|
||||||
|
*/
|
||||||
|
private Client transportClient() {
|
||||||
|
Client transportClient = internalCluster().transportClient();
|
||||||
|
FilterClient filterClient = new FilterClient(transportClient) {
|
||||||
|
@Override
|
||||||
|
protected <Request extends ActionRequest, Response extends ActionResponse, RequestBuilder extends ActionRequestBuilder<Request, Response, RequestBuilder>> void doExecute(Action<Request, Response, RequestBuilder> action, Request request, ActionListener<Response> listener) {
|
||||||
|
request.putHeader(randomHeaderKey, randomHeaderValue);
|
||||||
|
super.doExecute(action, request, listener);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return filterClient;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ActionLoggingPlugin extends Plugin {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String name() {
|
||||||
|
return "test-action-logging";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String description() {
|
||||||
|
return "Test action logging";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<Module> nodeModules() {
|
||||||
|
return Collections.<Module>singletonList(new ActionLoggingModule());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void onModule(ActionModule module) {
|
||||||
|
module.registerFilter(LoggingFilter.class);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class ActionLoggingModule extends AbstractModule {
|
||||||
|
@Override
|
||||||
|
protected void configure() {
|
||||||
|
bind(LoggingFilter.class).asEagerSingleton();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class LoggingFilter extends ActionFilter.Simple {
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public LoggingFilter(Settings settings) {
|
||||||
|
super(settings);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int order() {
|
||||||
|
return 999;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean apply(String action, ActionRequest request, ActionListener listener) {
|
||||||
|
requests.add(request);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected boolean apply(String action, ActionResponse response, ActionListener listener) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -34,11 +34,12 @@
|
||||||
* </ul>
|
* </ul>
|
||||||
*/
|
*/
|
||||||
/* List of renames that took place:
|
/* List of renames that took place:
|
||||||
renamed: core/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java -> modules/lang-mustache/src/test/java/org/elasticsearch/index/query/TemplateQueryBuilderTests.java
|
|
||||||
renamed: core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/RenderSearchTemplateTests.java
|
renamed: core/src/test/java/org/elasticsearch/validate/RenderSearchTemplateIT.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/RenderSearchTemplateTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/SuggestSearchTests.java
|
renamed: core/src/test/java/org/elasticsearch/search/suggest/SuggestSearchIT.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/SuggestSearchTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTests.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/TemplateQueryParserTests.java
|
renamed: core/src/test/java/org/elasticsearch/index/query/TemplateQueryParserTests.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/TemplateQueryParserTests.java
|
||||||
renamed: core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/TemplateQueryTests.java
|
renamed: core/src/test/java/org/elasticsearch/index/query/TemplateQueryIT.java -> modules/lang-mustache/src/test/java/org/elasticsearch/messy/tests/TemplateQueryTests.java
|
||||||
|
renamed: core/src/test/java/org/elasticsearch/transport/ContextAndHeaderTransportIT.java -> module/lang-mustache/src/test/java/org/elasticsearch/messy/tests/ContextAndHeaderTransportTests.java
|
||||||
|
^^^^^ note: just the methods from this test using mustache were moved here, the others use groovy and are in the groovy module under its messy tests package.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.elasticsearch.messy.tests;
|
package org.elasticsearch.messy.tests;
|
||||||
Loading…
Reference in New Issue