Skip to content

Commit

Permalink
Revert "opt: add first half of upsert FK checks"
Browse files Browse the repository at this point in the history 
This reverts commit 96447c8.

We are reconsidering the direction of the upsert FK checks: instead of filtering
inserted vs updated rows, we can use the return columns to get the "new" values.
This change also made some things harder to understand: we used to build the FK
check input using just the columns corresponding to the FK instead of all
columns.

Release note: None
  • Loading branch information
@RaduBerinde
RaduBerinde committed Mar 4, 2020
1 parent 7b64b0b commit aa2295d
Show file tree
Hide file tree
Showing 12 changed files with 373 additions and 1,246 deletions.
63 changes: 0 additions & 63 deletions pkg/sql/logictest/testdata/logic_test/fk_opt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,69 +133,6 @@ DROP TABLE child2
statement ok
DROP TABLE parent2

# Upsert
# ------

statement ok
CREATE TABLE parent (p INT PRIMARY KEY, other INT)

statement ok
CREATE TABLE child (c INT PRIMARY KEY, p INT NOT NULL REFERENCES parent(p))

statement ok
INSERT INTO parent VALUES (1), (2)

# Insert case.
statement ok
INSERT INTO child VALUES (1, 1) ON CONFLICT (c) DO UPDATE SET p = 2

statement error foreign key
INSERT INTO child VALUES (2, 10) ON CONFLICT (c) DO UPDATE SET p = 2

# Update case.
statement ok
INSERT INTO child VALUES (1, 1) ON CONFLICT (c) DO UPDATE SET p = 1

statement ok
INSERT INTO child VALUES (1, 10) ON CONFLICT (c) DO UPDATE SET p = 1

statement error foreign key
INSERT INTO child VALUES (1, 10) ON CONFLICT (c) DO UPDATE SET p = 10

statement ok
TRUNCATE child

statement ok
INSERT INTO child VALUES (1, 1)

# Both insert and update case.

# Both insert and update are invalid.

statement error foreign key
INSERT INTO child VALUES (1, 1), (2, 3) ON CONFLICT (c) DO UPDATE SET p = 3

# Insert is invalid, update is valid.

statement error foreign key
INSERT INTO child VALUES (1, 2), (2, 3) ON CONFLICT (c) DO UPDATE SET p = 1

# Insert is valid, update is invalid.

statement error foreign key
INSERT INTO child VALUES (1, 2), (2, 1) ON CONFLICT (c) DO UPDATE SET p = 3

# Both insert and update are valid.

statement ok
INSERT INTO child VALUES (1, 2), (2, 1) ON CONFLICT (c) DO UPDATE SET p = 2

statement ok
DROP TABLE child

statement ok
DROP TABLE parent

# --- Tests that follow are copied from the fk tests and adjusted as needed.

