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

Changes to match other tests.

pull/17/head
Todd Persen 2013-10-11 14:31:33 -04:00
parent 8686760860
commit 8212180d50
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/engine/engine.go
View File

@ -364,11 +364,15 @@ func (self *QueryEngine) executeMinQueryWithGroupBy(query *parser.Query, yield f
}
fieldTypes := map[string]*protocol.FieldDefinition_Type{}
duration, ok := groupBy.GetGroupByTime()
duration, err := groupBy.GetGroupByTime()
if err != nil {
return err
}
self.coordinator.DistributeQuery(query, func(series *protocol.Series) error {
var mapper Mapper
mapper, inverse = createValuesToInterface(groupBy, series.Fields)
mapper, inverse, err = createValuesToInterface(groupBy, series.Fields)
var fieldIndex int
for idx, field := range series.Fields {
@ -390,8 +394,8 @@ func (self *QueryEngine) executeMinQueryWithGroupBy(query *parser.Query, yield f
mins[value] = min
}
if ok {
timestamps[value] = getTimestampFromPoint(duration, point)
if duration != nil {
timestamps[value] = getTimestampFromPoint(*duration, point)
} else {
timestamps[value] = point.GetTimestamp()
}