diff --git a/core/src/test/java/org/elasticsearch/get/GetActionIT.java b/core/src/test/java/org/elasticsearch/get/GetActionIT.java index 86536b00e656e..f9c4b0d960638 100644 --- a/core/src/test/java/org/elasticsearch/get/GetActionIT.java +++ b/core/src/test/java/org/elasticsearch/get/GetActionIT.java @@ -809,34 +809,24 @@ public void testUngeneratedFieldsThatAreAlwaysStored() throws IOException { String createIndexSource = "{\n" + " \"settings\": {\n" + " \"index.translog.flush_threshold_size\": \"1pb\",\n" + - " \"index.mapping.single_type\": false," + " \"refresh_interval\": \"-1\"\n" + - " },\n" + - " \"mappings\": {\n" + - " \"parentdoc\": {\n" + - " },\n" + - " \"doc\": {\n" + - " \"_parent\": {\n" + - " \"type\": \"parentdoc\"\n" + - " }\n" + - " }\n" + " }\n" + "}"; assertAcked(prepareCreate("test") .addAlias(new Alias("alias")).setSource(createIndexSource, XContentType.JSON)); ensureGreen(); - client().prepareIndex("test", "doc").setId("1").setSource("{}", XContentType.JSON).setParent("1").get(); + client().prepareIndex("test", "doc", "1").setRouting("routingValue").setId("1").setSource("{}", XContentType.JSON).get(); - String[] fieldsList = {"_parent"}; + String[] fieldsList = {"_routing"}; // before refresh - document is only in translog - assertGetFieldsAlwaysWorks(indexOrAlias(), "doc", "1", fieldsList, "1"); + assertGetFieldsAlwaysWorks(indexOrAlias(), "doc", "1", fieldsList, "routingValue"); refresh(); //after refresh - document is in translog and also indexed - assertGetFieldsAlwaysWorks(indexOrAlias(), "doc", "1", fieldsList, "1"); + assertGetFieldsAlwaysWorks(indexOrAlias(), "doc", "1", fieldsList, "routingValue"); flush(); //after flush - document is in not anymore translog - only indexed - assertGetFieldsAlwaysWorks(indexOrAlias(), "doc", "1", fieldsList, "1"); + assertGetFieldsAlwaysWorks(indexOrAlias(), "doc", "1", fieldsList, "routingValue"); } public void testUngeneratedFieldsNotPartOfSourceStored() throws IOException { diff --git a/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java b/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java index 3bbd4e8146527..cf7b4a233a1e0 100644 --- a/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java +++ b/core/src/test/java/org/elasticsearch/index/mapper/TypeFieldMapperTests.java @@ -62,8 +62,8 @@ public void testDocValuesSingleType() throws Exception { } public void testDocValues(boolean singleType) throws IOException { - Settings indexSettings = Settings.builder() - .put("index.mapping.single_type", singleType) + Settings indexSettings = singleType ? Settings.EMPTY : Settings.builder() + .put("index.version.created", Version.V_5_6_0) .build(); MapperService mapperService = createIndex("test", indexSettings).mapperService(); DocumentMapper mapper = mapperService.merge("type", new CompressedXContent("{\"type\":{}}"), MergeReason.MAPPING_UPDATE, false); diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java index 00b2714e4ff54..12bb2f700e394 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/aggregations/ChildrenIT.java @@ -19,6 +19,7 @@ package org.elasticsearch.join.aggregations; import org.apache.lucene.search.join.ScoreMode; +import org.elasticsearch.Version; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.update.UpdateResponse; @@ -59,8 +60,11 @@ import static org.hamcrest.Matchers.sameInstance; public class ChildrenIT extends ParentChildTestCase { + + private static final Map categoryToControl = new HashMap<>(); + @Before public void setupCluster() throws Exception { categoryToControl.clear(); @@ -321,7 +325,7 @@ public void testPostCollection() throws Exception { prepareCreate(indexName) .setSettings(Settings.builder().put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.mapping.single_type", false)) + .put("index.version.created", Version.V_5_6_0)) // multi type .addMapping(masterType, "brand", "type=text", "name", "type=keyword", "material", "type=text") .addMapping(childType, "_parent", "type=masterprod", "color", "type=keyword", "size", "type=keyword") ); @@ -396,7 +400,7 @@ public void testHierarchicalChildrenAggs() { assertAcked( prepareCreate(indexName) .setSettings(Settings.builder() - .put("index.mapping.single_type", false) + .put("index.version.created", Version.V_5_6_0) // multi type ).addMapping(grandParentType, "name", "type=keyword") .addMapping(parentType, "_parent", "type=" + grandParentType) .addMapping(childType, "_parent", "type=" + parentType) diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/InnerHitsIT.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/InnerHitsIT.java index 7f9d58e78fd70..532b024665784 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/InnerHitsIT.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/InnerHitsIT.java @@ -72,7 +72,9 @@ public class InnerHitsIT extends ParentChildTestCase { @Override protected Collection> nodePlugins() { - return Arrays.asList(ParentJoinPlugin.class, CustomScriptPlugin.class); + ArrayList> plugins = new ArrayList<>(super.nodePlugins()); + plugins.add(CustomScriptPlugin.class); + return plugins; } public static class CustomScriptPlugin extends MockScriptPlugin { diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasChildQueryBuilderTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasChildQueryBuilderTests.java index 2bf6a0f2d3b25..395b18ebb5e05 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasChildQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasChildQueryBuilderTests.java @@ -114,7 +114,7 @@ protected void initializeAdditionalMappings(MapperService mapperService) throws protected Settings indexSettings() { return Settings.builder() .put(super.indexSettings()) - .put("index.mapping.single_type", false) + .put("index.version.created", Version.V_5_6_0) // multi type .build(); } diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasParentQueryBuilderTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasParentQueryBuilderTests.java index 0d84be4874b03..c1a3c51a46641 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasParentQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyHasParentQueryBuilderTests.java @@ -75,7 +75,7 @@ protected Collection> getPlugins() { protected Settings indexSettings() { return Settings.builder() .put(super.indexSettings()) - .put("index.mapping.single_type", false) + .put("index.version.created", Version.V_5_6_0) // legacy needs multi types .build(); } diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java index 5342e6b0c5d1d..f613e58498ace 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/LegacyParentIdQueryBuilderTests.java @@ -24,6 +24,7 @@ import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; +import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.settings.Settings; @@ -58,7 +59,7 @@ protected Collection> getPlugins() { protected Settings indexSettings() { return Settings.builder() .put(super.indexSettings()) - .put("index.mapping.single_type", false) + .put("index.version.created", Version.V_5_6_0) // legacy needs multi type .build(); } diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentChildTestCase.java b/modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentChildTestCase.java index 188ba03f2b969..5d9b03045acfe 100644 --- a/modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentChildTestCase.java +++ b/modules/parent-join/src/test/java/org/elasticsearch/join/query/ParentChildTestCase.java @@ -18,6 +18,7 @@ */ package org.elasticsearch.join.query; +import org.elasticsearch.Version; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.xcontent.XContentBuilder; @@ -27,8 +28,10 @@ import org.elasticsearch.join.ParentJoinPlugin; import org.elasticsearch.plugins.Plugin; import org.elasticsearch.test.ESIntegTestCase; +import org.elasticsearch.test.InternalSettingsPlugin; import java.io.IOException; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -44,7 +47,7 @@ protected boolean ignoreExternalCluster() { @Override protected Collection> nodePlugins() { - return Collections.singleton(ParentJoinPlugin.class); + return Arrays.asList(InternalSettingsPlugin.class, ParentJoinPlugin.class); } @Override @@ -60,7 +63,7 @@ public Settings indexSettings() { .put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true); if (legacy()) { - builder.put("index.mapping.single_type", false); + builder.put("index.version.created", Version.V_5_6_0); } return builder.build(); diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexParentChildTests.java b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexParentChildTests.java index 8c4135f1f261c..218a6b9eed46f 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexParentChildTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexParentChildTests.java @@ -19,11 +19,13 @@ package org.elasticsearch.index.reindex; +import org.elasticsearch.Version; import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.common.xcontent.XContentType; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.join.ParentJoinPlugin; import org.elasticsearch.plugins.Plugin; +import org.elasticsearch.test.InternalSettingsPlugin; import java.util.ArrayList; import java.util.Collection; @@ -56,6 +58,7 @@ protected boolean ignoreExternalCluster() { protected Collection> nodePlugins() { final List> plugins = new ArrayList<>(super.nodePlugins()); plugins.add(ParentJoinPlugin.class); + plugins.add(InternalSettingsPlugin.class); return Collections.unmodifiableList(plugins); } @@ -116,7 +119,7 @@ public void testErrorMessageWhenBadParentChild() throws Exception { */ private void createParentChildIndex(String indexName) throws Exception { CreateIndexRequestBuilder create = client().admin().indices().prepareCreate(indexName); - create.setSettings("index.mapping.single_type", false); + create.setSettings("index.version.created", Version.V_5_6_0.id); create.addMapping("city", "{\"_parent\": {\"type\": \"country\"}}", XContentType.JSON); create.addMapping("neighborhood", "{\"_parent\": {\"type\": \"city\"}}", XContentType.JSON); assertAcked(create);