statement ok
Expand Down
1 change: 0 additions & 1 deletion pkg/sql/opt/bench/stub_factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,6 @@ func (f *stubFactory) ConstructUpsert(
returnCols exec.ColumnOrdinalSet,
checks exec.CheckOrdinalSet,
allowAutoCommit bool,
skipFKChecks bool,
) (exec.Node, error) {
return struct{}{}, nil
}
Expand Down
6 changes: 0 additions & 6 deletions pkg/sql/opt/exec/execbuilder/mutation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,6 @@ func (b *Builder) buildUpsert(ups *memo.UpsertExpr) (execPlan, error) {
updateColOrds := ordinalSetFromColList(ups.UpdateCols)
returnColOrds := ordinalSetFromColList(ups.ReturnCols)
checkOrds := ordinalSetFromColList(ups.CheckCols)
disableExecFKs := !ups.FKFallback
node, err := b.factory.ConstructUpsert(
input.root,
tab,
Expand All @@ -394,16 +393,11 @@ func (b *Builder) buildUpsert(ups *memo.UpsertExpr) (execPlan, error) {
returnColOrds,
checkOrds,
b.allowAutoCommit && len(ups.Checks) == 0,
disableExecFKs,
)
if err != nil {
return execPlan{}, err
}

if err := b.buildFKChecks(ups.Checks); err != nil {
return execPlan{}, err
}

// If UPSERT returns rows, they contain all non-mutation columns from the
// table, in the same order they're defined in the table. Each output column
// value is taken from an insert, fetch, or update column, depending on the
Expand Down
10 changes: 2 additions & 8 deletions pkg/sql/opt/exec/factory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,6 @@ type Factory interface {
// transaction (if appropriate, i.e. if it is in an implicit transaction).
// This is false if there are multiple mutations in a statement, or the output
// of the mutation is processed through side-effecting expressions.
//
// If skipFKChecks is set, foreign keys are not checked as part of the
// execution of the upsert for the insert half. This is used when the FK
// checks are planned by the optimizer and are run separately as plan
// postqueries.
ConstructUpsert(
input Node,
table cat.Table,
Expand All @@ -440,7 +435,6 @@ type Factory interface {
returnCols ColumnOrdinalSet,
checks CheckOrdinalSet,
allowAutoCommit bool,
skipFKChecks bool,
) (Node, error)

// ConstructDelete creates a node that implements a DELETE statement. The
Expand All @@ -457,8 +451,8 @@ type Factory interface {
// of the mutation is processed through side-effecting expressions.
//
// If skipFKChecks is set, foreign keys are not checked as part of the
// execution of the delete. This is used when the FK checks are planned
// by the optimizer and are run separately as plan postqueries.
// execution of the insertion. This is used when the FK checks are planned by
// the optimizer and are run separately as plan postqueries.
ConstructDelete(
input Node,
table cat.Table,
Expand Down
102 changes: 25 additions & 77 deletions pkg/sql/opt/optbuilder/mutation_builder.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ func (mb *mutationBuilder) buildFKChecksForInsert() {
}

for i, n := 0, mb.tab.OutboundForeignKeyCount(); i < n; i++ {
mb.addInsertionCheck(i, mb.insertOrds, checkAllRows)
mb.addInsertionCheck(i, insertCols)
}
}

Expand Down Expand Up @@ -1019,7 +1019,7 @@ func (mb *mutationBuilder) buildFKChecksForUpdate() {
continue
}

mb.addInsertionCheck(i, newRowCols, checkAllRows)
mb.addInsertionCheck(i, newRowColIDs)
}

// The "deletion" incurred by an update is the rows deleted for a given
Expand All @@ -1046,8 +1046,8 @@ func (mb *mutationBuilder) buildFKChecksForUpdate() {
continue
}

oldRows, colsForOldRow, _ := mb.projectInput(oldRowFKColOrdinals, false /* includeCanary */)
newRows, colsForNewRow, _ := mb.projectInput(newRowFKColOrdinals, false /* includeCanary */)
oldRows, colsForOldRow := mb.projectOrdinals(oldRowFKColOrdinals)
newRows, colsForNewRow := mb.projectOrdinals(newRowFKColOrdinals)

// The rows that no longer exist are the ones that were "deleted" by virtue
// of being updated _from_, minus the ones that were "added" by virtue of
Expand Down Expand Up @@ -1099,58 +1099,15 @@ func (mb *mutationBuilder) buildFKChecksForUpsert() {
mb.fkFallback = true
return
}

mb.withID = mb.b.factory.Memo().NextWithID()

// Add the check for the insertion portion of the the upsert.
for i, n := 0, mb.tab.OutboundForeignKeyCount(); i < n; i++ {
mb.addInsertionCheck(i, mb.insertOrds, checkInsertedRows)
}

// TODO(justin): include checks for the set of updated rows.
// TODO(justin): not implemented yet.
mb.fkFallback = true
}

// rowInclusion determines the mode in which an insertion check should be
// constructed.
type rowInclusion int

const (
checkAllRows rowInclusion = iota
checkInsertedRows
)

// addInsertionCheck adds a FK check for rows which are added to a table.
// The input to the insertion check will be the input to the mutation operator.
// insertOrds is a list of the columns for the rows being inserted, indexed by
// insertCols is a list of the columns for the rows being inserted, indexed by
// their ordinal position in the table.
// rows is either checkAllRows or checkInsertedRows, and denotes whether we
// should add a filter for the canary column. It should only be
// checkInsertedRows if we are performing an UPSERT.
func (mb *mutationBuilder) addInsertionCheck(
fkOrdinal int, insertOrds []scopeOrdinal, rows rowInclusion,
) {
inputExpr, insertCols, canaryID := mb.projectInput(insertOrds, rows == checkInsertedRows)

// If we were an upsert, then we have to filter out the rows that were the ones actually inserted.
if rows == checkInsertedRows {
// We need to add a project on top of this so that the we remove the canary column.
inputExpr = mb.b.factory.ConstructProject(
mb.b.factory.ConstructSelect(
inputExpr,
memo.FiltersExpr{
mb.b.factory.ConstructFiltersItem(
mb.b.factory.ConstructIs(
mb.b.factory.ConstructVariable(canaryID),
memo.NullSingleton,
),
),
},
),
memo.ProjectionsExpr{},
insertCols.ToSet(),
)
}

func (mb *mutationBuilder) addInsertionCheck(fkOrdinal int, insertCols opt.ColList) {
fk := mb.tab.OutboundForeignKey(fkOrdinal)
numCols := fk.ColumnCount()
var notNullInputCols opt.ColSet
Expand All @@ -1168,7 +1125,7 @@ func (mb *mutationBuilder) addInsertionCheck(
// If a table column is not nullable, NULLs cannot be inserted (the
// mutation will fail). So for the purposes of FK checks, we can treat
// these columns as not null.
if inputExpr.Relational().NotNullCols.Contains(inputColID) || !mb.tab.Column(ord).IsNullable() {
if mb.outScope.expr.Relational().NotNullCols.Contains(inputColID) || !mb.tab.Column(ord).IsNullable() {
notNullInputCols.Add(inputColID)
}
}
Expand Down Expand Up @@ -1210,9 +1167,8 @@ func (mb *mutationBuilder) addInsertionCheck(
mb.b.allocScope(),
)

inputExpr = mb.b.factory.ConstructProject(inputExpr, memo.ProjectionsExpr{}, insertedFKCols.ToSet())

private.KeyCols = insertedFKCols
left, withScanCols := mb.makeFKInputScan(insertedFKCols)
private.KeyCols = withScanCols
if notNullInputCols.Len() < numCols {
// The columns we are inserting might have NULLs. These require special
// handling, depending on the match method:
Expand Down Expand Up @@ -1240,13 +1196,13 @@ func (mb *mutationBuilder) addInsertionCheck(
if !notNullInputCols.Contains(insertedFKCols[i]) {
filters = append(filters, mb.b.factory.ConstructFiltersItem(
mb.b.factory.ConstructIsNot(
mb.b.factory.ConstructVariable(insertedFKCols[i]),
mb.b.factory.ConstructVariable(withScanCols[i]),
memo.NullSingleton,
),
))
}
}
inputExpr = mb.b.factory.ConstructSelect(inputExpr, filters)
left = mb.b.factory.ConstructSelect(left, filters)

case tree.MatchFull:
// Filter out any rows which have NULLs on all referencing columns.
Expand All @@ -1259,7 +1215,7 @@ func (mb *mutationBuilder) addInsertionCheck(
// Build a filter of the form
// (a IS NOT NULL) OR (b IS NOT NULL) ...
var condition opt.ScalarExpr
for _, col := range insertedFKCols {
for _, col := range withScanCols {
is := mb.b.factory.ConstructIsNot(
mb.b.factory.ConstructVariable(col),
memo.NullSingleton,
Expand All @@ -1270,8 +1226,8 @@ func (mb *mutationBuilder) addInsertionCheck(
condition = mb.b.factory.ConstructOr(condition, is)
}
}
inputExpr = mb.b.factory.ConstructSelect(
inputExpr,
left = mb.b.factory.ConstructSelect(
left,
memo.FiltersExpr{mb.b.factory.ConstructFiltersItem(condition)},
)

Expand All @@ -1286,15 +1242,15 @@ func (mb *mutationBuilder) addInsertionCheck(
for j := 0; j < numCols; j++ {
antiJoinFilters[j] = mb.b.factory.ConstructFiltersItem(
mb.b.factory.ConstructEq(
mb.b.factory.ConstructVariable(insertedFKCols[j]),
mb.b.factory.ConstructVariable(withScanCols[j]),
mb.b.factory.ConstructVariable(scanScope.cols[j].id),
),
)
}

mb.checks = append(mb.checks, mb.b.factory.ConstructFKChecksItem(
mb.b.factory.ConstructAntiJoin(
inputExpr, scanScope.expr, antiJoinFilters, &memo.JoinPrivate{},
left, scanScope.expr, antiJoinFilters, &memo.JoinPrivate{},
),
&private,
))
Expand Down Expand Up @@ -1382,36 +1338,28 @@ func (mb *mutationBuilder) addDeletionCheck(
return true
}

// projectInput returns a WithScan that returns each row in the input to the
// projectOrdinals returns a WithScan that returns each row in the input to the
// mutation operator, projecting only the column ordinals provided, mapping them
// to new column ids. Returns the new expression along with the column ids
// they've been mapped to.
// If includeCanary is set, the resulting expression will also render the canary
// column and its id will be returned. Should only be set if this is an UPSERT.
func (mb *mutationBuilder) projectInput(
ords []scopeOrdinal, includeCanary bool,
) (_ memo.RelExpr, outCols opt.ColList, canaryOutID opt.ColumnID) {
outCols = make(opt.ColList, len(ords), len(ords)+1)
inCols := make(opt.ColList, len(ords), len(ords)+1)
func (mb *mutationBuilder) projectOrdinals(
ords []scopeOrdinal,
) (_ memo.RelExpr, outCols opt.ColList) {
outCols = make(opt.ColList, len(ords))
inCols := make(opt.ColList, len(ords))
for i := 0; i < len(ords); i++ {
c := mb.b.factory.Metadata().ColumnMeta(mb.outScope.cols[ords[i]].id)
outCols[i] = mb.md.AddColumn(c.Alias, c.Type)
inCols[i] = mb.outScope.cols[ords[i]].id
}
if includeCanary {
c := mb.md.ColumnMeta(mb.canaryColID)
canaryOutID = mb.md.AddColumn(c.Alias, c.Type)
outCols = append(outCols, canaryOutID)
inCols = append(inCols, mb.canaryColID)
}
out := mb.b.factory.ConstructWithScan(&memo.WithScanPrivate{
With: mb.withID,
InCols: inCols,
OutCols: outCols,
BindingProps: mb.outScope.expr.Relational(),
ID: mb.b.factory.Metadata().NextUniqueID(),
})
return out, outCols, canaryOutID
return out, outCols
}

// makeFKInputScan constructs a WithScan that iterates over the input to the
Expand Down
Loading

0 comments on commit aa2295d

Please sign in to comment.