ts: Fix nil pointer panic on invalid TS query #23764
Merged
Conversation
This file contains 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
|
This change is |
a-robinson
approved these changes
Mar 13, 2018
| @@ -1136,7 +1140,7 @@ func getExtractionFunction(agg tspb.TimeSeriesQueryAggregator) (extractFn, error | |||
| case tspb.TimeSeriesQueryAggregator_MIN: | |||
| return (roachpb.InternalTimeSeriesSample).Minimum, nil | |||
| } | |||
| return nil, errors.Errorf("query specified unknown time series aggregator %s", agg.String()) | |||
| return nil, errors.Errorf("query specified unknown time series downsampler %s", agg.String()) | |||
There was a problem hiding this comment.
It's an existing problem, but the function comments on getExtractionFunction and getDownsampleFunction are incomplete.
There was a problem hiding this comment.
Well, they do return, so at least they're not incorrect! Removed the stub comments, they are unnecessary.
A query which specified an invalid enumeration value for SourceAggregator would cause a nil pointer panic on the server. Repaired this fix and added a test for invalid values of all the enumeration values of the query request. Fixes cockroachdb#23766 Release note: None
mrtracy
force-pushed
the
mtracy/ts_fix_nil_pointer_aggregator
branch
from
c7b84d9 to
f83d2ea
Compare
|
Pretty sure this is related to #23766, fyi |
|
@jordanlewis yes, I actually caused #23766 while working on #23771. I've updated the commit message here to close it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
A query which specified an invalid enumeration value for
SourceAggregator would cause a nil pointer panic on the server.
Repaired this fix and added a test for invalid values of all the
enumeration values of the query request.
Release note: None