Add serialization test for FieldMappers when include_defaults=true #58235
Conversation
This file contains hidden or 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
romseygeek
added
:Search Foundations/Mapping
|
Pinging @elastic/es-search (:Search/Mapping) |
|
Marked as |
|
@elasticmachine update branch |
|
@elasticmachine update branch |
javanna
reviewed
Jun 17, 2020
| @@ -917,7 +917,8 @@ protected boolean docValuesByDefault() { | |||
| @Override | |||
| protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException { | |||
| super.doXContentBody(builder, includeDefaults, params); | |||
| if (includeDefaults || (mappedFieldType.isSearchable() && fieldType.indexOptions() != Defaults.FIELD_TYPE.indexOptions())) { | |||
| if ((includeDefaults && fieldType.indexOptions() != IndexOptions.NONE) | |||
| || (mappedFieldType.isSearchable() && fieldType.indexOptions() != Defaults.FIELD_TYPE.indexOptions())) { | |||
There was a problem hiding this comment.
I struggle to parse this. why do we need to look at both indexOptions and isSearchable? When iis the second condition true in reality?
There was a problem hiding this comment.
Hm, you're right, we don't need the isSearchable bit there - will update, thanks!
There was a problem hiding this comment.
Have pushed a change which simplifies this
|
@elasticmachine run elasticsearch-ci/packaging-sample-unix-packages |
|
This has resolved the initial issue with non-indexed Here is a full example for what Kibana is using. The default distribution is required since it includes flattened types: mapping.txt
|
javanna
reviewed
Jun 17, 2020
| @@ -917,7 +917,8 @@ protected boolean docValuesByDefault() { | |||
| @Override | |||
| protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException { | |||
| super.doXContentBody(builder, includeDefaults, params); | |||
| if (includeDefaults || (mappedFieldType.isSearchable() && fieldType.indexOptions() != Defaults.FIELD_TYPE.indexOptions())) { | |||
| if (fieldType.indexOptions() != IndexOptions.NONE | |||
There was a problem hiding this comment.
so we don't want to print out index_options: none ? sorry I don't recall what we were doing before the refactoring.
There was a problem hiding this comment.
Yes, if index is set to false then we don't emit the index_options. The pre-existing method that converts the lucene IndexOptions enum to a string doesn' accept IndexOptions.NONE
There was a problem hiding this comment.
thanks for explaining, makes sense
|
I had omitted to explicitly test the |
|
@elasticmachine update branch |
javanna
approved these changes
Jun 18, 2020
| @@ -635,7 +635,8 @@ protected void parseCreateField(ParseContext context) throws IOException { | |||
| @Override | |||
| protected void doXContentBody(XContentBuilder builder, boolean includeDefaults, Params params) throws IOException { | |||
| super.doXContentBody(builder, includeDefaults, params); | |||
| if (includeDefaults || mappedFieldType.isSearchable() && fieldType.indexOptions() != Defaults.FIELD_TYPE.indexOptions()) { | |||
| if (fieldType.indexOptions() != IndexOptions.NONE | |||
| && (includeDefaults || fieldType.indexOptions() != Defaults.FIELD_TYPE.indexOptions())) { | |||
There was a problem hiding this comment.
this logic is now duplicated in multiple places, I am tempted to ask if we can share it, on the other hand I am afraid it may complicate things and removing this duplication is not a priority at the moment.
romseygeek
added a commit
to romseygeek/elasticsearch
that referenced
this pull request
Jun 18, 2020
…lastic#58235) Fixes a bug in TextFieldMapper serialization when index is false, and adds a base-class test to ensure that all field mappers are tested against all variations with defaults both included and excluded. Fixes elastic#58188
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes a bug in TextFieldMapper serialization when
indexisfalse, and adds abase-class test to ensure that all field mappers are tested against all variations
with defaults both included and excluded.
Fixes #58188