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.

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

Fixing InnerHits storedFields ("stored_fields") generated Json name. #781

Merged
merged 4 commits into from
Dec 26, 2023

Conversation

brentam
Copy link
Contributor

@brentam brentam commented Dec 23, 2023

Description

This will fix the InnerHits storedFields serialization/deserialization.

At the moment, InnerHits is generating/expecting the wrong json field name for "stored_fields".
It is actually using "stored_field" (singular).

Thus, Is not possible to create correct search requests that uses InnerHits with storedFields.

Issues Resolved

Will close #780

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.

@dblock dblock merged commit 0729a92 into opensearch-project:main Dec 26, 2023
45 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Dec 26, 2023
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

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-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-781-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 0729a92370cd8f81a394c38ccdf94567bfb92687
# Push it to GitHub
git push --set-upstream origin backport/backport-781-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-781-to-2.x.

reta pushed a commit to reta/opensearch-java that referenced this pull request Jan 2, 2024
…pensearch-project#781)

* dummy CHANGELOG.md

Signed-off-by: brentam <[email protected]>

* corrected the InnerHits storedFields json field name
to "stored_fields"

Signed-off-by: brentam <[email protected]>

* adding correct PR information to CHANGELOG.md

Signed-off-by: brentam <[email protected]>

* ran ./gradlew :java-client:spotlessApply

Signed-off-by: brentam <[email protected]>

---------

Signed-off-by: brentam <[email protected]>
(cherry picked from commit 0729a92)
reta pushed a commit to reta/opensearch-java that referenced this pull request Jan 2, 2024
…pensearch-project#781)

* dummy CHANGELOG.md

Signed-off-by: brentam <[email protected]>

* corrected the InnerHits storedFields json field name
to "stored_fields"

Signed-off-by: brentam <[email protected]>

* adding correct PR information to CHANGELOG.md

Signed-off-by: brentam <[email protected]>

* ran ./gradlew :java-client:spotlessApply

Signed-off-by: brentam <[email protected]>

---------

Signed-off-by: brentam <[email protected]>
(cherry picked from commit 0729a92)
Signed-off-by: Andriy Redko <[email protected]>
dblock pushed a commit that referenced this pull request Jan 2, 2024
…781) (#794)

* dummy CHANGELOG.md



* corrected the InnerHits storedFields json field name
to "stored_fields"



* adding correct PR information to CHANGELOG.md



* ran ./gradlew :java-client:spotlessApply



---------


(cherry picked from commit 0729a92)

Signed-off-by: brentam <[email protected]>
Signed-off-by: Andriy Redko <[email protected]>
Co-authored-by: brentam <[email protected]>
@BrendonFaleiro BrendonFaleiro mentioned this pull request Jun 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Not possible to create queries that uses InnerHits with storedFields.
3 participants