Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch include_in_all in multifield to warning #23656

Merged
merged 1 commit into from
Mar 20, 2017
Merged

Switch include_in_all in multifield to warning #23656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions core/src/main/java/org/elasticsearch/index/mapper/TypeParsers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,9 @@ && parseNorms(builder, name, propName, propNode, parserContext)) {
iterator.remove();
} else if (propName.equals("include_in_all")) {
if (parserContext.isWithinMultiField()) {
throw new MapperParsingException("include_in_all in multi fields is not allowed. Found the include_in_all in field ["
+ name + "] which is within a multi field.");
deprecationLogger.deprecated("include_in_all in multi fields is deprecated "
+ "because it doesn't do anything. Found the include_in_all in field "
+ "[{}] which is within a multi field.", name);
} else {
deprecationLogger.deprecated("field [include_in_all] is deprecated, as [_all] is deprecated, " +
"and will be disallowed in 6.0, use [copy_to] instead.");
Expand Down
9 changes: 4 additions & 5 deletions core/src/test/java/org/elasticsearch/index/mapper/MultiFieldIncludeInAllMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,11 @@ public class MultiFieldIncludeInAllMapperTests extends ESTestCase {
public void testExceptionForIncludeInAllInMultiFields() throws IOException {
XContentBuilder mapping = createMappingWithIncludeInAllInMultiField();

// first check that for newer versions we throw exception if include_in_all is found withing multi field
// first check that for newer versions we throw exception if include_in_all is found within multi field
MapperService mapperService = MapperTestUtils.newMapperService(xContentRegistry(), createTempDir(), Settings.EMPTY);
Exception e = expectThrows(MapperParsingException.class, () ->
mapperService.parse("type", new CompressedXContent(mapping.string()), true));
assertEquals("include_in_all in multi fields is not allowed. Found the include_in_all in field [c] which is within a multi field.",
e.getMessage());
mapperService.parse("type", new CompressedXContent(mapping.string()), true);
assertWarnings("include_in_all in multi fields is deprecated because it doesn't do "
+ "anything. Found the include_in_all in field [c] which is within a multi field.");
}

private static XContentBuilder createMappingWithIncludeInAllInMultiField() throws IOException {
Expand Down