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

Support allow_duplicates on append processor #5208

Merged
merged 2 commits into from
Jan 7, 2021

Conversation

stevejgordon
Copy link
Contributor

Related to elastic/elasticsearch#61916
Contributes to #5198

Copy link
Member

@Mpdreamz Mpdreamz left a comment

Choose a reason for hiding this comment

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

I think its okay to simplify the Append cases to only run on 7.11.0 or include a AppendWithAllowDuplicates additional test class.

Easier to track then dynamically built json.

Also failing on the following CodeStandards tests:

Tests.CodeStandards.Descriptors.DescriptorMethodsTakingSingleValueTypeShouldBeNullable [FAIL]
  Failed Tests.CodeStandards.Descriptors.DescriptorMethodsTakingSingleValueTypeShouldBeNullable [166 ms]
  Error Message:
   Expected breakingDescriptors to be empty, but found {"allowDuplicates on method AllowDuplicates of Nest.AppendProcessorDescriptor`1 is not nullable"}.
  Stack Trace:

Descriptors taking value types should be nullable so that they be effectively reset.

tests/Tests/Ingest/ProcessorAssertions.cs Outdated Show resolved Hide resolved
- Fix failing test
- Amend test
@stevejgordon
Copy link
Contributor Author

@Mpdreamz Ready for a re-review please

Copy link
Member

@Mpdreamz Mpdreamz left a comment

Choose a reason for hiding this comment

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

LGTM !

@stevejgordon stevejgordon merged commit 2b75c5e into 7.11 Jan 7, 2021
@stevejgordon stevejgordon deleted the feature/append-processor/allow-dupes branch January 7, 2021 10:56
github-actions bot pushed a commit that referenced this pull request Jan 7, 2021
* Support allow_duplicates on append processor

Related to elastic/elasticsearch#61916
@github-actions
Copy link
Contributor

github-actions bot commented Jan 7, 2021

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

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

stevejgordon added a commit that referenced this pull request Jan 7, 2021
* Support allow_duplicates on append processor

Related to elastic/elasticsearch#61916

(cherry picked from commit 2b75c5e)
stevejgordon added a commit that referenced this pull request Jan 7, 2021
* Support allow_duplicates on append processor

Related to elastic/elasticsearch#61916

Co-authored-by: Steve Gordon <[email protected]>
stevejgordon added a commit that referenced this pull request Jan 7, 2021
* Support allow_duplicates on append processor

Related to elastic/elasticsearch#61916

(cherry picked from commit 2b75c5e)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants