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

Use the timezone when evaluating time literals in subqueries

pull/13540/head
Jonathan A. Sternberg 2019-04-17 15:59:10 -05:00
parent c53b649d99
commit 65b6b1dbb0
No known key found for this signature in database
GPG Key ID: 4A0C1200CB8B9D2E
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
query/iterator.go
View File

@ -714,7 +714,8 @@ func newIteratorOptionsSubstatement(ctx context.Context, stmt *influxql.SelectSt
subOpt.InterruptCh = opt.InterruptCh
// Extract the time range and condition from the condition.
cond, t, err := influxql.ConditionExpr(stmt.Condition, nil)
valuer := &influxql.NowValuer{Location: stmt.Location}
cond, t, err := influxql.ConditionExpr(stmt.Condition, valuer)
if err != nil {
return IteratorOptions{}, err
}

17
query/subquery_test.go
View File

@ -3,6 +3,7 @@ package query_test
import (
"context"
"testing"
"time"
"github.com/google/go-cmp/cmp"
"github.com/influxdata/influxdb/models"
@ -272,6 +273,22 @@ func TestSubquery(t *testing.T) {
{Time: 30 * Second, Series: query.Series{Name: "cpu"}, Values: []interface{}{float64(8)}},
},
},
{
Name: "TimeZone",
Statement: `SELECT * FROM (SELECT * FROM cpu WHERE time >= '2019-04-17 09:00:00' and time < '2019-04-17 10:00:00' TZ('America/Chicago'))`,
Fields: map[string]influxql.DataType{"value": influxql.Float},
MapShardsFn: func(t *testing.T, tr influxql.TimeRange) CreateIteratorFn {
return func(ctx context.Context, m *influxql.Measurement, opt query.IteratorOptions) query.Iterator {
if got, want := time.Unix(0, opt.StartTime).UTC(), mustParseTime("2019-04-17T14:00:00Z"); !got.Equal(want) {
t.Errorf("unexpected min time: got=%q want=%q", got, want)
}
if got, want := time.Unix(0, opt.EndTime).UTC(), mustParseTime("2019-04-17T15:00:00Z").Add(-1); !got.Equal(want) {
t.Errorf("unexpected max time: got=%q want=%q", got, want)
}
return &FloatIterator{}
}
},
},
} {
t.Run(test.Name, func(t *testing.T) {
shardMapper := ShardMapper{