Skip to content

Bring Search Pipeline Update and Add IgnoreFailure and PipelineContext To Each Processors - #152

Merged
mingshl merged 2 commits into
opensearch-project:mainfrom
mingshl:add-ignoreFailure-and-pipelineContext
Jul 11, 2023
Merged

Bring Search Pipeline Update and Add IgnoreFailure and PipelineContext To Each Processors#152
mingshl merged 2 commits into
opensearch-project:mainfrom
mingshl:add-ignoreFailure-and-pipelineContext

Conversation

@mingshl

@mingshl mingshl commented Jul 11, 2023

Copy link
Copy Markdown
Collaborator

Description

Add ignoreFailure and pipelineContext

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed as per the DCO using --signoff

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.

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
@mingshl
mingshl force-pushed the add-ignoreFailure-and-pipelineContext branch from 97b1a09 to c694adb Compare July 11, 2023 19:19
@codecov

codecov Bot commented Jul 11, 2023

Copy link
Copy Markdown

Codecov Report

Merging #152 (de43e91) into main (25d3e08) will not change coverage.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               main     #152   +/-   ##
=========================================
  Coverage     83.41%   83.41%           
  Complexity      324      324           
=========================================
  Files            41       41           
  Lines          1242     1242           
  Branches        152      152           
=========================================
  Hits           1036     1036           
  Misses          130      130           
  Partials         76       76           
Impacted Files Coverage Δ
...search/search/relevance/SearchRelevancePlugin.java 0.00% <ø> (ø)
...ch/relevance/configuration/ConfigurationUtils.java 66.66% <ø> (ø)
...nking/pipeline/KendraRankingResponseProcessor.java 89.79% <100.00%> (ø)
...ntranking/PersonalizeRankingResponseProcessor.java 100.00% <100.00%> (ø)

@mingshl
mingshl marked this pull request as ready for review July 11, 2023 20:05
@mingshl
mingshl requested a review from kulket July 11, 2023 20:05
@mingshl mingshl self-assigned this Jul 11, 2023
@mingshl mingshl added backport 2.x Backport to 2.x branch v2.9.0 labels Jul 11, 2023

@sejli sejli left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just some nitpicks. I'm not sure if we have a linter on this repo, but we should consider using one to match some of the spacings (some parameters have spaces between comments and some don't, not sure what convention to stick to).

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
@mingshl

mingshl commented Jul 11, 2023

Copy link
Copy Markdown
Collaborator Author

LGTM, just some nitpicks. I'm not sure if we have a linter on this repo, but we should consider using one to match some of the spacings (some parameters have spaces between comments and some don't, not sure what convention to stick to).

Good idea, I checked all the ./gradlew task but there is none for formatter. We should create an issue to bring in ./gradlew spotlessApply so it helps to organize the format before every PR merged in

@mingshl
mingshl merged commit c15274e into opensearch-project:main Jul 11, 2023
@opensearch-trigger-bot

Copy link
Copy Markdown

The backport to 2.x failed:

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

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

mingshl added a commit to mingshl/search-processor that referenced this pull request Jul 12, 2023
* Add ignoreFailure and pipelineContext

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

* use lowercase

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

---------

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit c15274e)
mingshl added a commit to mingshl/search-processor that referenced this pull request Jul 12, 2023
* Add ignoreFailure and pipelineContext

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

* use lowercase

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

---------

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit c15274e)
mingshl added a commit to mingshl/search-processor that referenced this pull request Jul 12, 2023
* Add ignoreFailure and pipelineContext

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

* use lowercase

Signed-off-by: Mingshi Liu <mingshl@amazon.com>

---------

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
(cherry picked from commit c15274e)
Signed-off-by: Mingshi Liu <mingshl@amazon.com>
mingshl added a commit that referenced this pull request Jul 12, 2023
* Add ignoreFailure and pipelineContext
* use lowercase

---------


(cherry picked from commit c15274e)

Signed-off-by: Mingshi Liu <mingshl@amazon.com>
@mingshl mingshl changed the title Add ignoreFailure and pipelineContext Bring Search Pipeline Update and Add IgnoreFailure and PipelineContext To Each Processors Jul 12, 2023
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 v2.9.0

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

3 participants