ESQL: Fix validation NPE in Enrich and add extra @Nullable annotations#128260
Merged
ivancea merged 2 commits intoelastic:mainfrom May 23, 2025
Merged
ESQL: Fix validation NPE in Enrich and add extra @Nullable annotations#128260ivancea merged 2 commits intoelastic:mainfrom
ivancea merged 2 commits intoelastic:mainfrom
Conversation
ivancea
added
>bug
Team:Analytics
Collaborator
|
Pinging @elastic/es-analytical-engine (Team:Analytics) |
Collaborator
|
Hi @ivancea, I've created a changelog YAML for you. |
ivancea
commented
May 21, 2025
|
|
||
| private static void validateTypes(DataType inputDataType, MappedFieldType fieldType) { | ||
| if (fieldType instanceof RangeFieldMapper.RangeFieldType rangeType) { | ||
| private static void validateTypes(@Nullable DataType inputDataType, MappedFieldType fieldType) { |
Contributor
Author
There was a problem hiding this comment.
The @Nullable annotations are showing a warning here as expected. But they're not showing a warning on method calls. Not perfect, but well. I think they may still help (?)
craigtaverner
approved these changes
May 23, 2025
Contributor
craigtaverner
left a comment
craigtaverner
left a comment
There was a problem hiding this comment.
LGTM, although I'm assuming the annotations don't change anything and it's all in the inputDataType == null check.
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
May 26, 2025
elastic#128260) Fixes elastic#126253 Fixes elastic#126297 `inputDataType` may be null when in mixed cluster (<8.14). So `validateTypes()` should take that into account. Similar fix to elastic#116583
ivancea
added a commit
to ivancea/elasticsearch
that referenced
this pull request
May 26, 2025
elastic#128260) Fixes elastic#126253 Fixes elastic#126297 `inputDataType` may be null when in mixed cluster (<8.14). So `validateTypes()` should take that into account. Similar fix to elastic#116583
This was referenced May 26, 2025
Merged
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 #126253
Fixes #126297
inputDataTypemay be null when in mixed cluster (<8.14). SovalidateTypes()should take that into account. Similar fix to #116583