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

Refactor Delete plan to be consistent with update #4432

Merged
merged 1 commit into from
Dec 16, 2018
Merged

Refactor Delete plan to be consistent with update #4432

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 10 additions & 10 deletions go/vt/vtgate/planbuilder/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,27 +56,27 @@ func buildDeletePlan(del *sqlparser.Delete, vschema ContextVSchema) (*engine.Del
if hasSubquery(del) {
return nil, errors.New("unsupported: subqueries in sharded DML")
}
var tableName sqlparser.TableName
for t := range pb.st.tables {
tableName = t
var vindexTable *vindexes.Table
for _, tval := range pb.st.tables {
vindexTable = tval.vindexTable
}
table, _, destTabletType, destTarget, err := vschema.FindTable(tableName)
if err != nil {
return nil, err
edel.Table = vindexTable
if edel.Table == nil {
return nil, errors.New("internal error: table.vindexTable is mysteriously nil")
}
edel.Table = table
var err error

directives := sqlparser.ExtractCommentDirectives(del.Comments)
if directives.IsSet(sqlparser.DirectiveMultiShardAutocommit) {
edel.MultiShardAutocommit = true
}

if destTarget != nil {
if destTabletType != topodatapb.TabletType_MASTER {
if rb.ERoute.TargetDestination != nil {
if rb.ERoute.TargetTabletType != topodatapb.TabletType_MASTER {
return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "unsupported: DELETE statement with a replica target")
}
edel.Opcode = engine.DeleteByDestination
edel.TargetDestination = destTarget
edel.TargetDestination = rb.ERoute.TargetDestination
return edel, nil
}
edel.Vindex, edel.Values, err = getDMLRouting(del.Where, edel.Table)
Expand Down