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

Fix regression where inserts into reference tables with a different name on sharded keyspaces were not routed correctly. #15796

Merged

Conversation

rohit-nayak-ps
Copy link
Contributor

@rohit-nayak-ps rohit-nayak-ps commented Apr 25, 2024

Description

Inserts for reference tables where the name of the sharded table was different and the insert statement used the sharded table as the table to insert into, were failing because they were not being routed correctly. However delete and update queries are being handled correctly.

This PR adds the logic present in delete/update to insert. Additionally unit tests and an e2e test has been added to validate the rerouting and protect against regression.

Note: since there has been significant refactors in the vtgate planner between v18 and the current main, this PR will be backported to v19 but a separate PR (#15788) will fix the issue on v18.

Related Issue(s)

#15770

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

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
… already logic for updates/deletes

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Copy link
Contributor

vitess-bot bot commented Apr 25, 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 Apr 25, 2024
@rohit-nayak-ps rohit-nayak-ps 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 NeedsBackportReason If backport labels have been applied to a PR, a justification is required labels Apr 25, 2024
@github-actions github-actions bot added this to the v20.0.0 milestone Apr 25, 2024
Copy link

codecov bot commented Apr 25, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.43%. Comparing base (1de3daa) to head (18ef23e).
Report is 24 commits behind head on main.

❗ Current head 18ef23e differs from pull request most recent head a7e2c2f. Consider uploading reports for the commit a7e2c2f to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #15796      +/-   ##
==========================================
- Coverage   68.45%   68.43%   -0.03%     
==========================================
  Files        1558     1559       +1     
  Lines      195928   196498     +570     
==========================================
+ Hits       134128   134476     +348     
- Misses      61800    62022     +222     

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

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Comment on lines 110 to 112
vTbl, routing := buildVindexTableForDML(ctx, tableInfo, qt, "insert")

if tableInfo.GetVindexTable().Type == vindexes.TypeReference {
Copy link
Member

Choose a reason for hiding this comment

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

The reference table source should be changed inside otherwise the vindex table and routing will be pointing to reference table and not the source

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated code as per our discussion.

@systay systay mentioned this pull request Apr 29, 2024
25 tasks
Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Copy link
Member

@GuptaManan100 GuptaManan100 left a comment

Choose a reason for hiding this comment

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

Rest LGTM!

sourceTable, _, _, _, _, err := ctx.VSchema.FindTableOrVindex(vindexTable.Source.TableName)
if err != nil {
panic(err)
}
vindexTable = sourceTable
refTbl := sqlparser.NewAliasedTableExpr(vindexTable.GetTableName(), "")
ins.Table.Expr = refTbl.Expr
// We don't need to process the alias because you cannot define aliases for inserts.
Copy link
Member

Choose a reason for hiding this comment

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

What does this mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

inserts take a table name where as other dmls take a table_reference (where you can specify aliases).

INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
    [INTO] tbl_name
    [PARTITION (partition_name [, partition_name] ...)]
    [(col_name [, col_name] ...)]
    { {VALUES | VALUE} (value_list) [, (value_list)] ... }
    [AS row_alias[(col_alias [, col_alias] ...)]]
    [ON DUPLICATE KEY UPDATE assignment_list]
UPDATE [LOW_PRIORITY] [IGNORE] table_reference
    SET assignment_list
    [WHERE where_condition]
    [ORDER BY ...]
    [LIMIT row_count]

table_references:
    escaped_table_reference [, escaped_table_reference] ...

escaped_table_reference: {
    table_reference
  | { OJ table_reference }
}

table_reference: {
    table_factor
  | joined_table
}

table_factor: {
    tbl_name [PARTITION (partition_names)]
        [[AS] alias] [index_hint_list]
  | [LATERAL] table_subquery [AS] alias [(col_list)]
  | ( table_references )
}

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
@harshit-gangal harshit-gangal merged commit dee6d81 into vitessio:main May 7, 2024
90 of 91 checks passed
@harshit-gangal harshit-gangal deleted the rohit/reference-with-alias-v20 branch May 7, 2024 13:02
vitess-bot pushed a commit that referenced this pull request May 7, 2024
…ame on sharded keyspaces were not routed correctly. (#15796)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
rohit-nayak-ps added a commit that referenced this pull request May 8, 2024
…h a different name on sharded keyspaces were not routed correctly. (#15796) (#15860)

Signed-off-by: Rohit Nayak <rohit@planetscale.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Rohit Nayak <rohit@planetscale.com>
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.

4 participants