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

Introduce index.query.max_nested_depth. fix #3268 #11670

Merged
merged 6 commits into from
Feb 10, 2024

Conversation

mkhludnev
Copy link
Contributor

@mkhludnev mkhludnev commented Dec 25, 2023

Description

Introduce index.query.max_nested_depth setting.
Haven't documented it yet.

Related Issues

Resolves #3268

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.

@github-actions github-actions bot added enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers hacktoberfest Global event that encourages people to contribute to open-source. Search:Resiliency labels Dec 25, 2023
@opensearch-trigger-bot opensearch-trigger-bot bot removed the stalled Issues that have stalled label Feb 3, 2024
@mkhludnev mkhludnev requested a review from reta February 3, 2024 15:50
Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
@reta
Copy link
Collaborator

reta commented Feb 3, 2024

@msfroh mind please to double check, looks pretty good to me, thank you @mkhludnev !

Copy link
Contributor

github-actions bot commented Feb 3, 2024

❕ Gradle check result for bb39519: UNSTABLE

  • TEST FAILURES:
      1 org.opensearch.cluster.allocation.ClusterRerouteIT.testDelayWithALargeAmountOfShards

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

@reta
Copy link
Collaborator

reta commented Feb 10, 2024

@mkhludnev could you please resolve the conflicts? We'll merge it for 2.13.0, thank you

Signed-off-by: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
@mkhludnev
Copy link
Contributor Author

OK. Thanks. @reta.
Just made an attempt of resolving. Is it right way to do it?

@reta
Copy link
Collaborator

reta commented Feb 10, 2024

Just made an attempt of resolving. Is it right way to do it?

Yeah, looks right, thank you!

Copy link
Contributor

✅ Gradle check result for 768a4aa: SUCCESS

@reta reta mentioned this pull request Feb 10, 2024
19 tasks
@reta reta self-requested a review February 10, 2024 20:49
@github-actions github-actions bot added v2.13.0 Issues and PRs related to version 2.13.0 v3.0.0 Issues and PRs related to version 3.0.0 labels Feb 10, 2024
@reta reta merged commit 4dc5f49 into opensearch-project:main Feb 10, 2024
33 checks passed
@reta reta added the backport 2.x Backport to 2.x branch label Feb 10, 2024
@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:

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

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

@reta
Copy link
Collaborator

reta commented Feb 10, 2024

@mkhludnev sadly 2.x needs manual backport, could you please take it? thank you!

@mkhludnev
Copy link
Contributor Author

@mkhludnev sadly 2.x needs manual backport, could you please take it? thank you!

@reta here we go #12286

@mkhludnev mkhludnev deleted the OS3268-limit-nested-depth branch February 13, 2024 19:08
peteralfonsi pushed a commit to peteralfonsi/OpenSearch that referenced this pull request Mar 1, 2024
…pensearch-project#11670)

* Introduce index.query.max_nested_depth. fix opensearch-project#3268

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* min index.query.max_nested_depth=1

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* CHANGELOG.md

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* keep lines as they were

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

---------

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
Signed-off-by: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
Co-authored-by: Mikhail Khludnev <gedel@yandex.ru>
rayshrey pushed a commit to rayshrey/OpenSearch that referenced this pull request Mar 18, 2024
…pensearch-project#11670)

* Introduce index.query.max_nested_depth. fix opensearch-project#3268

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* min index.query.max_nested_depth=1

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* CHANGELOG.md

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* keep lines as they were

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

---------

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
Signed-off-by: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
Co-authored-by: Mikhail Khludnev <gedel@yandex.ru>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…pensearch-project#11670)

* Introduce index.query.max_nested_depth. fix opensearch-project#3268

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* min index.query.max_nested_depth=1

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* CHANGELOG.md

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

* keep lines as they were

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>

---------

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
Signed-off-by: Mikhail Khludnev <mkhludnev@users.noreply.github.com>
Co-authored-by: Mikhail Khludnev <gedel@yandex.ru>
Signed-off-by: Shivansh Arora <hishiv@amazon.com>
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 backport-failed enhancement Enhancement or improvement to existing feature or request good first issue Good for newcomers hacktoberfest Global event that encourages people to contribute to open-source. Search:Resiliency v2.13.0 Issues and PRs related to version 2.13.0 v3.0.0 Issues and PRs related to version 3.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Set a maximum depth for nested queries
4 participants