Skip to content

Commit 73e936a

Browse files
authored
Fix serialization of the _all field. (#26143)
By default we only serialize analyzers if the index analyzer is not the `default` analyzer or if the `search_analyzer` is different from the index `analyzer`. This raises issues with the `_all` field when the `index.analysis.analyzer.default_search` is set, since it automatically makes the `search_analyzer` different from the index `analyzer`. Then there are exceptions since we expect the `_all` configuration to be empty on 6.0 indices. Closes #26136
1 parent 636e85e commit 73e936a

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

core/src/main/java/org/elasticsearch/index/mapper/AllFieldMapper.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ private void innerToXContent(XContentBuilder builder, boolean includeDefaults) t
273273
if (includeDefaults || enabledState != Defaults.ENABLED) {
274274
builder.field("enabled", enabledState.enabled);
275275
}
276+
if (enabled() == false) {
277+
return;
278+
}
276279
if (includeDefaults || fieldType().stored() != Defaults.FIELD_TYPE.stored()) {
277280
builder.field("store", fieldType().stored());
278281
}
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*
2+
* Licensed to Elasticsearch under one or more contributor
3+
* license agreements. See the NOTICE file distributed with
4+
* this work for additional information regarding copyright
5+
* ownership. Elasticsearch licenses this file to you under
6+
* the Apache License, Version 2.0 (the "License"); you may
7+
* not use this file except in compliance with the License.
8+
* You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
package org.elasticsearch.index.mapper;
21+
22+
import org.elasticsearch.common.compress.CompressedXContent;
23+
import org.elasticsearch.common.settings.Settings;
24+
import org.elasticsearch.common.xcontent.XContentFactory;
25+
import org.elasticsearch.index.IndexService;
26+
import org.elasticsearch.index.mapper.MapperService.MergeReason;
27+
import org.elasticsearch.test.ESSingleNodeTestCase;
28+
29+
public class AllFieldMapperTests extends ESSingleNodeTestCase {
30+
31+
public void testUpdateDefaultSearchAnalyzer() throws Exception {
32+
IndexService indexService = createIndex("test", Settings.builder()
33+
.put("index.analysis.analyzer.default_search.type", "custom")
34+
.put("index.analysis.analyzer.default_search.tokenizer", "standard").build());
35+
String mapping = XContentFactory.jsonBuilder().startObject().startObject("doc").endObject().endObject().string();
36+
indexService.mapperService().merge("doc", new CompressedXContent(mapping), MergeReason.MAPPING_UPDATE, false);
37+
assertEquals(mapping, indexService.mapperService().documentMapper("doc").mapping().toString());
38+
}
39+
40+
}

0 commit comments

Comments
 (0)