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

[release-20.0] Use proper keyspace when updating the query graph of a reference DML (#17226) #17257

Merged
merged 3 commits into from
Nov 19, 2024
Merged

[release-20.0] Use proper keyspace when updating the query graph of a reference DML (#17226) #17257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1122401
Use proper keyspace when updating the query graph of a reference DML …
vitess-bot[bot] Nov 19, 2024
a1d1fea
Update go/test/endtoend/vtgate/queries/reference/reference_test.go
frouioui Nov 19, 2024
d5a07d6
Only run the test if vtgate = v20
frouioui Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions go/test/endtoend/vtgate/queries/reference/reference_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,17 @@ func TestMultiReferenceQuery(t *testing.T) {

utils.Exec(t, conn, query)
}

func TestDMLReferenceUsingShardedKS(t *testing.T) {
version, err := cluster.GetMajorVersion("vtgate")
require.NoError(t, err)
if version != 20 {
t.Skip()
}

conn, closer := start(t)
defer closer()

utils.Exec(t, conn, "use sks")
utils.Exec(t, conn, "update zip_detail set zip_id = 1 where id = 1")
}
2 changes: 1 addition & 1 deletion go/vt/vtgate/planbuilder/operators/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ func updateQueryGraphWithSource(ctx *plancontext.PlanningContext, input Operator
if tbl.ID != tblID {
continue
}
tbl.Alias = sqlparser.NewAliasedTableExpr(sqlparser.NewTableName(vTbl.Name.String()), tbl.Alias.As.String())
tbl.Alias = sqlparser.NewAliasedTableExpr(sqlparser.NewTableNameWithQualifier(vTbl.Name.String(), vTbl.Keyspace.Name), tbl.Alias.As.String())
tbl.Table, _ = tbl.Alias.TableName()
}
return op, Rewrote("change query table point to source table")
Expand Down
1 change: 1 addition & 0 deletions go/vt/vtgate/planbuilder/plan_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,7 @@ func (s *planTestSuite) TestWithUserDefaultKeyspaceFromFileSharded() {
}

s.testFile("select_cases_with_user_as_default.json", vschema, false)
s.testFile("dml_cases_with_user_as_default.json", vschema, false)
}

func (s *planTestSuite) TestWithSystemSchemaAsDefaultKeyspace() {
Expand Down
24 changes: 24 additions & 0 deletions go/vt/vtgate/planbuilder/testdata/dml_cases_with_user_as_default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
[
{
"comment": "Update reference table from sharded keyspace to unsharded keyspace",
"query": "update ambiguous_ref_with_source set done = true where id = 1;",
"plan": {
"QueryType": "UPDATE",
"Original": "update ambiguous_ref_with_source set done = true where id = 1;",
"Instructions": {
"OperatorType": "Update",
"Variant": "Unsharded",
"Keyspace": {
"Name": "main",
"Sharded": false
},
"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"
]
}
}
]
Loading