Skip to content

Read subobjects mapping parameter in advance #86894

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

Merged
merged 14 commits into from
May 23, 2022
Merged

Read subobjects mapping parameter in advance #86894

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
78d310e
Read subobjects mapping parameter in advance
javanna May 18, 2022
dd7f77e
leftover
javanna May 18, 2022
efa60b6
make subobjects final in ObjectMapper.Builder
javanna May 18, 2022
09a61b1
iter
javanna May 18, 2022
9c3a462
spotless
javanna May 18, 2022
bf96b1c
add tests
javanna May 18, 2022
59f8c4e
add tests
javanna May 19, 2022
080ba9c
Merge branch 'main' into fix/read_subobject_early
javanna May 20, 2022
d72ac33
iter
javanna May 20, 2022
05fc199
fix compile
javanna May 20, 2022
5f088c2
spotless
javanna May 20, 2022
19d818d
test
javanna May 20, 2022
e2df3e4
fix test
javanna May 20, 2022
dc67302
spotless
javanna May 20, 2022
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 50 additions & 3 deletions ...api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/91_metrics_no_subobjects.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
"Metrics indexing":
"Metrics object indexing":
- skip:
version: " - 8.2.99"
reason: added in 8.3.0
Expand All @@ -16,22 +16,69 @@
mapping:
type: object
subobjects: false
properties:
host.name:
type: keyword

- do:
index:
index: test-1
id: 1
refresh: true
body:
{ metrics.time: 10, metrics.time.max: 100, metrics.time.min: 1 }
{ metrics.host.name: localhost, metrics.host.id: 1, metrics.time: 10, metrics.time.max: 100, metrics.time.min: 1 }

- do:
field_caps:
index: test-1
fields: metrics.time*
fields: metrics*
- match: {fields.metrics\.host\.id.long.searchable: true}
- match: {fields.metrics\.host\.id.long.aggregatable: true}
- match: {fields.metrics\.host\.name.keyword.searchable: true}
- match: {fields.metrics\.host\.name.keyword.aggregatable: true}
- match: {fields.metrics\.time.long.searchable: true}
- match: {fields.metrics\.time.long.aggregatable: true}
- match: {fields.metrics\.time\.max.long.searchable: true}
- match: {fields.metrics\.time\.max.long.aggregatable: true}
- match: {fields.metrics\.time\.min.long.searchable: true}
- match: {fields.metrics\.time\.min.long.aggregatable: true}

---
"Root without subobjects":
- skip:
version: " - 8.2.99"
reason: added in 8.3.0

- do:
indices.put_template:
name: test
body:
index_patterns: test-*
mappings:
subobjects: false
properties:
host.name:
type: keyword

- do:
index:
index: test-1
id: 1
refresh: true
body:
{ host.name: localhost, host.id: 1, time: 10, time.max: 100, time.min: 1 }

- do:
field_caps:
index: test-1
fields: [host*, time*]
- match: {fields.host\.name.keyword.searchable: true}
- match: {fields.host\.name.keyword.aggregatable: true}
- match: {fields.host\.id.keyword.searchable: true}
- match: {fields.host\.id.keyword.aggregatable: true}
- match: {fields.time.long.searchable: true}
- match: {fields.time.long.aggregatable: true}
- match: {fields.time\.max.long.searchable: true}
- match: {fields.time\.max.long.aggregatable: true}
- match: {fields.time\.min.long.searchable: true}
- match: {fields.time\.min.long.aggregatable: true}
7 changes: 4 additions & 3 deletions server/src/main/java/org/elasticsearch/index/mapper/NestedObjectMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ public static class TypeParser extends ObjectMapper.TypeParser {
public Mapper.Builder parse(String name, Map<String, Object> node, MappingParserContext parserContext)
throws MapperParsingException {
NestedObjectMapper.Builder builder = new NestedObjectMapper.Builder(name, parserContext.indexVersionCreated());
parseSubobjects(node, builder);
if (builder.subobjects.explicit()) {
throw new MapperParsingException("Nested type [" + name + "] does not support [subobjects] parameter");
}
parseNested(name, node, builder);
for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
Map.Entry<String, Object> entry = iterator.next();
Expand All @@ -67,9 +71,6 @@ public Mapper.Builder parse(String name, Map<String, Object> node, MappingParser
iterator.remove();
}
}
if (builder.subobjects.explicit()) {
throw new MapperParsingException("Nested type [" + name + "] does not support [subobjects] parameter");
}
return builder;
}

Expand Down
11 changes: 8 additions & 3 deletions 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 @@ -187,6 +187,7 @@ public boolean supportsVersion(Version indexCreatedVersion) {
public Mapper.Builder parse(String name, Map<String, Object> node, MappingParserContext parserContext)
throws MapperParsingException {
ObjectMapper.Builder builder = new Builder(name);
parseSubobjects(node, builder);
for (Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator(); iterator.hasNext();) {
Map.Entry<String, Object> entry = iterator.next();
String fieldName = entry.getKey();
Expand Down Expand Up @@ -219,9 +220,6 @@ protected static boolean parseObjectOrDocumentTypeProperties(
} else if (fieldName.equals("enabled")) {
builder.enabled(XContentMapValues.nodeBooleanValue(fieldNode, fieldName + ".enabled"));
return true;
} else if (fieldName.equals("subobjects")) {
builder.subobjects(XContentMapValues.nodeBooleanValue(fieldNode, fieldName + ".subobjects"));
return true;
} else if (fieldName.equals("properties")) {
if (fieldNode instanceof Collection && ((Collection) fieldNode).isEmpty()) {
// nothing to do here, empty (to support "properties: []" case)
Expand All @@ -242,6 +240,13 @@ protected static boolean parseObjectOrDocumentTypeProperties(
return false;
}

protected static void parseSubobjects(Map<String, Object> node, ObjectMapper.Builder builder) {
Object subobjectsNode = node.remove("subobjects");
if (subobjectsNode != null) {
builder.subobjects(XContentMapValues.nodeBooleanValue(subobjectsNode, "subobjects.subobjects"));
Copy link
Contributor

@romseygeek romseygeek May 18, 2022

Choose a reason for hiding this comment

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

subobjects.subobjects looks like a typo?
Copy link
Member Author

@javanna javanna May 18, 2022

Choose a reason for hiding this comment

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

no it is correct, based on my copy and paste skills
Copy link
Member Author

@javanna javanna May 18, 2022

Choose a reason for hiding this comment

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

I would have asked the same though in your shoes.
}
}

protected static void parseProperties(
ObjectMapper.Builder objBuilder,
Map<String, Object> propsNode,
Expand Down
1 change: 1 addition & 0 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 @@ -153,6 +153,7 @@ static final class TypeParser extends ObjectMapper.TypeParser {
public RootObjectMapper.Builder parse(String name, Map<String, Object> node, MappingParserContext parserContext)
throws MapperParsingException {
RootObjectMapper.Builder builder = new Builder(name);
parseSubobjects(node, builder);
Iterator<Map.Entry<String, Object>> iterator = node.entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry<String, Object> entry = iterator.next();
Expand Down