Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix raw math query panic #4984

Merged
merged 1 commit into from Dec 4, 2015
Merged

Conversation

mengjinglei
Copy link
Contributor

influxDB will panic when apply math query like:
select value + value from cpu
this pr fix this, in addition, this pr make select value + value from cpu return the correct value

@otoolep
Copy link
Contributor

otoolep commented Dec 4, 2015

This looks good @mengjinglei -- thanks.

Can you sign the CLA? https://influxdb.com/community/cla.html Once you do that we can get this merged.

@otoolep
Copy link
Contributor

otoolep commented Dec 4, 2015

@dgnorton @corylanou

@corylanou
Copy link
Contributor

+1. Great test coverage.

otoolep added a commit that referenced this pull request Dec 4, 2015
@otoolep otoolep merged commit 6fa0164 into influxdata:master Dec 4, 2015
@otoolep
Copy link
Contributor

otoolep commented Dec 4, 2015

Waiting for CLA to be signed before merging.

@otoolep
Copy link
Contributor

otoolep commented Dec 4, 2015

CLA has already been signed.

@mengjinglei
Copy link
Contributor Author

sorry for the late reply, this pr only fix math query without aggregate functions like
select value + value from cpu
but can not handle math query with aggregate functions like
select mean(value) + max(value) from cpu or select min(value) + temperature from cpu
I'm still working on this and will send a pr ASAP, thanks for your updating

@otoolep
Copy link
Contributor

otoolep commented Dec 5, 2015

Great, thanks again @mengjinglei

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.

None yet

3 participants