invertedidx: harden geo code to avoid panicking #154917
Merged
+63
−33
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Previously, we could panic when trying to construnct an inverted expression for a geo type. Such panics are not recovered from by the vectorized panic-catcher (since we haven't allow-listed the package), so it's better to propagate errors explicitly. In particular, this allows us to prevent a crash when trying to evaluate `st_dwithin`-like functions with infinite distance (this hits an error in geos, so now we'll return an error, matching postgres). Release note: None
Member
|
This change is |
mgartner
approved these changes
Oct 7, 2025
Collaborator
mgartner
left a comment
mgartner
left a comment
There was a problem hiding this comment.
@mgartner reviewed 2 of 2 files at r1, all commit messages.
Reviewable status:complete! 1 of 0 LGTMs obtained (waiting on @yuzefovich)
pkg/sql/opt/invertedidx/geo.go line 635 at r1 (raw file):
invExpr, err := getSpanExpr(ctx, d, additionalParams, relationship, index.GeoConfig()) if err != nil { return inverted.NonInvertedColExpression{}, nil
I wonder if the linter will like not returning the error here...
yuzefovich
commented
Oct 7, 2025
Member
Author
yuzefovich
left a comment
yuzefovich
left a comment
There was a problem hiding this comment.
TFTR!
bors r+
Reviewable status:
pkg/sql/opt/invertedidx/geo.go line 635 at r1 (raw file):
Previously, mgartner (Marcus Gartner) wrote…
I wonder if the linter will like not returning the error here...
Looks like it's happy.
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previously, we could panic when trying to construnct an inverted expression for a geo type. Such panics are not recovered from by the vectorized panic-catcher (since we haven't allow-listed the package), so it's better to propagate errors explicitly.
In particular, this allows us to prevent a crash when trying to evaluate
st_dwithin-like functions with infinite distance (this hits an error in geos, so now we'll return an error, matching postgres).Fixes: #151995.
Release note: None