-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #15213 from brwe/copy-to-in-multi-fields-exception
throw exception if a copy_to is within a multi field Copy to within multi field is ignored from 2.0 on, see #10802. Instead of just ignoring it, we should throw an exception if this is found in the mapping when a mapping is added. For already existing indices we should at least log a warning. related to #14946
- Loading branch information
Showing
5 changed files
with
218 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
core/src/main/java/org/elasticsearch/index/mapper/core/MapperTestUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| /* | ||
| * 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.index.mapper.core; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.common.inject.Injector; | ||
| import org.elasticsearch.common.inject.ModulesBuilder; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.settings.SettingsModule; | ||
| import org.elasticsearch.env.Environment; | ||
| import org.elasticsearch.env.EnvironmentModule; | ||
| import org.elasticsearch.index.Index; | ||
| import org.elasticsearch.index.IndexNameModule; | ||
| import org.elasticsearch.index.analysis.AnalysisModule; | ||
| import org.elasticsearch.index.analysis.AnalysisService; | ||
| import org.elasticsearch.index.mapper.MapperService; | ||
| import org.elasticsearch.index.settings.IndexSettingsModule; | ||
| import org.elasticsearch.index.similarity.SimilarityLookupService; | ||
| import org.elasticsearch.indices.analysis.IndicesAnalysisService; | ||
|
|
||
| import java.nio.file.Path; | ||
|
|
||
|
|
||
| public class MapperTestUtils { | ||
|
|
||
| public static MapperService newMapperService(Path tempDir, Settings indexSettings) { | ||
| Settings.Builder settingsBuilder = Settings.builder() | ||
| .put("path.home", tempDir) | ||
| .put(indexSettings); | ||
| if (indexSettings.get(IndexMetaData.SETTING_VERSION_CREATED) == null) { | ||
| settingsBuilder.put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT); | ||
| } | ||
| Settings finalSettings = settingsBuilder.build(); | ||
| return new MapperService(new Index("test"), | ||
| finalSettings, | ||
| newAnalysisService(finalSettings), | ||
| newSimilarityLookupService(finalSettings), | ||
| null); | ||
| } | ||
|
|
||
| private static AnalysisService newAnalysisService(Settings indexSettings) { | ||
| Injector parentInjector = new ModulesBuilder().add(new SettingsModule(indexSettings), new EnvironmentModule(new Environment(indexSettings))).createInjector(); | ||
| Index index = new Index("test"); | ||
| Injector injector = new ModulesBuilder().add( | ||
| new IndexSettingsModule(index, indexSettings), | ||
| new IndexNameModule(index), | ||
| new AnalysisModule(indexSettings, parentInjector.getInstance(IndicesAnalysisService.class))).createChildInjector(parentInjector); | ||
|
|
||
| return injector.getInstance(AnalysisService.class); | ||
| } | ||
|
|
||
| private static SimilarityLookupService newSimilarityLookupService(Settings indexSettings) { | ||
| return new SimilarityLookupService(new Index("test"), indexSettings); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
core/src/test/java/org/elasticsearch/index/mapper/core/MultiFieldCopyToMapperTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * 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.index.mapper.core; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.cluster.metadata.IndexMetaData; | ||
| import org.elasticsearch.common.collect.Tuple; | ||
| import org.elasticsearch.common.compress.CompressedXContent; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.index.mapper.MapperParsingException; | ||
| import org.elasticsearch.index.mapper.MapperService; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.test.VersionUtils; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
| import static org.hamcrest.core.IsEqual.equalTo; | ||
|
|
||
| public class MultiFieldCopyToMapperTests extends ESTestCase { | ||
|
|
||
| public void testExceptionForCopyToInMultiFields() throws IOException { | ||
| XContentBuilder mapping = createMappinmgWithCopyToInMultiField(); | ||
| Tuple<List<Version>, List<Version>> versionsWithAndWithoutExpectedExceptions = versionsWithAndWithoutExpectedExceptions(); | ||
|
|
||
| // first check that for newer versions we throw exception if copy_to is found withing multi field | ||
| Version indexVersion = randomFrom(versionsWithAndWithoutExpectedExceptions.v1()); | ||
| MapperService mapperService = MapperTestUtils.newMapperService(createTempDir(), Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, indexVersion).build()); | ||
| try { | ||
| mapperService.parse("type", new CompressedXContent(mapping.string()), true); | ||
| fail("Parsing should throw an exception because the mapping contains a copy_to in a multi field"); | ||
| } catch (MapperParsingException e) { | ||
| assertThat(e.getMessage(), equalTo("copy_to in multi fields is not allowed. Found the copy_to in field [c] which is within a multi field.")); | ||
| } | ||
|
|
||
| // now test that with an older version the pasring just works | ||
| indexVersion = randomFrom(versionsWithAndWithoutExpectedExceptions.v2()); | ||
| mapperService = MapperTestUtils.newMapperService(createTempDir(), Settings.builder().put(IndexMetaData.SETTING_VERSION_CREATED, indexVersion).build()); | ||
| mapperService.parse("type", new CompressedXContent(mapping.string()), true); | ||
| } | ||
|
|
||
| private static XContentBuilder createMappinmgWithCopyToInMultiField() throws IOException { | ||
| XContentBuilder mapping = jsonBuilder(); | ||
| mapping.startObject() | ||
| .startObject("type") | ||
| .startObject("properties") | ||
| .startObject("a") | ||
| .field("type", "string") | ||
| .endObject() | ||
| .startObject("b") | ||
| .field("type", "string") | ||
| .startObject("fields") | ||
| .startObject("c") | ||
| .field("type", "string") | ||
| .field("copy_to", "a") | ||
| .endObject() | ||
| .endObject() | ||
| .endObject() | ||
| .endObject() | ||
| .endObject() | ||
| .endObject(); | ||
| return mapping; | ||
| } | ||
|
|
||
| // returs a tuple where | ||
| // v1 is a list of versions for which we expect an excpetion when a copy_to in multi fields is found and | ||
| // v2 is older versions where we throw no exception and we just log a warning | ||
| private static Tuple<List<Version>, List<Version>> versionsWithAndWithoutExpectedExceptions() { | ||
| List<Version> versionsWithException = new ArrayList<>(); | ||
| List<Version> versionsWithoutException = new ArrayList<>(); | ||
| for (Version version : VersionUtils.allVersions()) { | ||
| if (version.after(Version.V_2_0_1)) { | ||
| versionsWithException.add(version); | ||
| } else { | ||
| versionsWithoutException.add(version); | ||
| } | ||
| } | ||
| return new Tuple<>(versionsWithException, versionsWithoutException); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters