-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Mapping: Fix possibility of losing meta configuration on field mappin…
…g update The TTL, size, timestamp and index meta properties could be lost on an update of a single field mapping due to a wrong comparison in the merge method (which was caused by a wrong initialization, which marked an update as explicitely disabled instead of unset. Closes #5053
- Loading branch information
Showing
8 changed files
with
222 additions
and
10 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
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
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
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
71 changes: 71 additions & 0 deletions
71
src/test/java/org/elasticsearch/index/mapper/index/IndexTypeMapperIntegrationTests.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,71 @@ | ||
| /* | ||
| * 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.index; | ||
|
|
||
| import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; | ||
| import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.*; | ||
|
|
||
| /** | ||
| * | ||
| */ | ||
| public class IndexTypeMapperIntegrationTests extends ElasticsearchIntegrationTest { | ||
|
|
||
| @Test // issue 5053 | ||
| public void testThatUpdatingMappingShouldNotRemoveSizeMappingConfiguration() throws Exception { | ||
| String index = "foo"; | ||
| String type = "mytype"; | ||
|
|
||
| XContentBuilder builder = jsonBuilder().startObject().startObject("_index").field("enabled", true).endObject().endObject(); | ||
| assertAcked(client().admin().indices().prepareCreate(index).addMapping(type, builder)); | ||
|
|
||
| // check mapping again | ||
| assertIndexMappingEnabled(index, type); | ||
|
|
||
| // update some field in the mapping | ||
| XContentBuilder updateMappingBuilder = jsonBuilder().startObject().startObject("properties").startObject("otherField").field("type", "string").endObject().endObject(); | ||
| PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping(index).setType(type).setSource(updateMappingBuilder).get(); | ||
| assertAcked(putMappingResponse); | ||
|
|
||
| // make sure timestamp field is still in mapping | ||
| assertIndexMappingEnabled(index, type); | ||
| } | ||
|
|
||
| private void assertIndexMappingEnabled(String index, String type) throws IOException { | ||
| String errMsg = String.format(Locale.ROOT, "Expected index field mapping to be enabled for %s/%s", index, type); | ||
|
|
||
| GetMappingsResponse getMappingsResponse = client().admin().indices().prepareGetMappings(index).addTypes(type).get(); | ||
| Map<String, Object> mappingSource = getMappingsResponse.getMappings().get(index).get(type).getSourceAsMap(); | ||
| assertThat(errMsg, mappingSource, hasKey("_index")); | ||
| String ttlAsString = mappingSource.get("_index").toString(); | ||
| assertThat(ttlAsString, is(notNullValue())); | ||
| assertThat(errMsg, ttlAsString, is("{enabled=true}")); | ||
| } | ||
|
|
||
| } |
67 changes: 67 additions & 0 deletions
67
src/test/java/org/elasticsearch/index/mapper/size/SizeMappingIntegrationTests.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,67 @@ | ||
| /* | ||
| * 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.size; | ||
|
|
||
| import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse; | ||
| import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse; | ||
| import org.elasticsearch.common.xcontent.XContentBuilder; | ||
| import org.elasticsearch.test.ElasticsearchIntegrationTest; | ||
| import org.junit.Test; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.Locale; | ||
| import java.util.Map; | ||
|
|
||
| import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; | ||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.*; | ||
|
|
||
| public class SizeMappingIntegrationTests extends ElasticsearchIntegrationTest { | ||
|
|
||
| @Test // issue 5053 | ||
| public void testThatUpdatingMappingShouldNotRemoveSizeMappingConfiguration() throws Exception { | ||
| String index = "foo"; | ||
| String type = "mytype"; | ||
|
|
||
| XContentBuilder builder = jsonBuilder().startObject().startObject("_size").field("enabled", true).endObject().endObject(); | ||
| assertAcked(client().admin().indices().prepareCreate(index).addMapping(type, builder)); | ||
|
|
||
| // check mapping again | ||
| assertSizeMappingEnabled(index, type); | ||
|
|
||
| // update some field in the mapping | ||
| XContentBuilder updateMappingBuilder = jsonBuilder().startObject().startObject("properties").startObject("otherField").field("type", "string").endObject().endObject(); | ||
| PutMappingResponse putMappingResponse = client().admin().indices().preparePutMapping(index).setType(type).setSource(updateMappingBuilder).get(); | ||
| assertAcked(putMappingResponse); | ||
|
|
||
| // make sure timestamp field is still in mapping | ||
| assertSizeMappingEnabled(index, type); | ||
| } | ||
|
|
||
| private void assertSizeMappingEnabled(String index, String type) throws IOException { | ||
| String errMsg = String.format(Locale.ROOT, "Expected size field mapping to be enabled for %s/%s", index, type); | ||
|
|
||
| GetMappingsResponse getMappingsResponse = client().admin().indices().prepareGetMappings(index).addTypes(type).get(); | ||
| Map<String, Object> mappingSource = getMappingsResponse.getMappings().get(index).get(type).getSourceAsMap(); | ||
| assertThat(errMsg, mappingSource, hasKey("_size")); | ||
| String ttlAsString = mappingSource.get("_size").toString(); | ||
| assertThat(ttlAsString, is(notNullValue())); | ||
| assertThat(errMsg, ttlAsString, is("{enabled=true}")); | ||
| } | ||
| } |
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
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