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

[release-19.0] engine: fix race in concatenate (#15454) #15461

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Mar 12, 2024

Description

This is a backport of #15454

@vitess-bot vitess-bot bot added Backport This is a backport Component: Query Serving Merge Conflict Skip CI Skip CI actions from running Type: Bug labels Mar 12, 2024
Copy link
Contributor Author

vitess-bot bot commented Mar 12, 2024

Hello @vmg, there are conflicts in this backport.

Please address them in order to merge this Pull Request. You can execute the snippet below to reset your branch and resolve the conflict manually.

Make sure you replace origin by the name of the vitessio/vitess remote

git fetch --all
gh pr checkout 15461 -R vitessio/vitess
git reset --hard origin/release-19.0
git cherry-pick -m 1 ad7bdd9380c3e58a3ced6d653f855914501d57af

@vitess-bot vitess-bot bot requested review from frouioui, harshit-gangal and vmg March 12, 2024 12:01
Copy link
Contributor Author

vitess-bot bot commented Mar 12, 2024

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • Ensure there is a link to an issue (except for internal cleanup and flaky test fixes), new features should have an RFC that documents use cases and test cases.

Tests

  • Bug fixes should have at least one unit or end-to-end test, enhancement and new features should have a sufficient number of tests.

Documentation

  • Apply the release notes (needs details) label if users need to know about this change.
  • New features should be documented.
  • There should be some code comments as to why things are implemented the way they are.
  • There should be a comment at the top of each new or modified test to explain what the test does.

New flags

  • Is this flag really necessary?
  • Flag names must be clear and intuitive, use dashes (-), and have a clear help text.

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow needs to be marked as required, the maintainer team must be notified.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from vitess-operator and arewefastyet, if used there.
  • vtctl command output order should be stable and awk-able.

@github-actions github-actions bot added this to the v19.0.1 milestone Mar 12, 2024
@dbussink dbussink force-pushed the backport-15454-to-release-19.0 branch 2 times, most recently from 956c2b3 to dc981ec Compare March 12, 2024 16:18
Copy link

codecov bot commented Mar 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.45%. Comparing base (06b843c) to head (5b58b71).

Additional details and impacted files
@@               Coverage Diff                @@
##           release-19.0   #15461      +/-   ##
================================================
+ Coverage         67.42%   67.45%   +0.02%     
================================================
  Files              1560     1560              
  Lines            192642   192641       -1     
================================================
+ Hits             129886   129940      +54     
+ Misses            62756    62701      -55     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@dbussink dbussink removed Skip CI Skip CI actions from running Merge Conflict labels Mar 13, 2024
Signed-off-by: Dirkjan Bussink <[email protected]>
@dbussink dbussink force-pushed the backport-15454-to-release-19.0 branch from dc981ec to 5b58b71 Compare March 13, 2024 08:28
@dbussink dbussink marked this pull request as ready for review March 13, 2024 08:28
@systay systay merged commit da6f346 into release-19.0 Mar 13, 2024
199 checks passed
@systay systay deleted the backport-15454-to-release-19.0 branch March 13, 2024 09:17
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