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

[Manual Backport 2.x] [ignoreFilterIfFieldNotInIndex] Parse query string filter to determine fields (#6126) #6739

Merged

Conversation

LDrago27
Copy link
Collaborator

@LDrago27 LDrago27 commented May 7, 2024

Description
Backport PR

Signed-off-by: Nick Steinbaugh nsteinbaugh@icr-team.com
(cherry picked from commit 24177b2)

Description
#6126

Changelog

  • skip

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Nick Steinbaugh <nsteinbaugh@icr-team.com>
(cherry picked from commit 24177b2)
Copy link

codecov bot commented May 7, 2024

Codecov Report

Attention: Patch coverage is 61.90476% with 8 lines in your changes are missing coverage. Please review.

Project coverage is 67.69%. Comparing base (11fb03a) to head (7bf5a5b).

Files Patch % Lines
...rch_query/opensearch_query/filter_matches_index.ts 61.90% 2 Missing and 6 partials ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #6739      +/-   ##
==========================================
- Coverage   67.73%   67.69%   -0.05%     
==========================================
  Files        3414     3414              
  Lines       66922    66943      +21     
  Branches    10870    10877       +7     
==========================================
- Hits        45331    45315      -16     
- Misses      18953    18961       +8     
- Partials     2638     2667      +29     
Flag Coverage Δ
Linux_1 33.18% <4.76%> (-0.02%) ⬇️
Linux_2 ?
Linux_3 ?
Linux_4 ?
Windows_1 33.20% <4.76%> (-0.02%) ⬇️
Windows_2 55.59% <4.76%> (-0.05%) ⬇️
Windows_3 45.28% <61.90%> (?)
Windows_4 34.98% <4.76%> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ashwin-pc ashwin-pc merged commit 5008e77 into opensearch-project:2.x May 7, 2024
62 of 83 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.14 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/OpenSearch-Dashboards/backport-2.14 2.14
# Navigate to the new working tree
pushd ../.worktrees/OpenSearch-Dashboards/backport-2.14
# Create a new branch
git switch --create backport/backport-6739-to-2.14
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 5008e77a29ee95481402061a1f75e6b92446799a
# Push it to GitHub
git push --set-upstream origin backport/backport-6739-to-2.14
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/OpenSearch-Dashboards/backport-2.14

Then, create a pull request where the base branch is 2.14 and the compare/head branch is backport/backport-6739-to-2.14.

@ashwin-pc
Copy link
Member

This does not need to go into the 2.14 branch

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants