Implement floor, ceil, and round functions
parent
ef8f6b71b6
commit
7968e21881
|
@ -1,6 +1,7 @@
|
||||||
package query
|
package query
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"math"
|
"math"
|
||||||
|
|
||||||
"github.com/influxdata/influxql"
|
"github.com/influxdata/influxql"
|
||||||
|
@ -8,7 +9,7 @@ import (
|
||||||
|
|
||||||
func isMathFunction(call *influxql.Call) bool {
|
func isMathFunction(call *influxql.Call) bool {
|
||||||
switch call.Name {
|
switch call.Name {
|
||||||
case "sin", "cos", "tan":
|
case "sin", "cos", "tan", "floor", "ceil", "round":
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
|
@ -24,6 +25,13 @@ func (MathTypeMapper) CallType(name string, args []influxql.DataType) (influxql.
|
||||||
switch name {
|
switch name {
|
||||||
case "sin", "cos", "tan":
|
case "sin", "cos", "tan":
|
||||||
return influxql.Float, nil
|
return influxql.Float, nil
|
||||||
|
case "floor", "ceil", "round":
|
||||||
|
switch args[0] {
|
||||||
|
case influxql.Float, influxql.Integer, influxql.Unsigned, influxql.Unknown:
|
||||||
|
return args[0], nil
|
||||||
|
default:
|
||||||
|
return influxql.Unknown, fmt.Errorf("invalid argument type for first argument in %s(): %s", name, args[0])
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return influxql.Unknown, nil
|
return influxql.Unknown, nil
|
||||||
}
|
}
|
||||||
|
@ -46,6 +54,33 @@ func (v MathValuer) Call(name string, args []interface{}) (interface{}, bool) {
|
||||||
return v.callTrigFunction(math.Cos, arg0)
|
return v.callTrigFunction(math.Cos, arg0)
|
||||||
case "tan":
|
case "tan":
|
||||||
return v.callTrigFunction(math.Tan, arg0)
|
return v.callTrigFunction(math.Tan, arg0)
|
||||||
|
case "floor":
|
||||||
|
switch arg0 := arg0.(type) {
|
||||||
|
case float64:
|
||||||
|
return math.Floor(arg0), true
|
||||||
|
case int64, uint64:
|
||||||
|
return arg0, true
|
||||||
|
default:
|
||||||
|
return nil, true
|
||||||
|
}
|
||||||
|
case "ceil":
|
||||||
|
switch arg0 := arg0.(type) {
|
||||||
|
case float64:
|
||||||
|
return math.Ceil(arg0), true
|
||||||
|
case int64, uint64:
|
||||||
|
return arg0, true
|
||||||
|
default:
|
||||||
|
return nil, true
|
||||||
|
}
|
||||||
|
case "round":
|
||||||
|
switch arg0 := arg0.(type) {
|
||||||
|
case float64:
|
||||||
|
return round(arg0), true
|
||||||
|
case int64, uint64:
|
||||||
|
return arg0, true
|
||||||
|
default:
|
||||||
|
return nil, true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil, false
|
return nil, false
|
||||||
|
@ -63,3 +98,11 @@ func (MathValuer) callTrigFunction(fn func(x float64) float64, arg0 interface{})
|
||||||
}
|
}
|
||||||
return fn(value), true
|
return fn(value), true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func round(x float64) float64 {
|
||||||
|
t := math.Trunc(x)
|
||||||
|
if math.Abs(x-t) >= 0.5 {
|
||||||
|
return t + math.Copysign(1, x)
|
||||||
|
}
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue