Skip to content

Fix compose tests#73312

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rail:compose-ctx
Dec 1, 2021
Merged

Fix compose tests#73312
craig[bot] merged 1 commit intocockroachdb:masterfrom
rail:compose-ctx

Conversation

@rail
Copy link
Copy Markdown
Member

@rail rail commented Nov 30, 2021 •
edited
Loading

In #68608 we upgraded to pgx v4.13, which changed some interface
signatures to accept context.Context. The usage was updated almost
everywhere, except some spots.

This patch also fixes defer usage in a loop.

Release note: None

@rail rail added C-bug Code not up to spec/doc, specs & docs deemed correct. Solution expected to change code/behavior. A-ci Continuous Integration labels Nov 30, 2021
@rail rail requested a review from a team November 30, 2021 19:36
@rail rail self-assigned this Nov 30, 2021
@cockroach-teamcity
Copy link
Copy Markdown
Member

cockroach-teamcity commented Nov 30, 2021

This change is Reviewable

@rail rail force-pushed the compose-ctx branch 4 times, most recently from d9584a5 to e93f906 Compare December 1, 2021 14:32
@rail rail requested a review from rafiss December 1, 2021 19:48
rafiss
rafiss approved these changes Dec 1, 2021
View reviewed changes
Copy link
Copy Markdown
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

thank you for fixing this!

@rail
Copy link
Copy Markdown
Member Author

rail commented Dec 1, 2021

TFTR!
bors r=rafiss

@rail
Copy link
Copy Markdown
Member Author

rail commented Dec 1, 2021

bors cancel

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Dec 1, 2021

Canceled.

@rail
Fix compose tests
08e71be 
In cockroachdb#68608 we upgraded to pgx v4.13, which changed some interface
signatures to accept `context.Context`. The usage was updated almost
everywhere, except some spots.

Release note: None
@rail
Copy link
Copy Markdown
Member Author

rail commented Dec 1, 2021

I changed the way how we close the connection and pushed another version. Rafi gave me an r+ over Slack, so I'll wait for CI and merge it.

@rail
Copy link
Copy Markdown
Member Author

rail commented Dec 1, 2021

bors r=rafiss

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Dec 1, 2021

Build succeeded:

@craig craig bot merged commit 3a371f9 into cockroachdb:master Dec 1, 2021
@blathers-crl blathers-crl bot mentioned this pull request Dec 1, 2021
Merged
@rail rail deleted the compose-ctx branch March 14, 2025 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rafiss rafiss rafiss approved these changes

Assignees

@rail rail

Labels

A-ci Continuous Integration C-bug Code not up to spec/doc, specs & docs deemed correct. Solution expected to change code/behavior.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rail @cockroach-teamcity @rafiss