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.

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

opt: fix FK cascades to child tables with partial indexes #57100

Merged
merged 1 commit into from
Dec 1, 2020

Conversation

mgartner
Copy link
Collaborator

@mgartner mgartner commented Nov 25, 2020

Previously, the optimizer was not synthesizing partial index DEL columns
for FK cascading updates and deletes. As a result, a cascading UPDATE
could corrupt a child table's partial index, ultimately resulting in
incorrect query results. A cascading DELETE would not corrupt
partial indexes, but unnecessary DEL operations would be issued on
the partial index.

The optbuilder has been refactored so that these columns are correctly
projected. There are now three functions for projecting PUT columns, DEL
columns, and both PUT and DEL columns, each ensuring that the input
scopes are non-nil. These three functions are called from principal
functions in the optbuilder where CHECK constraint columns are also
projected, like mutationBuilder.buildUpdate. In theory this should
make it harder in the future to omit these necessary projections.

Additionally, the execution engine was unable to handle extraneous
columns that can be added as input to FK cascading updates. These
extraneous columns would be incorrectly interpreted as synthesized
partial index columns. This commit works around this issue by slicing
the source values with an upper bound in updateNode.processSourceRow.
The longer term fix is to not produce these columns (see issue #57097).

Fixes #57085
Fixes #57084

Release justification: This is a critical bug fix to a new feature,
partial indexes.

Release note (bug fix): A bug has been fixed that caused errors or
corrupted partial indexes of child tables in foreign key relationships
with cascading UPDATEs and DELETEs. The corrupt partial indexes
could result in incorrect query results. Any partial indexes on child
tables of foreign key relationships with ON DELETE CASCADE or ON UPDATE CASCADE actions may be corrupt and should be dropped and
re-created. This bug was introduce in version 20.2.

@mgartner mgartner requested a review from a team as a code owner November 25, 2020 01:56
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@mgartner
Copy link
Collaborator Author

Ooops. Forgot to include some optbuilder tests. I'll add those.

@mgartner
Copy link
Collaborator Author

There might also be problems with an ON CASCADE DELETE but I'm having trouble producing a test case exhibiting a bug.

Copy link
Collaborator

@rytaft rytaft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[nit] in the commit/PR message, this sentence is garbled: "... columns have been synthesized for from the optimizer to the execution engine ..."

There might also be problems with an ON CASCADE DELETE but I'm having trouble producing a test case exhibiting a bug.

Maybe you can use SHOW TRACE?

Reviewed 14 of 14 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @mgartner and @RaduBerinde)


pkg/sql/update.go, line 59 at r1 (raw file):

	checkOrds        checkSet
	partialIndexOrds partialIndexSet

Is this getting used other than for its length?


pkg/sql/logictest/testdata/logic_test/partial_index, line 1530 at r1 (raw file):

INSERT INTO t57085c_groups VALUES (1), (2);
INSERT INTO t57085c_users VALUES (10, 1, 100), (20, 2, 200);
UPDATE t57085c_groups SET id = 3 WHERE id = 1;

should there be a similar test to ensure that rows are deleted from the partial index if group_id is updated from 3->4?


pkg/sql/opt/exec/factory.opt, line 416 at r1 (raw file):

# 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.

[nit] update comment to mention partial indexes


pkg/sql/opt/exec/execbuilder/mutation.go, line 343 at r1 (raw file):

		returnColOrds,
		checkOrds,
		partialIndexPutOrds,

why do we only need Put here and not Del?


pkg/sql/opt/optbuilder/fk_cascade.go, line 637 at r1 (raw file):

		)

		// Set the fetchScope to the scope of the fetch expression.

what's a fetch expression?


pkg/sql/opt/optbuilder/insert.go, line 908 at r1 (raw file):

	//       reason other than as "fetch columns". See buildScan comment.
	// TODO(andyk): Why does execution engine need mutation columns for Insert?
	fetchScope := mb.b.buildScan(

why not just use mb.fetchScope directly here instead of creating a new variable?


pkg/sql/opt/optbuilder/mutation_builder.go, line 341 at r1 (raw file):

	}

	// Set the fetchScope to the scope of the fetch expression.

[nit] what's a fetch expression?


pkg/sql/opt/optbuilder/mutation_builder.go, line 408 at r1 (raw file):

	mb.setFetchColIDs(mb.outScope.cols)

	// Set the fetchScope to the scope of the fetch expression.

ditto


pkg/sql/opt/optbuilder/mutation_builder.go, line 822 at r1 (raw file):

			expr := mb.parsePartialIndexPredicateExpr(i)

			// Build a synthesized PUT columns.

[nit] a synthesized -> synthesized


pkg/sql/opt/optbuilder/mutation_builder.go, line 832 at r1 (raw file):

			}

			// Build a synthesized DEL columns.

ditto

