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

Use proper keyspace when updating the query graph of a reference DML #17226

Merged
merged 2 commits into from
Nov 19, 2024

Conversation

frouioui
Copy link
Member

Description

This PR fixes a regression introduced by #15107, when a user is using (use ks) a sharded keyspace that has a reference table with its source in an unsharded keyspace, the query planner would not set the target keyspace correctly when rewriting the query graph, leading to the following plan:

        {
          "QueryType": "UPDATE",
          "Original": "update ambiguous_ref_with_source set done = true where id = 1;",
          "Instructions": {
            "OperatorType": "Update",
            "Variant": "Reference",
            "Keyspace": {
              "Name": "user",
              "Sharded": true
            },
            "TargetTabletType": "PRIMARY",
            "Query": "update ambiguous_ref_with_source set done = true where id = 1",
            "Table": "ambiguous_ref_with_source"
          },
          "TablesUsed": [
            "main.ambiguous_ref_with_source",
            "user.ambiguous_ref_with_source"
          ]
        }

This plan ultimately leads to a failure in the engine as we cannot execute updates with a reference OpCode:

switch upd.Opcode {
case Unsharded:
return upd.execUnsharded(ctx, upd, vcursor, bindVars, rss)
case Equal, EqualUnique, IN, Scatter, ByDestination, SubShard, MultiEqual:
return upd.execMultiDestination(ctx, upd, vcursor, bindVars, rss, upd.updateVindexEntries, bvs)
default:
// Unreachable.
return nil, fmt.Errorf("unsupported opcode: %v", upd.Opcode)
}

This PR makes sure we are setting the target keyspace correctly.

Must be backported to 20 and 21.

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Copy link
Contributor

vitess-bot bot commented Nov 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 Nov 14, 2024
@frouioui frouioui added Backport to: release-20.0 Needs to be backport to release-20.0 Backport to: release-21.0 Needs to be backport to release-21.0 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 Nov 14, 2024
@github-actions github-actions bot added this to the v22.0.0 milestone Nov 14, 2024
Copy link

codecov bot commented Nov 14, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.39%. Comparing base (f6067e0) to head (30dae54).
Report is 6 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #17226      +/-   ##
==========================================
- Coverage   67.40%   67.39%   -0.02%     
==========================================
  Files        1570     1570              
  Lines      252903   252934      +31     
==========================================
- Hits       170460   170454       -6     
- Misses      82443    82480      +37     

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


🚨 Try these New Features:

@systay
Copy link
Collaborator

systay commented Nov 14, 2024

We should add an end-to-end test that asserts that this works well

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
@frouioui
Copy link
Member Author

We should add an end-to-end test that asserts that this works well

Added via 30dae54

@frouioui frouioui merged commit ea600c3 into vitessio:main Nov 19, 2024
99 checks passed
@frouioui frouioui deleted the fix-dml-reference-tables branch November 19, 2024 18:54
vitess-bot pushed a commit that referenced this pull request Nov 19, 2024
…17226)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
vitess-bot pushed a commit that referenced this pull request Nov 19, 2024
…17226)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
frouioui added a commit that referenced this pull request Nov 19, 2024
… reference DML (#17226) (#17258)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Signed-off-by: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
frouioui added a commit that referenced this pull request Nov 19, 2024
… reference DML (#17226) (#17257)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Signed-off-by: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
Co-authored-by: vitess-bot[bot] <108069721+vitess-bot[bot]@users.noreply.github.com>
Co-authored-by: Florent Poinsard <35779988+frouioui@users.noreply.github.com>
Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
rvrangel pushed a commit to rvrangel/vitess that referenced this pull request Nov 21, 2024
…itessio#17226)

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>
Signed-off-by: Renan Rangel <rrangel@slack-corp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Backport to: release-20.0 Needs to be backport to release-20.0 Backport to: release-21.0 Needs to be backport to release-21.0 Component: Query Serving Type: Bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants