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

schemadiff: assume default collation for textual column when collation is undefined #16000

Merged
merged 4 commits into from
May 25, 2024

Conversation

shlomi-noach
Copy link
Contributor

Description

Fixes #15999. When looking at textual columns, if the character set is defined and the collation is not, schemadiff assumes the default collation for that character set.

Related Issue(s)

#15999

cc @lizztheblizz

Checklist

  • "Backport to:" labels have been added if this change should be back-ported to release branches
  • If this change is to be back-ported to previous releases, a justification is included in the PR description
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on CI?
  • Documentation was added or is not required

Deployment Notes

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach shlomi-noach requested a review from a team May 23, 2024 04:51
Copy link
Contributor

vitess-bot bot commented May 23, 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.

@vitess-bot vitess-bot bot added NeedsBackportReason If backport labels have been applied to a PR, a justification is required 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 May 23, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone May 23, 2024
@shlomi-noach shlomi-noach added Type: Bug Component: Query Serving and removed NeedsDescriptionUpdate The description is not clear or comprehensive enough, and needs work NeedsWebsiteDocsUpdate What it says NeedsIssue A linked issue is missing for this Pull Request NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels May 23, 2024
…ation

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
Copy link

codecov bot commented May 23, 2024

Codecov Report

Attention: Patch coverage is 87.50000% with 2 lines in your changes are missing coverage. Please review.

Project coverage is 68.25%. Comparing base (3b09eb2) to head (58983d3).
Report is 12 commits behind head on main.

Files Patch % Lines
go/vt/schemadiff/column.go 87.50% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #16000      +/-   ##
==========================================
- Coverage   68.47%   68.25%   -0.23%     
==========================================
  Files        1562     1562              
  Lines      197083   197206     +123     
==========================================
- Hits       134962   134598     -364     
- Misses      62121    62608     +487     

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

@@ -104,7 +104,17 @@ func (c *ColumnDefinitionEntity) ColumnDiff(
) (*ModifyColumnDiff, error) {
if c.IsTextual() || other.IsTextual() {
// We will now denormalize the columns charset & collate as needed (if empty, populate from table.)

// This column definition
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this the full comment? 🙂 I'm assuming it should be ~

// This column definition is using the implied / default collation for the character set
// so we need to determine the default/actual collation used for the specified character set
// based on the MySQL version being used. 

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've updated this and other comments.

@@ -137,6 +147,17 @@ func (c *ColumnDefinitionEntity) ColumnDiff(
c.columnDefinition.Type.Options.Collate = env.CollationEnv().LookupName(collation)
}
}
// other column definition
Copy link
Contributor

@mattlord mattlord May 23, 2024

Choose a reason for hiding this comment

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

Ah, I see. So "this" and "other" are the two things being diffed. The other related comments are still worthwhile though IMO.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've updated this and other comments.

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
@shlomi-noach shlomi-noach merged commit 248014e into vitessio:main May 25, 2024
93 checks passed
@shlomi-noach shlomi-noach deleted the schemadiff-implicit-charset branch May 25, 2024 07:14
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.

Bug Report: schemadiff shows bogus diff on textual column where collation is undefined
3 participants