IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 15:27:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

influxdb: fix for adding math query part

Browse Source 
Fixes #8870. Fixes out of bound exception on adding a math query part
when there is no group by interval (or only one query part).
This commit is contained in:
Daniel Lee 2017-07-22 01:31:26 +02:00
parent 1a25b78ef2
commit 4a678c2884
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/plugins/datasource/influxdb/query_part.ts
View File

@ -87,7 +87,7 @@ function addMathStrategy(selectParts, partModel) {
return;
}
// if next to last is math, replace it
if (selectParts[partCount-2].def.type === 'math') {
if (partCount > 1 && selectParts[partCount-2].def.type === 'math') {
selectParts[partCount-2] = partModel;
return;
} else if (selectParts[partCount-1].def.type === 'alias') { // if last is alias add it before

11
public/app/plugins/datasource/influxdb/specs/influx_query_specs.ts
View File

@ -236,6 +236,17 @@ describe('InfluxQuery', function() {
expect(query.target.select[0][2].type).to.be('math');
});
it('should add math when one only query part', function() {
var query = new InfluxQuery({
measurement: 'cpu',
select: [[{type: 'field', params: ['value']}]]
}, templateSrv, {});
query.addSelectPart(query.selectModels[0], 'math');
expect(query.target.select[0].length).to.be(2);
expect(query.target.select[0][1].type).to.be('math');
});
describe('when render adhoc filters', function() {
it('should generate correct query segment', function() {
var query = new InfluxQuery({measurement: 'cpu', }, templateSrv, {});

4
public/app/plugins/datasource/influxdb/specs/query_part_specs.ts
View File

@ -5,7 +5,7 @@ import queryPart from '../query_part';
describe('InfluxQueryPart', () => {
describe('series with mesurement only', () => {
describe('series with measurement only', () => {
it('should handle nested function parts', () => {
var part = queryPart.create({
type: 'derivative',
@ -25,7 +25,7 @@ describe('InfluxQueryPart', () => {
expect(part.render('value')).to.be('spread(value)');
});
it('should handle suffirx parts', () => {
it('should handle suffix parts', () => {
var part = queryPart.create({
type: 'math',
params: ['/ 100'],