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 1.x] Transform maxclauses fix #482

Merged
merged 1 commit into from
Sep 1, 2022

Conversation

opensearch-trigger-bot[bot]
Copy link
Contributor

Backport 7475cfd from #477

* transform maxClauses fix

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added bucket log to track processed buckets

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* various renames/changes

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* fixed detekt issues

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added comments to test

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* removed debug logging

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* empty commit to trigger checks

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reduced pageSize to 1 in few ITs to avoid flaky tests; fixed bug where pagesProcessed was calculated incorrectly

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reverted pagesProcessed change; fixed few ITs

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit 7475cfd)
@opensearch-trigger-bot opensearch-trigger-bot bot requested a review from a team August 31, 2022 17:41
@Angie-Zhang Angie-Zhang merged commit b39bd64 into 1.x Sep 1, 2022
@github-actions github-actions bot deleted the backport/backport-477-to-1.x branch September 1, 2022 21:12
@opensearch-trigger-bot
Copy link
Contributor Author

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

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

Angie-Zhang pushed a commit to Angie-Zhang/index-management that referenced this pull request Sep 1, 2022
…#482)

* transform maxClauses fix

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added bucket log to track processed buckets

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* various renames/changes

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* fixed detekt issues

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added comments to test

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* removed debug logging

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* empty commit to trigger checks

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reduced pageSize to 1 in few ITs to avoid flaky tests; fixed bug where pagesProcessed was calculated incorrectly

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reverted pagesProcessed change; fixed few ITs

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit 7475cfd)

Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit b39bd64)
Angie-Zhang pushed a commit to Angie-Zhang/index-management that referenced this pull request Sep 1, 2022
…#482)

* transform maxClauses fix

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added bucket log to track processed buckets

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* various renames/changes

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* fixed detekt issues

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added comments to test

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* removed debug logging

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* empty commit to trigger checks

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reduced pageSize to 1 in few ITs to avoid flaky tests; fixed bug where pagesProcessed was calculated incorrectly

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reverted pagesProcessed change; fixed few ITs

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit 7475cfd)

Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit b39bd64)
bowenlan-amzn pushed a commit that referenced this pull request Oct 4, 2022
* Transform maxclauses fix (#477) (#482)

* transform maxClauses fix

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added bucket log to track processed buckets

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* various renames/changes

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* fixed detekt issues

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* added comments to test

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* removed debug logging

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* empty commit to trigger checks

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reduced pageSize to 1 in few ITs to avoid flaky tests; fixed bug where pagesProcessed was calculated incorrectly

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* reverted pagesProcessed change; fixed few ITs

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit 7475cfd)

Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit b39bd64)

* Update kotlin 1.6.10 to fix kotlin-stdlib-1.4.0 vulnerability

Signed-off-by: Angie Zhang <langelzh@amazon.com>

* Update kotlin 1.4.32 to fix kotlin-stdlib-1.4.0 vulnerability

Signed-off-by: Angie Zhang <langelzh@amazon.com>

Signed-off-by: Angie Zhang <langelzh@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
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.

3 participants