Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Correct aggregation functionality in charts

Browse source
This commit is contained in:
Naman Mishra 2017-12-05 18:40:07 +05:30
parent 38ba2d4756
commit 568ae3f2ab
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
zeppelin-web/src/app/tabledata/pivot.js
View file

@ -137,8 +137,8 @@ export default class PivotTransformation extends Transformation {
pivot (data, keys, groups, values) {
let aggrFunc = {
sum: function (a, b) {
let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
let varA = (a !== undefined) ? (isNaN(a) ? 0 : parseFloat(a)) : 0
let varB = (b !== undefined) ? (isNaN(b) ? 0 : parseFloat(b)) : 0
return varA + varB
},
count: function (a, b) {
@ -147,22 +147,38 @@ export default class PivotTransformation extends Transformation {
return varA + varB
},
min: function (a, b) {
let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
return Math.min(varA, varB)
let aIsValid = isValidNumber(a)
let bIsValid = isValidNumber(b)
if (!aIsValid) {
return parseFloat(b)
} else if (!bIsValid) {
return parseFloat(a)
} else {
return Math.min(parseFloat(a), parseFloat(b))
}
},
max: function (a, b) {
let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
return Math.max(varA, varB)
let aIsValid = isValidNumber(a)
let bIsValid = isValidNumber(b)
if (!aIsValid) {
return parseFloat(b)
} else if (!bIsValid) {
return parseFloat(a)
} else {
return Math.max(parseFloat(a), parseFloat(b))
}
},
avg: function (a, b, c) {
let varA = (a !== undefined) ? (isNaN(a) ? 1 : parseFloat(a)) : 0
let varB = (b !== undefined) ? (isNaN(b) ? 1 : parseFloat(b)) : 0
let varA = (a !== undefined) ? (isNaN(a) ? 0 : parseFloat(a)) : 0
let varB = (b !== undefined) ? (isNaN(b) ? 0 : parseFloat(b)) : 0
return varA + varB
}
}
let isValidNumber = function(num) {
return num !== undefined && !isNaN(num)
}
let aggrFuncDiv = {
sum: false,
count: false,