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.

Sign up for GitHub

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

Jump to bottom

[release-16.0] Make column resolution closer to MySQL (#14426) #14428

Merged
merged 2 commits into from
Nov 10, 2023
Merged

[release-16.0] Make column resolution closer to MySQL (#14426) #14428

merged 2 commits into from
Nov 10, 2023

Conversation

vitess-bot[bot]
Copy link
Contributor

@vitess-bot vitess-bot bot commented Nov 2, 2023

Description

This is a backport of #14426

@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 Nov 2, 2023
@vitess-bot vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Nov 2, 2023

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.

@vitess-bot vitess-bot
Copy link
Contributor Author

vitess-bot bot commented Nov 2, 2023

Hello @systay, 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 14428 -R vitessio/vitess
git reset --hard origin/release-16.0
git cherry-pick -m 1 806f77754a09a617f74c9087b2aada15e25748ca

@vitess-bot vitess-bot bot added NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsIssue A linked issue is missing for this Pull Request NeedsWebsiteDocsUpdate What it says labels Nov 2, 2023
@github-actions github-actions bot added this to the v16.0.6 milestone Nov 2, 2023
@systay systay force-pushed the backport-14426-to-release-16.0 branch from f139e76 to 544c567 Compare November 6, 2023 07:28
@systay systay removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says Skip CI Skip CI actions from running NeedsIssue A linked issue is missing for this Pull Request Merge Conflict labels Nov 6, 2023
@systay systay marked this pull request as ready for review November 6, 2023 07:30
@systay systay force-pushed the backport-14426-to-release-16.0 branch from 03f137f to f279dfa Compare November 6, 2023 07:33
@timvaillancourt timvaillancourt mentioned this pull request Nov 7, 2023
Merged
4 tasks
timvaillancourt added a commit to slackhq/vitess that referenced this pull request Nov 9, 2023
@timvaillancourt @systay
slack-vitess-r14.0.5: backport vitessio#14428 from v16 (#165)
58b2ed2 
* make column resolution closer to mysql

Signed-off-by: Andres Taylor <[email protected]>

* Fix bad merge conflict fix

Signed-off-by: Tim Vaillancourt <[email protected]>

* Possible horizon_planning.go fix

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix aggr_cases.json plan

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix group by order

Signed-off-by: Tim Vaillancourt <[email protected]>

* Remove 'TablesUsed', not in v14

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
@timvaillancourt timvaillancourt mentioned this pull request Nov 9, 2023
Merged
4 tasks
@deepthi deepthi merged commit 8ad1076 into release-16.0 Nov 10, 2023
220 of 221 checks passed
@deepthi deepthi deleted the backport-14426-to-release-16.0 branch November 10, 2023 22:18
timvaillancourt added a commit to slackhq/vitess that referenced this pull request Nov 12, 2023
@timvaillancourt @systay
slack-vitess-r14.0.5: backport vitessio#14428 from v16 (#165)
0d1c5cc 
* make column resolution closer to mysql

Signed-off-by: Andres Taylor <[email protected]>

* Fix bad merge conflict fix

Signed-off-by: Tim Vaillancourt <[email protected]>

* Possible horizon_planning.go fix

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix aggr_cases.json plan

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix group by order

Signed-off-by: Tim Vaillancourt <[email protected]>

* Remove 'TablesUsed', not in v14

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
@timvaillancourt timvaillancourt mentioned this pull request Nov 12, 2023
Merged
4 tasks
timvaillancourt added a commit to slackhq/vitess that referenced this pull request Nov 13, 2023
@timvaillancourt @systay
slack-vitess-r15.0.5: backport vitessio#14428 from v16 (#166)
517fad7 
* make column resolution closer to mysql

Signed-off-by: Andres Taylor <[email protected]>

* Fix auto-merge-conflict resolution problem

Signed-off-by: Tim Vaillancourt <[email protected]>

* Update expected plan in aggr_cases.json

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
timvaillancourt added a commit to slackhq/vitess that referenced this pull request Nov 13, 2023
@timvaillancourt @systay
slack-vitess-r14.0.5-dsdefense: backport vitessio#14428 from v16 (#165
0b488db 
) (#167)

* `slack-vitess-r14.0.5`: backport vitessio#14428 from v16 (#165)

* make column resolution closer to mysql

Signed-off-by: Andres Taylor <[email protected]>

* Fix bad merge conflict fix

Signed-off-by: Tim Vaillancourt <[email protected]>

* Possible horizon_planning.go fix

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix aggr_cases.json plan

Signed-off-by: Tim Vaillancourt <[email protected]>

* Fix group by order

Signed-off-by: Tim Vaillancourt <[email protected]>

* Remove 'TablesUsed', not in v14

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>

* Update e2e vttablet.txt

Signed-off-by: Tim Vaillancourt <[email protected]>

* Update e2e vtgate.txt

Signed-off-by: Tim Vaillancourt <[email protected]>

---------

Signed-off-by: Andres Taylor <[email protected]>
Signed-off-by: Tim Vaillancourt <[email protected]>
Co-authored-by: Andres Taylor <[email protected]>
@hmaurer hmaurer mentioned this pull request Mar 21, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@systay systay systay approved these changes

@harshit-gangal harshit-gangal harshit-gangal approved these changes

@arthurschreiber arthurschreiber Awaiting requested review from arthurschreiber arthurschreiber is a code owner

@frouioui frouioui Awaiting requested review from frouioui frouioui is a code owner

@GuptaManan100 GuptaManan100 Awaiting requested review from GuptaManan100 GuptaManan100 is a code owner

Assignees
No one assigned
Labels
Backport This is a backport Component: Query Serving Type: Bug
Projects
None yet
Milestone
v16.0.6
Development

Successfully merging this pull request may close these issues.
3 participants
@systay @harshit-gangal @deepthi