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

Fix Fk verification and update queries to accommodate for bindVariables being NULL #14061

Merged
merged 6 commits into from
Sep 26, 2023
Merged

Fix Fk verification and update queries to accommodate for bindVariables being NULL #14061

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f828764
feat: fix queries to take care of bindvariables which can be NULL val…
GuptaManan100 Sep 21, 2023
a14cd2f
Merge remote-tracking branch 'upstream/main' into not-null-fk-fix
GuptaManan100 Sep 21, 2023
7db4f56
Merge remote-tracking branch 'upstream/main' into not-null-fk-fix
GuptaManan100 Sep 22, 2023
7d8518d
test: update test expectation
GuptaManan100 Sep 22, 2023
abeac2d
refactor: add code comments to explain it better
GuptaManan100 Sep 22, 2023
c14abfe
feat: refactor code to extract out common code
GuptaManan100 Sep 26, 2023
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
24 changes: 22 additions & 2 deletions go/vt/vtgate/planbuilder/operators/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,9 +426,19 @@ func buildChildUpdOpForSetNull(ctx *plancontext.PlanningContext, fk vindexes.Chi
}
}
if !colSetToNull {
var finalExpr sqlparser.Expr = sqlparser.NewComparisonExpr(sqlparser.NotInOp, valTuple, sqlparser.ValTuple{updateValues}, nil)
for _, value := range updateValues {
finalExpr = &sqlparser.OrExpr{
Left: &sqlparser.IsExpr{
Left: value,
Right: sqlparser.IsNullOp,
},
Right: finalExpr,
}
}
childWhereExpr = &sqlparser.AndExpr{
Left: childWhereExpr,
Right: sqlparser.NewComparisonExpr(sqlparser.NotInOp, valTuple, sqlparser.ValTuple{updateValues}, nil),
Right: finalExpr,
}
}
childUpdStmt := &sqlparser.Update{
Expand Down Expand Up @@ -618,7 +628,17 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updSt
for _, column := range cFk.ParentColumns {
valTuple = append(valTuple, sqlparser.NewColNameWithQualifier(column.String(), parentTbl))
}
whereCond = sqlparser.AndExpressions(whereCond, sqlparser.NewComparisonExpr(sqlparser.NotInOp, valTuple, sqlparser.ValTuple{updateValues}, nil))
var finalExpr sqlparser.Expr = sqlparser.NewComparisonExpr(sqlparser.NotInOp, valTuple, sqlparser.ValTuple{updateValues}, nil)
for _, value := range updateValues {
finalExpr = &sqlparser.OrExpr{
Left: &sqlparser.IsExpr{
Left: value,
Right: sqlparser.IsNullOp,
},
Right: finalExpr,
}
}
whereCond = sqlparser.AndExpressions(whereCond, finalExpr)
GuptaManan100 marked this conversation as resolved.
Show resolved Hide resolved
}

return createSelectionOp(ctx,
Expand Down
185 changes: 184 additions & 1 deletion go/vt/vtgate/planbuilder/testdata/foreignkey_cases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,6 +1259,95 @@
]
}
},
{
"comment": "Update that cascades and requires parent fk and restrict child fk verification - bindVariable",
"query": "update u_tbl7 set col7 = :v1",
"plan": {
"QueryType": "UPDATE",
"Original": "update u_tbl7 set col7 = :v1",
"Instructions": {
"OperatorType": "FkCascade",
"Inputs": [
{
"InputName": "Selection",
"OperatorType": "Route",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"FieldQuery": "select col7 from u_tbl7 where 1 != 1",
"Query": "select col7 from u_tbl7 for update",
"Table": "u_tbl7"
},
{
"InputName": "CascadeChild-1",
"OperatorType": "FKVerify",
"BvName": "fkc_vals",
"Cols": [
0
],
"Inputs": [
{
"InputName": "VerifyParent-1",
"OperatorType": "Route",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"FieldQuery": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = :v1 where 1 != 1",
"Query": "select 1 from u_tbl4 left join u_tbl3 on u_tbl3.col3 = :v1 where (u_tbl4.col4) in ::fkc_vals and u_tbl3.col3 is null limit 1 lock in share mode",
"Table": "u_tbl3, u_tbl4"
},
{
"InputName": "VerifyChild-2",
"OperatorType": "Route",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"FieldQuery": "select 1 from u_tbl4, u_tbl9 where 1 != 1",
"Query": "select 1 from u_tbl4, u_tbl9 where (u_tbl4.col4) in ::fkc_vals and (:v1 is null or (u_tbl4.col4) not in ((:v1))) and u_tbl4.col4 = u_tbl9.col9 limit 1 lock in share mode",
"Table": "u_tbl4, u_tbl9"
},
{
"InputName": "PostVerify",
"OperatorType": "Update",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"TargetTabletType": "PRIMARY",
"Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_tbl4 set col4 = :v1 where (u_tbl4.col4) in ::fkc_vals",
"Table": "u_tbl4"
}
]
},
{
"InputName": "Parent",
"OperatorType": "Update",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"TargetTabletType": "PRIMARY",
"Query": "update u_tbl7 set col7 = :v1",
"Table": "u_tbl7"
}
]
},
"TablesUsed": [
"unsharded_fk_allow.u_tbl3",
"unsharded_fk_allow.u_tbl4",
"unsharded_fk_allow.u_tbl7",
"unsharded_fk_allow.u_tbl9"
]
}
},
{
"comment": "Insert with on duplicate key update - foreign keys disallowed",
"query": "insert into u_tbl1 (id, col1) values (1, 3) on duplicate key update col1 = 5",
Expand Down Expand Up @@ -1364,7 +1453,7 @@
"Sharded": false
},
"TargetTabletType": "PRIMARY",
"Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (cola, colb) not in ((1, 2))",
"Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (1 is null or (cola, colb) not in ((1, 2)))",
GuptaManan100 marked this conversation as resolved.
Show resolved Hide resolved
"Table": "u_multicol_tbl2"
}
]
Expand All @@ -1390,6 +1479,100 @@
]
}
},
{
"comment": "update on a multicol foreign key that set nulls and then cascades - bindVariables",
"query": "update u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3",
"plan": {
"QueryType": "UPDATE",
"Original": "update u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3",
"Instructions": {
"OperatorType": "FkCascade",
"Inputs": [
{
"InputName": "Selection",
"OperatorType": "Route",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"FieldQuery": "select cola, colb from u_multicol_tbl1 where 1 != 1",
"Query": "select cola, colb from u_multicol_tbl1 where id = :v3 for update",
"Table": "u_multicol_tbl1"
},
{
"InputName": "CascadeChild-1",
"OperatorType": "FkCascade",
"BvName": "fkc_vals",
"Cols": [
0,
1
],
"Inputs": [
{
"InputName": "Selection",
"OperatorType": "Route",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"FieldQuery": "select cola, colb from u_multicol_tbl2 where 1 != 1",
"Query": "select cola, colb from u_multicol_tbl2 where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2)))) for update",
GuptaManan100 marked this conversation as resolved.
Show resolved Hide resolved
"Table": "u_multicol_tbl2"
},
{
"InputName": "CascadeChild-1",
"OperatorType": "Update",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"TargetTabletType": "PRIMARY",
"BvName": "fkc_vals1",
"Cols": [
0,
1
],
"Query": "update /*+ SET_VAR(foreign_key_checks=OFF) */ u_multicol_tbl3 set cola = null, colb = null where (cola, colb) in ::fkc_vals1",
"Table": "u_multicol_tbl3"
},
{
"InputName": "Parent",
"OperatorType": "Update",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"TargetTabletType": "PRIMARY",
"Query": "update u_multicol_tbl2 set cola = null, colb = null where (cola, colb) in ::fkc_vals and (:v2 is null or (:v1 is null or (cola, colb) not in ((:v1, :v2))))",
"Table": "u_multicol_tbl2"
}
]
},
{
"InputName": "Parent",
"OperatorType": "Update",
"Variant": "Unsharded",
"Keyspace": {
"Name": "unsharded_fk_allow",
"Sharded": false
},
"TargetTabletType": "PRIMARY",
"Query": "update u_multicol_tbl1 set cola = :v1, colb = :v2 where id = :v3",
"Table": "u_multicol_tbl1"
}
]
},
"TablesUsed": [
"unsharded_fk_allow.u_multicol_tbl1",
"unsharded_fk_allow.u_multicol_tbl2",
"unsharded_fk_allow.u_multicol_tbl3"
]
}
},
{
"comment": "Cascaded delete run from prepared statement",
"query": "execute prep_delete using @foo",
Expand Down
Loading