@mgartner mgartner force-pushed the 57085-fk-partial-index-fix branch from d1fef31 to 288d622 Compare November 26, 2020 01:56
@mgartner mgartner changed the title opt: fix FK cascading updates to child tables with partial indexes optbuilder: fix ambiguous column references for FK cascades Nov 26, 2020
@mgartner mgartner changed the title optbuilder: fix ambiguous column references for FK cascades opt: fix FK cascades to child tables with partial indexes Nov 26, 2020
@mgartner mgartner force-pushed the 57085-fk-partial-index-fix branch from 288d622 to 0a717a1 Compare November 26, 2020 01:59
Copy link
Collaborator Author

@mgartner mgartner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the feedback @rytaft. I reworked this quite a bit, so some of them were no longer applicable. I think this is more polished now.

The first commit is from #57153.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @RaduBerinde and @rytaft)


pkg/sql/update.go, line 59 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

Is this getting used other than for its length?

No. I realized this wasn't necessary and I've removed it.


pkg/sql/logictest/testdata/logic_test/partial_index, line 1530 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

should there be a similar test to ensure that rows are deleted from the partial index if group_id is updated from 3->4?

Done.


pkg/sql/opt/exec/factory.opt, line 416 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

[nit] update comment to mention partial indexes

I've removed this new argument — it wasn't necessary.


pkg/sql/opt/exec/execbuilder/mutation.go, line 343 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

why do we only need Put here and not Del?

This has been removed — it wasn't necessary.


pkg/sql/opt/optbuilder/fk_cascade.go, line 637 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

what's a fetch expression?

I've updated the comment for the fetchScope field, and redone a lot of this code. LMK if it's still unclear what fetchScope is.


pkg/sql/opt/optbuilder/insert.go, line 908 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

why not just use mb.fetchScope directly here instead of creating a new variable?

Done.


pkg/sql/opt/optbuilder/mutation_builder.go, line 341 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

[nit] what's a fetch expression?

See previous comment.


pkg/sql/opt/optbuilder/mutation_builder.go, line 408 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

ditto

See previous comment.


pkg/sql/opt/optbuilder/mutation_builder.go, line 822 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

[nit] a synthesized -> synthesized

Done.


pkg/sql/opt/optbuilder/mutation_builder.go, line 832 at r1 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

ditto

Done.

@mgartner mgartner force-pushed the 57085-fk-partial-index-fix branch from 0a717a1 to 99dd2be Compare November 26, 2020 02:12
Copy link
Collaborator

@rytaft rytaft left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 6 of 15 files at r2, 18 of 18 files at r3.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @mgartner and @RaduBerinde)


pkg/sql/opt/optbuilder/mutation_builder.go, line 797 at r3 (raw file):

// partialIndexProjectColumns specifies which types of partial index columns to
// project, PUT columns, DEL columns, or both. Different mutations require

[nit] project, -> project:


pkg/sql/opt/optbuilder/mutation_builder.go, line 798 at r3 (raw file):

// partialIndexProjectColumns specifies which types of partial index columns to
// project, PUT columns, DEL columns, or both. Different mutations require
// different sets of these columns to be project. For example, INSERT does not

[nit] to be project -> to be projected

Copy link
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @mgartner)


pkg/sql/opt/optbuilder/mutation_builder.go, line 806 at r3 (raw file):

	putCols partialIndexProjectColumns = 1 << iota
	delCols
	putAndDelCols = putCols | delCols

[nit] putAndDelCols partialIndexProjectColumns = ..


pkg/sql/opt/optbuilder/mutation_builder.go, line 811 at r3 (raw file):

