Skip to content

schemaexpr: fix data race in ProcessColumnSet#63921

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
postamar:fix-race-63907
Apr 20, 2021
Merged

schemaexpr: fix data race in ProcessColumnSet#63921
craig[bot] merged 1 commit intocockroachdb:masterfrom
postamar:fix-race-63907

Conversation

@postamar
Copy link
Copy Markdown

This commit fixes a data race introduced by my recent changes tracked
under #63755, involving the generalized use of catalog.Column instead of
descpb.ColumnDescriptor.

Fixes #63907

Release note: None

This commit fixes a data race introduced by my recent changes tracked
under cockroachdb#63755, involving the generalized use of catalog.Column instead of
descpb.ColumnDescriptor.

Fixes cockroachdb#63907

Release note: None
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@postamar postamar mentioned this pull request Apr 20, 2021
@postamar postamar requested review from adityamaru and ajwerner April 20, 2021 13:14
@postamar
Copy link
Copy Markdown
Author

I'll bors as soon as CI passes. Should I forget or be struck by lightning or whatever please don't hesitate to do it in my stead.

Copy link
Copy Markdown
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

LGTM

@postamar
Copy link
Copy Markdown
Author

bors r+

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 20, 2021

Build failed (retrying...):

@adityamaru
Copy link
Copy Markdown
Contributor

bors r+ p=9999 single on

I'm going to try and merge this in its own batch.

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 20, 2021

Already running a review

@adityamaru
Copy link
Copy Markdown
Contributor

bors r-

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 20, 2021

Canceled.

@adityamaru
Copy link
Copy Markdown
Contributor

bors r+ p=9999 single on

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Apr 20, 2021

Build succeeded:

@craig craig bot merged commit 09be4f7 into cockroachdb:master Apr 20, 2021
@postamar postamar deleted the fix-race-63907 branch April 20, 2021 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ccl/importccl: TestImportUserDefinedTypes failed

4 participants