Skip to content

Conversation

@yuzefovich
Copy link
Member

@yuzefovich yuzefovich commented Dec 22, 2025

Backport 1/1 commits from #159946 on behalf of @yuzefovich.


We just saw a test failure where the stmt didn't respect the statement timeout. The goroutine dump showed that we were evaluating a geo inverted expression in the inverted joiner "read" phase, so this commit adds the cancel checking on each 16th input row (note that this is higher frequency than elsewhere in the row-by-row engine where we check every 128 rows since geo evaluations could be more time-consuming). Note that we could've gone deeper and added the cancellation checks into the geo evaluation functions themselves, but it's not clear whether that's needed.

Fixes: #159671.
Release note: None


Release justification: low-risk bug fix.

We just saw a test failure where the stmt didn't respect the statement
timeout. The goroutine dump showed that we were evaluating a geo inverted
expression in the inverted joiner "read" phase, so this commit adds the
cancel checking on each 16th input row (note that this is higher
frequency than elsewhere in the row-by-row engine where we check every
128 rows since geo evaluations could be more time-consuming). Note that
we could've gone deeper and added the cancellation checks into the geo
evaluation functions themselves, but it's not clear whether that's
needed.

Release note: None
@yuzefovich yuzefovich force-pushed the blathers/backport-release-26.1-159946 branch from f41c7ec to 88f4a5e Compare December 22, 2025 20:53
@yuzefovich yuzefovich requested a review from a team as a code owner December 22, 2025 20:53
@yuzefovich yuzefovich requested review from michae2 and removed request for a team December 22, 2025 20:53
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Dec 22, 2025
@blathers-crl
Copy link

blathers-crl bot commented Dec 22, 2025

Thanks for opening a backport.

Before merging, please confirm that the change does not break backwards compatibility and otherwise complies with the backport policy. Include a brief release justification in the PR description explaining why the backport is appropriate. All backports must be reviewed by the TL for the owning area. While the stricter LTS policy does not yet apply, please exercise judgment and consider gating non-critical changes behind a disabled-by-default feature flag when appropriate.

@blathers-crl blathers-crl bot added backport Label PR's that are backports to older release branches T-sql-queries SQL Queries Team labels Dec 22, 2025
@blathers-crl
Copy link

blathers-crl bot commented Dec 22, 2025

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-sql-queries SQL Queries Team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants