Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'date-parsing' into abs-time

pull/1256/head
Ben Johnson 2014-12-21 11:09:26 -07:00
parent 6a19a8130d bd79d70f50
commit 2aa6612a04
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
influxql/ast.go
View File

@ -1127,8 +1127,11 @@ func TimeRange(expr Expr) (min, max time.Time) {
// Returns zero time if the expression is not a time expression. // Returns zero time if the expression is not a time expression.
func timeExprValue(ref Expr, lit Expr) time.Time { func timeExprValue(ref Expr, lit Expr) time.Time {
if ref, ok := ref.(*VarRef); ok && strings.ToLower(ref.Val) == "time" { if ref, ok := ref.(*VarRef); ok && strings.ToLower(ref.Val) == "time" {
if lit, ok := lit.(*TimeLiteral); ok { switch lit := lit.(type) {
case *TimeLiteral:
return lit.Val return lit.Val
case *DurationLiteral:
return time.Unix(0, int64(lit.Val)).UTC()
} }
} }
return time.Time{} return time.Time{}

3
influxql/ast_test.go
View File

@ -188,6 +188,9 @@ func TestTimeRange(t *testing.T) {
// Min/max crossover // Min/max crossover
{expr: `time >= "2000-01-01 00:00:00" AND time <= "1999-01-01 00:00:00"`, min: `2000-01-01 00:00:00`, max: `1999-01-01 00:00:00`}, {expr: `time >= "2000-01-01 00:00:00" AND time <= "1999-01-01 00:00:00"`, min: `2000-01-01 00:00:00`, max: `1999-01-01 00:00:00`},
// Absolute time
{expr: `time = 1388534400s`, min: `2014-01-01 00:00:00`, max: `2014-01-01 00:00:00`},
// Non-comparative expressions. // Non-comparative expressions.
{expr: `time`, min: `0001-01-01 00:00:00`, max: `0001-01-01 00:00:00`}, {expr: `time`, min: `0001-01-01 00:00:00`, max: `0001-01-01 00:00:00`},
{expr: `time + 2`, min: `0001-01-01 00:00:00`, max: `0001-01-01 00:00:00`}, {expr: `time + 2`, min: `0001-01-01 00:00:00`, max: `0001-01-01 00:00:00`},