From 8925400f677815a5736c88fa622aa2c53d260a05 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Tue, 21 Jun 2016 11:53:19 -0400 Subject: Remove guice from ScriptService Makes ScriptModule just a plain class that manages building the ScriptSettings and ScriptService from plugins. When we *need* to bind ScriptService with guice we bind it in a lambda. --- .../elasticsearch/search/builder/SearchSourceBuilderTests.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/src/test/java/org/elasticsearch/search/builder') diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java index 5822372bfa..fbd9546ec2 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java @@ -134,13 +134,16 @@ public class SearchSourceBuilderTests extends ESTestCase { (b) -> { b.bind(Environment.class).toInstance(new Environment(settings)); b.bind(ThreadPool.class).toInstance(threadPool); - }, settingsModule, - scriptModule, new IndicesModule(namedWriteableRegistry) { + b.bind(ScriptService.class).toInstance(scriptModule.getScriptService()); + }, + settingsModule, + new IndicesModule(namedWriteableRegistry) { @Override protected void configure() { bindMapperExtension(); } - }, new SearchModule(settings, namedWriteableRegistry) { + }, + new SearchModule(settings, namedWriteableRegistry) { @Override protected void configureSearch() { // Skip me -- cgit v1.2.3 From 2f46f53dc8feb78412e6d648751ffe97b1e35119 Mon Sep 17 00:00:00 2001 From: Jim Ferenczi Date: Tue, 21 Jun 2016 11:27:27 +0200 Subject: Rename `fields` to `stored_fields` and add `docvalue_fields` `stored_fields` parameter will no longer try to retrieve fields from the _source but will only return stored fields. `fields` will throw an exception if the user uses it. Add `docvalue_fields` as an adjunct to `fielddata_fields` which is deprecated. `docvalue_fields` will try to load the value from the docvalue and fallback to fielddata cache if docvalues are not enabled on that field. Closes #18943 --- .../org/elasticsearch/search/builder/SearchSourceBuilderTests.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/test/java/org/elasticsearch/search/builder') diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java index fbd9546ec2..ee5b65b5eb 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java @@ -219,12 +219,12 @@ public class SearchSourceBuilderTests extends ESTestCase { for (int i = 0; i < fieldsSize; i++) { fields.add(randomAsciiOfLengthBetween(5, 50)); } - builder.fields(fields); + builder.storedFields(fields); } if (randomBoolean()) { int fieldDataFieldsSize = randomInt(25); for (int i = 0; i < fieldDataFieldsSize; i++) { - builder.fieldDataField(randomAsciiOfLengthBetween(5, 50)); + builder.docValueField(randomAsciiOfLengthBetween(5, 50)); } } if (randomBoolean()) { -- cgit v1.2.3 From 6dd9cd72b9d4b32765449be3f8d9160763e5c932 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 22 Jun 2016 14:56:42 -0400 Subject: Build valid slices in SearchSourceBuilderTests The test had a 1 in 500 chance of building and invalid slice. --- .../java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'core/src/test/java/org/elasticsearch/search/builder') diff --git a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java index ee5b65b5eb..419b11dac6 100644 --- a/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java +++ b/core/src/test/java/org/elasticsearch/search/builder/SearchSourceBuilderTests.java @@ -394,7 +394,7 @@ public class SearchSourceBuilderTests extends ESTestCase { } if (randomBoolean()) { String field = randomBoolean() ? null : randomAsciiOfLengthBetween(5, 20); - int max = randomInt(1000); + int max = between(2, 1000); int id = randomInt(max-1); if (field == null) { builder.slice(new SliceBuilder(id, max)); -- cgit v1.2.3