// HasColumns tests whether pc contains all the partial index project columns in
// other.
func (pc partialIndexProjectColumns) HasColumns(other partialIndexProjectColumns) bool {

[nit] maybe just Has is a better name


pkg/sql/opt/optbuilder/mutation_builder.go, line 817 at r3 (raw file):

// projectPartialIndexCols builds a Project that synthesizes boolean output
// columns for each partial index defined on the target table. The projectCols
// argument specifies if PUT columns, DEL columns, or both PUT and DEL columns

[nit] could use a description of what the scopes are


pkg/sql/opt/optbuilder/mutation_builder.go, line 820 at r3 (raw file):

// should be projected.
func (mb *mutationBuilder) projectPartialIndexCols(
	putScope *scope, delScope *scope, projectCols partialIndexProjectColumns,

An alternative here would be to provide three variants (projectPartialIndex[Put|Del|PutAndDel]Cols) and rename this to projectPartialIndexColsImpl. The variants would check for nil scopes, and Impl could just check them against nil instead of using partialIndexProjectColumns.

@mgartner mgartner force-pushed the 57085-fk-partial-index-fix branch from 99dd2be to f06aeaa Compare December 1, 2020 01:04
Copy link
Collaborator Author

@mgartner mgartner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @RaduBerinde and @rytaft)


pkg/sql/opt/optbuilder/mutation_builder.go, line 797 at r3 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

[nit] project, -> project:

Remove this type entirely.


pkg/sql/opt/optbuilder/mutation_builder.go, line 798 at r3 (raw file):

Previously, rytaft (Rebecca Taft) wrote…

[nit] to be project -> to be projected

Removed.


pkg/sql/opt/optbuilder/mutation_builder.go, line 806 at r3 (raw file):

Previously, RaduBerinde wrote…

[nit] putAndDelCols partialIndexProjectColumns = ..

Removed this const entirely.


pkg/sql/opt/optbuilder/mutation_builder.go, line 811 at r3 (raw file):

Previously, RaduBerinde wrote…

[nit] maybe just Has is a better name

Removed this function entirely.


pkg/sql/opt/optbuilder/mutation_builder.go, line 817 at r3 (raw file):

Previously, RaduBerinde wrote…

[nit] could use a description of what the scopes are

Done.


pkg/sql/opt/optbuilder/mutation_builder.go, line 820 at r3 (raw file):

Previously, RaduBerinde wrote…

An alternative here would be to provide three variants (projectPartialIndex[Put|Del|PutAndDel]Cols) and rename this to projectPartialIndexColsImpl. The variants would check for nil scopes, and Impl could just check them against nil instead of using partialIndexProjectColumns.

I love it. Done.

Copy link
Member

@RaduBerinde RaduBerinde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 13 of 18 files at r3, 5 of 5 files at r4.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (and 1 stale) (waiting on @mgartner, @RaduBerinde, and @rytaft)


pkg/sql/opt/optbuilder/mutation_builder.go, line 811 at r4 (raw file):

// projectPartialIndexDelCols builds a Project that synthesizes boolean PUT
// columns for each partial index defined on the target table. See
// partialIndexPutColIDs for more info on these columns.

[nit] DelColIDs


pkg/sql/opt/optbuilder/mutation_builder.go, line 837 at r4 (raw file):

	}
	if delScope == nil {
		panic(errors.AssertionFailedf("cannot project partial index PUT columns with nil scope"))

DEL

Previously, the optimizer was not synthesizing partial index DEL columns
for FK cascading updates and deletes. As a result, a cascading `UPDATE`
could corrupt a child table's partial index, ultimately resulting in
incorrect query results. A cascading `DELETE` would not corrupt
partial indexes, but unnecessary `DEL` operations would be issued on
the partial index.

The optbuilder has been refactored so that these columns are correctly
projected. There are now three functions for projecting PUT columns, DEL
columns, and both PUT and DEL columns, each ensuring that the input
scopes are non-nil. These three functions are called from principal
functions in the optbuilder where CHECK constraint columns are also
projected, like `mutationBuilder.buildUpdate`. In theory this should
make it harder in the future to omit these necessary projections.

Additionally, the execution engine was unable to handle extraneous
columns that can be added as input to FK cascading updates. These
extraneous columns would be incorrectly interpreted as synthesized
partial index columns. This commit works around this issue by slicing
the source values with an upper bound in `updateNode.processSourceRow`.
The longer term fix is to not produce these columns (see issue cockroachdb#57097).

Fixes cockroachdb#57085
Fixes cockroachdb#57084

Release justification: This is a critical bug fix to a new feature,
partial indexes.

Release note (bug fix): A bug has been fixed that caused errors or
corrupted partial indexes of child tables in foreign key relationships
with cascading `UPDATE`s and `DELETE`s. The corrupt partial indexes
could result in incorrect query results. Any partial indexes on child
tables of foreign key relationships with `ON DELETE CASCADE` or `ON
UPDATE CASCADE` actions may be corrupt and should be dropped and
re-created. This bug was introduce in version 20.2.
@mgartner mgartner force-pushed the 57085-fk-partial-index-fix branch from f06aeaa to fb857a1 Compare December 1, 2020 17:42
Copy link
Collaborator Author

@mgartner mgartner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (and 2 stale) (waiting on @RaduBerinde and @rytaft)


pkg/sql/opt/optbuilder/mutation_builder.go, line 811 at r4 (raw file):

Previously, RaduBerinde wrote…

[nit] DelColIDs

Done.


pkg/sql/opt/optbuilder/mutation_builder.go, line 837 at r4 (raw file):

Previously, RaduBerinde wrote…

DEL

Done. Fixed the one above in projectPartialIndexDelCols too.

@mgartner
Copy link
Collaborator Author

mgartner commented Dec 1, 2020

TFTRs!

bors r+

@craig
Copy link
Contributor

craig bot commented Dec 1, 2020

Build succeeded:

@craig craig bot merged commit 25a35af into cockroachdb:master Dec 1, 2020
@mgartner mgartner deleted the 57085-fk-partial-index-fix branch December 1, 2020 21:39
@rafiss rafiss added this to the 20.2 milestone Apr 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants