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

PassThroughObject nests aliases within objects for fields with dotted names #105298

Merged
merged 6 commits into from
Feb 9, 2024
Merged

PassThroughObject nests aliases within objects for fields with dotted names #105298

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be386a2
Ignore duplicate FieldAliasMappers during building
kkrik-es Feb 8, 2024
968dc44
Update docs/changelog/105298.yaml
kkrik-es Feb 8, 2024
91a0b73
revert
kkrik-es Feb 8, 2024
fe0ca8c
Merge remote-tracking branch 'origin/fix/103567' into fix/103567
kkrik-es Feb 8, 2024
01970b7
nest alias within objects
kkrik-es Feb 8, 2024
c97256c
Delete docs/changelog/105298.yaml
kkrik-es Feb 9, 2024
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: 5 additions & 0 deletions docs/changelog/105298.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 105298
summary: Ignore duplicate `FieldAliasMappers`
area: TSDB
type: bug
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bug in unreleased code, let's mark it as non-issue and then a changelog isn't needed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

issues: []
2 changes: 1 addition & 1 deletion server/src/main/java/org/elasticsearch/index/mapper/ObjectMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ protected static void parseProperties(
throw new MapperParsingException("No handler for type [" + type + "] declared on field [" + fieldName + "]");
}
Mapper.Builder fieldBuilder;
if (objBuilder.subobjects.value() == false || type.equals(FieldAliasMapper.CONTENT_TYPE)) {
if (objBuilder.subobjects.value() == false) {
fieldBuilder = typeParser.parse(fieldName, propNode, parserContext);
} else {
String[] fieldNameParts = fieldName.split("\\.");
Expand Down
32 changes: 28 additions & 4 deletions server/src/main/java/org/elasticsearch/index/mapper/RootObjectMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,34 @@ void getAliasMappers(Map<String, Mapper> mappers, Map<String, Mapper> aliasMappe
);
}
} else {
FieldAliasMapper aliasMapper = new FieldAliasMapper.Builder(fieldMapper.simpleName()).path(
fieldMapper.mappedFieldType.name()
).build(context);
aliasMappers.put(aliasMapper.simpleName(), aliasMapper);
// Check if the field name contains dots, as aliases require nesting within objects in this case.
String[] fieldNameParts = fieldMapper.simpleName().split("\\.");
if (fieldNameParts.length == 0) {
throw new IllegalArgumentException("field name cannot contain only dots");
}
if (fieldNameParts.length == 1) {
// No nesting required, add the alias directly to the root.
FieldAliasMapper aliasMapper = new FieldAliasMapper.Builder(fieldMapper.simpleName()).path(
fieldMapper.mappedFieldType.name()
).build(context);
aliasMappers.put(aliasMapper.simpleName(), aliasMapper);
} else {
// Nest the alias within object(s).
String realFieldName = fieldNameParts[fieldNameParts.length - 1];
Mapper.Builder fieldBuilder = new FieldAliasMapper.Builder(realFieldName).path(
fieldMapper.mappedFieldType.name()
);
for (int i = fieldNameParts.length - 2; i >= 0; --i) {
String intermediateObjectName = fieldNameParts[i];
ObjectMapper.Builder intermediate = new ObjectMapper.Builder(
intermediateObjectName,
ObjectMapper.Defaults.SUBOBJECTS
);
intermediate.add(fieldBuilder);
fieldBuilder = intermediate;
}
aliasMappers.put(fieldNameParts[0], fieldBuilder.build(context));
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/test/java/org/elasticsearch/index/mapper/RootObjectMapperTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ public void testPassThroughObjectNested() throws IOException {
}));
assertThat(mapperService.mappingLookup().getMapper("dim"), instanceOf(FieldAliasMapper.class));
assertThat(mapperService.mappingLookup().getMapper("resource.attributes.dim"), instanceOf(KeywordFieldMapper.class));
assertThat(mapperService.mappingLookup().getMapper("another.dim"), instanceOf(FieldAliasMapper.class));
assertThat(mapperService.mappingLookup().objectMappers().get("another").getMapper("dim"), instanceOf(FieldAliasMapper.class));
assertThat(mapperService.mappingLookup().getMapper("attributes.another.dim"), instanceOf(KeywordFieldMapper.class));
}

Expand Down