Skip to content

Commit 1680004

Browse files
vitess-bot[bot]arthurschreiber
vitess-bot[bot]
and
arthurschreiber
authored
[release-21.0] Introduce aliases for foreign keys verify operations (vitessio#18601) (vitessio#18613)
Signed-off-by: Arthur Schreiber <[email protected]> Co-authored-by: Arthur Schreiber <[email protected]>
1 parent 122fbb2 commit 1680004

File tree

5 files changed

+230
-89
lines changed

5 files changed

+230
-89
lines changed

‎go/vt/vtgate/planbuilder/operators/update.go‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,7 @@ func buildChildUpdOpForSetNull(
731731
updateExprs := ctx.SemTable.GetUpdateExpressionsForFk(fk.String(updatedTable))
732732
compExpr := nullSafeNotInComparison(ctx,
733733
updatedTable,
734-
updateExprs, fk, updatedTable.GetTableName(), nonLiteralUpdateInfo, false /* appendQualifier */)
734+
updateExprs, fk, updatedTable.GetTableName(), fk.Table.GetTableName(), nonLiteralUpdateInfo, false /* appendQualifier */)
735735
if compExpr != nil {
736736
childWhereExpr = &sqlparser.AndExpr{
737737
Left: childWhereExpr,
@@ -812,12 +812,20 @@ func createFKVerifyOp(
812812
// and Child.c2 is not null and not ((Child.c1) <=> (Child.c2 + 1))
813813
// limit 1
814814
func createFkVerifyOpForParentFKForUpdate(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updStmt *sqlparser.Update, pFK vindexes.ParentFKInfo) Operator {
815-
childTblExpr := updStmt.TableExprs[0].(*sqlparser.AliasedTableExpr)
815+
// Alias the foreign key's parent table name
816+
parentTblExpr := sqlparser.NewAliasedTableExpr(pFK.Table.GetTableName(), "parent")
817+
parentTbl, err := parentTblExpr.TableName()
818+
if err != nil {
819+
panic(err)
820+
}
821+
822+
// Alias the foreign key's child table name
823+
childTblExpr := sqlparser.NewAliasedTableExpr(updatedTable.GetTableName(), "child")
816824
childTbl, err := childTblExpr.TableName()
817825
if err != nil {
818826
panic(err)
819827
}
820-
parentTbl := pFK.Table.GetTableName()
828+
821829
var whereCond sqlparser.Expr
822830
var joinCond sqlparser.Expr
823831
var notEqualColNames sqlparser.ValTuple
@@ -894,7 +902,7 @@ func createFkVerifyOpForParentFKForUpdate(ctx *plancontext.PlanningContext, upda
894902
sqlparser.NewJoinTableExpr(
895903
childTblExpr,
896904
sqlparser.LeftJoinType,
897-
sqlparser.NewAliasedTableExpr(parentTbl, ""),
905+
parentTblExpr,
898906
sqlparser.NewJoinCondition(joinCond, nil)),
899907
},
900908
sqlparser.NewWhere(sqlparser.WhereClause, whereCond),
@@ -931,12 +939,20 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updat
931939
if !ctx.VerifyAllFKs {
932940
panic(vterrors.VT12002(updatedTable.String(), cFk.Table.String()))
933941
}
934-
parentTblExpr := updStmt.TableExprs[0].(*sqlparser.AliasedTableExpr)
942+
943+
parentTblExpr := sqlparser.NewAliasedTableExpr(updatedTable.GetTableName(), "parent")
935944
parentTbl, err := parentTblExpr.TableName()
936945
if err != nil {
937946
panic(err)
938947
}
939-
childTbl := cFk.Table.GetTableName()
948+
949+
// Alias the foreign key's child table name
950+
childTblExpr := sqlparser.NewAliasedTableExpr(cFk.Table.GetTableName(), "child")
951+
childTbl, err := childTblExpr.TableName()
952+
if err != nil {
953+
panic(err)
954+
}
955+
940956
var joinCond sqlparser.Expr
941957
for idx := range cFk.ParentColumns {
942958
joinExpr := &sqlparser.ComparisonExpr{
@@ -967,7 +983,7 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updat
967983
// For example, if we are setting `update child cola = :v1 and colb = :v2`, then on the parent, the where condition would look something like this -
968984
// `:v1 IS NULL OR :v2 IS NULL OR (cola, colb) NOT IN ((:v1,:v2))`
969985
// So, if either of :v1 or :v2 is NULL, then the entire condition is true (which is the same as not having the condition when :v1 or :v2 is NULL).
970-
compExpr := nullSafeNotInComparison(ctx, updatedTable, updStmt.Exprs, cFk, parentTbl, nil /* nonLiteralUpdateInfo */, true /* appendQualifier */)
986+
compExpr := nullSafeNotInComparison(ctx, updatedTable, updStmt.Exprs, cFk, parentTbl, childTbl, nil /* nonLiteralUpdateInfo */, true /* appendQualifier */)
971987
if compExpr != nil {
972988
whereCond = sqlparser.AndExpressions(whereCond, compExpr)
973989
}
@@ -978,7 +994,7 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updat
978994
sqlparser.NewJoinTableExpr(
979995
parentTblExpr,
980996
sqlparser.NormalJoinType,
981-
sqlparser.NewAliasedTableExpr(childTbl, ""),
997+
childTblExpr,
982998
sqlparser.NewJoinCondition(joinCond, nil)),
983999
},
9841000
sqlparser.NewWhere(sqlparser.WhereClause, whereCond),
@@ -992,7 +1008,7 @@ func createFkVerifyOpForChildFKForUpdate(ctx *plancontext.PlanningContext, updat
9921008
// `:v1 IS NULL OR :v2 IS NULL OR (cola, colb) NOT IN ((:v1,:v2))`
9931009
// So, if either of :v1 or :v2 is NULL, then the entire condition is true (which is the same as not having the condition when :v1 or :v2 is NULL)
9941010
// This expression is used in cascading SET NULLs and in verifying whether an update should be restricted.
995-
func nullSafeNotInComparison(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updateExprs sqlparser.UpdateExprs, cFk vindexes.ChildFKInfo, parentTbl sqlparser.TableName, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, appendQualifier bool) sqlparser.Expr {
1011+
func nullSafeNotInComparison(ctx *plancontext.PlanningContext, updatedTable *vindexes.Table, updateExprs sqlparser.UpdateExprs, cFk vindexes.ChildFKInfo, parentTbl, childTbl sqlparser.TableName, nonLiteralUpdateInfo []engine.NonLiteralUpdateInfo, appendQualifier bool) sqlparser.Expr {
9961012
var valTuple sqlparser.ValTuple
9971013
var updateValues sqlparser.ValTuple
9981014
for idx, updateExpr := range updateExprs {
@@ -1007,7 +1023,7 @@ func nullSafeNotInComparison(ctx *plancontext.PlanningContext, updatedTable *vin
10071023
}
10081024
updateValues = append(updateValues, childUpdateExpr)
10091025
if appendQualifier {
1010-
valTuple = append(valTuple, sqlparser.NewColNameWithQualifier(cFk.ChildColumns[colIdx].String(), cFk.Table.GetTableName()))
1026+
valTuple = append(valTuple, sqlparser.NewColNameWithQualifier(cFk.ChildColumns[colIdx].String(), childTbl))
10111027
} else {
10121028
valTuple = append(valTuple, sqlparser.NewColName(cFk.ChildColumns[colIdx].String()))
10131029
}

‎go/vt/vtgate/planbuilder/plan_test.go‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -205,16 +205,17 @@ func (s *planTestSuite) setFks(vschema *vindexes.VSchema) {
205205
"multicol_tbl1", "multicol_tbl2", "tbl_auth", "tblrefDef", "tbl20"})
206206
}
207207
if vschema.Keyspaces["unsharded_fk_allow"] != nil {
208-
// u_tbl2(col2) -> u_tbl1(col1) Cascade.
209-
// u_tbl4(col41) -> u_tbl1(col14) Restrict.
210-
// u_tbl9(col9) -> u_tbl1(col1) Cascade Null.
211-
// u_tbl3(col2) -> u_tbl2(col2) Cascade Null.
212-
// u_tbl4(col4) -> u_tbl3(col3) Restrict.
213-
// u_tbl6(col6) -> u_tbl5(col5) Restrict.
214-
// u_tbl8(col8) -> u_tbl9(col9) Null Null.
215-
// u_tbl8(col8) -> u_tbl6(col6) Cascade Null.
216-
// u_tbl4(col4) -> u_tbl7(col7) Cascade Cascade.
217-
// u_tbl9(col9) -> u_tbl4(col4) Restrict Restrict.
208+
// u_tbl2(col2) -> u_tbl1(col1) Cascade.
209+
// u_tbl4(col41) -> u_tbl1(col14) Restrict.
210+
// u_tbl9(col9) -> u_tbl1(col1) Cascade Null.
211+
// u_tbl3(col2) -> u_tbl2(col2) Cascade Null.
212+
// u_tbl4(col4) -> u_tbl3(col3) Restrict.
213+
// u_tbl6(col6) -> u_tbl5(col5) Restrict.
214+
// u_tbl8(col8) -> u_tbl9(col9) Null Null.
215+
// u_tbl8(col8) -> u_tbl6(col6) Cascade Null.
216+
// u_tbl4(col4) -> u_tbl7(col7) Cascade Cascade.
217+
// u_tbl9(col9) -> u_tbl4(col4) Restrict Restrict.
218+
// u_tbl12(parent_id) -> u_tbl12(id) Restrict Restrict.
218219
// u_multicol_tbl2(cola, colb) -> u_multicol_tbl1(cola, colb) Null Null.
219220
// u_multicol_tbl3(cola, colb) -> u_multicol_tbl2(cola, colb) Cascade Cascade.
220221

@@ -241,7 +242,10 @@ func (s *planTestSuite) setFks(vschema *vindexes.VSchema) {
241242
_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl9", sqlparser.Exprs{sqlparser.NewColName("bar"), sqlparser.NewColName("col9")})
242243
_ = vschema.AddUniqueKey("unsharded_fk_allow", "u_tbl8", sqlparser.Exprs{sqlparser.NewColName("col8")})
243244

244-
s.addPKs(vschema, "unsharded_fk_allow", []string{"u_tbl1", "u_tbl2", "u_tbl3", "u_tbl4", "u_tbl5", "u_tbl6", "u_tbl7", "u_tbl8", "u_tbl9", "u_tbl10", "u_tbl11",
245+
// FK from u_tbl12 that is self-referential.
246+
_ = vschema.AddForeignKey("unsharded_fk_allow", "u_tbl12", createFkDefinition([]string{"parent_id"}, "u_tbl12", []string{"id"}, sqlparser.Restrict, sqlparser.Restrict))
247+
248+
s.addPKs(vschema, "unsharded_fk_allow", []string{"u_tbl1", "u_tbl2", "u_tbl3", "u_tbl4", "u_tbl5", "u_tbl6", "u_tbl7", "u_tbl8", "u_tbl9", "u_tbl10", "u_tbl11", "u_tbl12",
245249
"u_multicol_tbl1", "u_multicol_tbl2", "u_multicol_tbl3"})
246250
}
247251

0 commit comments

Comments
 (0)