Allow null value for params in method mappings #354
Merged
Conversation
This file contains 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
Adds tests to reproduce Mapping Parsing Error when the parameters take the value null. Confirmed that both tests fail. Signed-off-by: John Mazanec <[email protected]>
Allow user to input null value for parameters field for KNNMethodContext and MethodComponentContext. Signed-off-by: John Mazanec <[email protected]>
jmazanec15
added
Bug Fixes
Codecov Report
@@ Coverage Diff @@
## main #354 +/- ##
============================================
+ Coverage 83.99% 84.00% +0.01%
- Complexity 900 902 +2
============================================
Files 130 130
Lines 3854 3858 +4
Branches 353 355 +2
============================================
+ Hits 3237 3241 +4
Misses 457 457
Partials 160 160
Continue to review full report at Codecov.
|
martin-gaievski
previously approved these changes
Apr 5, 2022
VijayanB
previously approved these changes
Apr 5, 2022
Adding BWC test. Currently it fails for 1.1 to 1.2+. Will fix in subsequent commit. Signed-off-by: John Mazanec <[email protected]>
jmazanec15
dismissed stale reviews from VijayanB and martin-gaievski
via
8ffcd3c
Adds support for parameters set to null so that index upgrades do not fail. Signed-off-by: John Mazanec <[email protected]>
|
Have you tried to run bwc on 1.2, I think that's the version where the issue can be reproduced with your new bwc test but without the code change? |
martin-gaievski
previously approved these changes
Apr 5, 2022
Released versions 1.2 and 1.3 do not support setting parameters to null so they will fail the test. Signed-off-by: John Mazanec <[email protected]>
martin-gaievski
approved these changes
Apr 5, 2022
VijayanB
approved these changes
Apr 5, 2022
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Apr 5, 2022
Allow user to input null value for parameters field for KNNMethodContext and MethodComponentContext. Adds tests to reproduce Mapping Parsing Error when the parameters take the value null as well as BWC tests. Signed-off-by: John Mazanec <[email protected]> (cherry picked from commit b08127c)
|
The backport to To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-1.2 1.2
# Navigate to the new working tree
cd .worktrees/backport-1.2
# Create a new branch
git switch --create backport/backport-354-to-1.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 b08127c2c4dcd1844072302e838f44897c8f18f5
# Push it to GitHub
git push --set-upstream origin backport/backport-354-to-1.2
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-1.2Then, create a pull request where the |
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Apr 5, 2022
Allow user to input null value for parameters field for KNNMethodContext and MethodComponentContext. Adds tests to reproduce Mapping Parsing Error when the parameters take the value null as well as BWC tests. Signed-off-by: John Mazanec <[email protected]> (cherry picked from commit b08127c)
jmazanec15
added a commit
to jmazanec15/k-NN-1
that referenced
this pull request
Apr 5, 2022
Allow user to input null value for parameters field for KNNMethodContext and MethodComponentContext. Adds tests to reproduce Mapping Parsing Error when the parameters take the value null as well as BWC tests. Signed-off-by: John Mazanec <[email protected]> (cherry picked from commit b08127c)
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.
Description
By default, in OpenSearch 1.0 and 1.1, if parameters were not set for method definitions, they were assigned a value of null. This causes an issue on upgrade to 1.2+, where null values for parameters are not accepted and throw a MappingParsingException.
The fix is to skip parsing the parameter value as a map in the input JSON if it is null.
Issues Resolved
#353
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.