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

fix: insert on duplicate key update missing BindVars #14728

Merged
merged 5 commits into from
Dec 12, 2023
Merged

fix: insert on duplicate key update missing BindVars #14728

merged 5 commits into from
Dec 12, 2023

Conversation

wlx5575
Copy link
Contributor

@wlx5575 wlx5575 commented Dec 8, 2023 •
edited by harshit-gangal
Loading

Description

"In V18, the addition of trimming bound variables during insert needs to be included for each shard in this pull request: #14064. However, the scenario of 'insert on duplicate key' has been overlooked, and the bound variables added are not included for 'on duplicate key' variables."

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

@vitess-bot vitess-bot
Copy link
Contributor

vitess-bot bot commented Dec 8, 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 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 Dec 8, 2023
@github-actions github-actions bot added this to the v19.0.0 milestone Dec 8, 2023
@wlx5575 wlx5575 mentioned this pull request Dec 8, 2023
Closed
@wlx5575 wlx5575 force-pushed the insert_fix branch 2 times, most recently from 0e97fa3 to c7ee6cf Compare December 8, 2023 06:57
wlx5575 added 2 commits December 8, 2023 15:10
delete useless information
474b498 
Signed-off-by: wlx5575 <[email protected]>
fix test case
48ce541 
Signed-off-by: wlx5575 <[email protected]>
@harshit-gangal harshit-gangal added Type: Bug Component: Query Serving Type: Regression 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 labels Dec 11, 2023
@harshit-gangal
Copy link
Member

@wlx5575 you need to run make sizegen and push it

make sizegen
b5ac0ff 
Signed-off-by: wlx5575 <[email protected]>
@wlx5575
Copy link
Contributor Author

wlx5575 commented Dec 11, 2023

@wlx5575 you need to run make sizegen and push it

done

@harshit-gangal
Copy link
Member

Thank you @wlx5575 for your contribution and finding and fixing the bug ❤️

frouioui
frouioui reviewed Dec 12, 2023
View reviewed changes
go/test/endtoend/vtgate/misc_test.go
utils.Exec(t, conn, "insert into t11(id, sharding_key, col1, col2, col3) values(1, 2, 'a', 1, 2)")
utils.Exec(t, conn, "insert into t11(id, sharding_key, col1, col2, col3) values(1, 2, 'a', 1, 2) on duplicate key update id=10;")
utils.AssertMatches(t, conn, "select id, sharding_key from t11 where id=10", "[[INT64(10) INT64(2)]]")

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change

@harshit-gangal harshit-gangal mentioned this pull request Dec 12, 2023
Open
24 tasks
@frouioui frouioui merged commit 56aba1f into vitessio:main Dec 12, 2023
116 checks passed
@vitess-bot vitess-bot bot mentioned this pull request Dec 12, 2023
Merged
harshit-gangal pushed a commit that referenced this pull request Dec 12, 2023
@wlx5575 @harshit-gangal
fix: insert on duplicate key update missing BindVars (#14728)
7396b80 
Co-authored-by: wlx5575 <[email protected]>
Signed-off-by: Harshit Gangal <[email protected]>
harshit-gangal added a commit that referenced this pull request Dec 12, 2023
@vitess-bot @wlx5575 @harshit-gangal
[release-18.0] fix: insert on duplicate key update missing BindVars (#…
70846ec 
…14728) (#14755)

Signed-off-by: Harshit Gangal <[email protected]>
Co-authored-by: wlx5575 <[email protected]>
Co-authored-by: wlx5575 <[email protected]>
Co-authored-by: Harshit Gangal <[email protected]>
ejortegau pushed a commit to slackhq/vitess that referenced this pull request Dec 13, 2023
@wlx5575 @ejortegau
fix: insert on duplicate key update missing BindVars (vitessio#14728)
8dc7600 
Co-authored-by: wlx5575 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frouioui frouioui frouioui approved these changes

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

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

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

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

Assignees
No one assigned
Labels
Component: Query Serving Type: Bug Type: Regression
Projects
None yet
Milestone
v19.0.0
Development

Successfully merging this pull request may close these issues.

Bug Report: insert on duplicate key update missing BindVars
3 participants
@wlx5575 @harshit-gangal @frouioui