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

[Backport 2.x][Search Pipelines] Add default_search_pipeline index setting (#7470) #7589

Merged
merged 3 commits into from
May 17, 2023

Conversation

msfroh
Copy link
Collaborator

@msfroh msfroh commented May 16, 2023

  • [Search Pipelines] Add default_search_pipeline index setting

Once users have defined and tested a search pipeline, they may want to apply it by default to all queries hitting a given index.

Users should be able to bypass the default pipeline for the index by explicitly specifying search_pipeline=_none in the URL parameter of their search request.

Signed-off-by: Michael Froh [email protected]

  • Rename default search pipeline setting and add getter/setter

Also change version check for ad hoc pipeline to 2.8

Signed-off-by: Michael Froh [email protected]

  • Add tests for new IndexSettings methods

Signed-off-by: Michael Froh [email protected]

  • Update test to reflect change to FeatureFlagSetter

Signed-off-by: Michael Froh [email protected]


Signed-off-by: Michael Froh [email protected]
(cherry picked from commit 5984735)

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.

…rch-project#7470)

* [Search Pipelines] Add default_search_pipeline index setting

Once users have defined and tested a search pipeline, they may want to
apply it by default to all queries hitting a given index.

Users should be able to bypass the default pipeline for the index by
explicitly specifying `search_pipeline=_none` in the URL parameter of
their search request.

Signed-off-by: Michael Froh <[email protected]>

* Rename default search pipeline setting and add getter/setter

Also change version check for ad hoc pipeline to 2.8

Signed-off-by: Michael Froh <[email protected]>

* Add tests for new IndexSettings methods

Signed-off-by: Michael Froh <[email protected]>

* Update test to reflect change to FeatureFlagSetter

Signed-off-by: Michael Froh <[email protected]>

---------

Signed-off-by: Michael Froh <[email protected]>
(cherry picked from commit 5984735)
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented May 17, 2023

Codecov Report

Merging #7589 (b2e812c) into 2.x (1dbdf76) will decrease coverage by 0.13%.
The diff coverage is 91.30%.

@@             Coverage Diff              @@
##                2.x    #7589      +/-   ##
============================================
- Coverage     70.31%   70.19%   -0.13%     
+ Complexity    59937    59934       -3     
============================================
  Files          4882     4882              
  Lines        288376   288393      +17     
  Branches      41920    41924       +4     
============================================
- Hits         202777   202437     -340     
- Misses        68613    68968     +355     
- Partials      16986    16988       +2     
Impacted Files Coverage Δ
...pensearch/common/settings/IndexScopedSettings.java 100.00% <ø> (ø)
...nsearch/search/pipeline/SearchPipelineService.java 82.81% <85.71%> (-0.34%) ⬇️
.../main/java/org/opensearch/index/IndexSettings.java 85.78% <100.00%> (+0.33%) ⬆️

... and 485 files with indirect coverage changes

I previously misunderstood the syntax for skipping tests by version.
Thanks @reta for catching this!

Signed-off-by: Michael Froh <[email protected]>
@msfroh msfroh force-pushed the backport/backport-7470-to-2.x branch from 750cdfd to b2e812c Compare May 17, 2023 17:48
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

  • RESULT: UNSTABLE ❕
  • TEST FAILURES:
      3 org.opensearch.search.SearchWeightedRoutingIT.testStrictWeightedRoutingWithCustomString

msfroh added a commit to msfroh/OpenSearch that referenced this pull request May 17, 2023
As @reta pointed out, these tests should be skipped for versions less
than 2.7.0, but the skip version ranges are inclusive. So, the upper
bound of the range should be 2.6.99.

This brings a change made for
opensearch-project#7589 onto the main
branch.

ssssss-off-by: Michael Froh <[email protected]>
@reta reta merged commit ecd4411 into opensearch-project:2.x May 17, 2023
msfroh added a commit to msfroh/OpenSearch that referenced this pull request May 17, 2023
As @reta pointed out, these tests should be skipped for versions less
than 2.7.0, but the skip version ranges are inclusive. So, the upper
bound of the range should be 2.6.99.

This brings a change made for
opensearch-project#7589 onto the main
branch.

Signed-off-by: Michael Froh <[email protected]>
@msfroh msfroh deleted the backport/backport-7470-to-2.x branch May 17, 2023 23:51
reta pushed a commit that referenced this pull request May 18, 2023
As @reta pointed out, these tests should be skipped for versions less
than 2.7.0, but the skip version ranges are inclusive. So, the upper
bound of the range should be 2.6.99.

This brings a change made for
#7589 onto the main
branch.

Signed-off-by: Michael Froh <[email protected]>
bharath-techie pushed a commit to bharath-techie/OpenSearch that referenced this pull request May 23, 2023
…7618)

As @reta pointed out, these tests should be skipped for versions less
than 2.7.0, but the skip version ranges are inclusive. So, the upper
bound of the range should be 2.6.99.

This brings a change made for
opensearch-project#7589 onto the main
branch.

Signed-off-by: Michael Froh <[email protected]>
Signed-off-by: Bharathwaj G <[email protected]>
stephen-crawford pushed a commit to stephen-crawford/OpenSearch that referenced this pull request May 31, 2023
…7618)

As @reta pointed out, these tests should be skipped for versions less
than 2.7.0, but the skip version ranges are inclusive. So, the upper
bound of the range should be 2.6.99.

This brings a change made for
opensearch-project#7589 onto the main
branch.

Signed-off-by: Michael Froh <[email protected]>
shiv0408 pushed a commit to Gaurav614/OpenSearch that referenced this pull request Apr 25, 2024
…7618)

As @reta pointed out, these tests should be skipped for versions less
than 2.7.0, but the skip version ranges are inclusive. So, the upper
bound of the range should be 2.6.99.

This brings a change made for
opensearch-project#7589 onto the main
branch.

Signed-off-by: Michael Froh <[email protected]>
Signed-off-by: Shivansh Arora <[email protected]>
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.

2 participants