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

Enum value parsing: do not parse by whitespace #15493

Merged

Conversation

shlomi-noach
Copy link
Contributor

Description

Addressing #15492, this is an initial simple fix that allows whitespace in enum value. A more formal fix to follow, as this fix is incomplete in that it still requires more escaping.

A complete fix is likely to benefit from some sqlparser capabilities, though the use case goes beyond parsing CREATE TABLE statements and thus we might still take a lesser-than-yacc approach.

Related Issue(s)

#15492

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

@shlomi-noach shlomi-noach added Type: Bug Component: Online DDL Online DDL (vitess/native/gh-ost/pt-osc) labels Mar 14, 2024
@shlomi-noach shlomi-noach requested a review from a team March 14, 2024 17:36
Copy link
Contributor

vitess-bot bot commented Mar 14, 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 Mar 14, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone Mar 14, 2024
Copy link

codecov bot commented Mar 14, 2024

Codecov Report

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

Project coverage is 65.67%. Comparing base (696fe0e) to head (2b4a10c).
Report is 116 commits behind head on main.

Files Patch % Lines
go/vt/schema/parser.go 82.75% 5 Missing ⚠️
go/sqltypes/value.go 88.23% 4 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #15493      +/-   ##
==========================================
- Coverage   67.41%   65.67%   -1.75%     
==========================================
  Files        1560     1563       +3     
  Lines      192752   194476    +1724     
==========================================
- Hits       129952   127714    -2238     
- Misses      62800    66762    +3962     

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

@shlomi-noach shlomi-noach 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 Mar 14, 2024
@@ -122,7 +121,7 @@ func parseEnumOrSetTokens(enumOrSetValues string) (tokens []string) {
// input should not contain `enum(...)` column definition, just the comma delimited list
return tokens
}
tokens = textutil.SplitDelimitedList(enumOrSetValues)
tokens = strings.Split(enumOrSetValues, ",")
Copy link
Contributor

@mattlord mattlord Mar 14, 2024

Choose a reason for hiding this comment

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

Any reason(s) not to use the csv encoding packing in the stdlib? https://pkg.go.dev/encoding/csv

Copy link
Contributor

Choose a reason for hiding this comment

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

The main issue would be that quoting works differently there with " and not ' like in SQL. Also escaping of quotes is different, so we'd have to write something specific for this or leverage instead sqlparser as @shlomi-noach mentioned.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, I did notice that the csv encoder simply removes any commas in the values which surprised me. I do think that we should take this opportunity to address this more fully though as MySQL happily accepts enum string values with commas:

mysql> create table t1 (id int not null auto_increment primary key, ev enum('hi there', 'with, comma'));
Query OK, 0 rows affected (0.02 sec)

mysql> show create table t1;
+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| Table | Create Table                                                                                                                                                                                        |
+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| t1    | CREATE TABLE `t1` (
  `id` int NOT NULL AUTO_INCREMENT,
  `ev` enum('hi there','with, comma') DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci |
+-------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
1 row in set (0.01 sec)

Copy link
Contributor

Choose a reason for hiding this comment

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

Right, there's a bunch of things that still fail here. I agree we should fix this properly.

Copy link
Contributor

Choose a reason for hiding this comment

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

@shlomi-noach I pushed up a little specific parser for this in f90e797 that deals also with quotes inside the values as well.

I also added some low level test there with stuff like newlines, I think we should also add those to the end-to-end test too to try all the exotic things possible here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Realized my parser was not enough and also added a proper decoder for string values so we handle things line newlines correctly.

This handles cases like nested quotes etc. in the input.

Signed-off-by: Dirkjan Bussink <[email protected]>
Signed-off-by: Dirkjan Bussink <[email protected]>
@@ -333,35 +333,35 @@ func TestGetExpandedColumnNames(t *testing.T) {
"expand enum",
Column{
Type: EnumColumnType,
EnumValues: "'a', 'b'",
EnumValues: "'a','b'",
Copy link
Contributor

Choose a reason for hiding this comment

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

@shlomi-noach it looks like MySQL in neither information_schema.columns or when using SHOW CREATE TABLE includes a space after the ,. The new parser doesn't accept that, do you know if we depend anywhere outside of tests on allowing that space?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nothing depends on existence of spaces. Part of the fix here is to actually assume they never exist, as you say.

Copy link
Contributor Author

@shlomi-noach shlomi-noach left a comment

Choose a reason for hiding this comment

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

Additional changes in BufDecodeStringSQL and parseEnumOrSetTokens look good to me.

@shlomi-noach shlomi-noach merged commit 51debbd into vitessio:main Mar 17, 2024
102 checks passed
@shlomi-noach shlomi-noach deleted the onlineddl-enum-with-whitespace branch March 17, 2024 10:37
@shlomi-noach
Copy link
Contributor Author

Proposed followup in #17133

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Component: Online DDL Online DDL (vitess/native/gh-ost/pt-osc) Type: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants