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

fix: More specific error messages for aggregate errors

pull/10616/head
Nathaniel Cook 2018-07-31 16:58:01 -06:00
parent 217d1d8f66
commit 590b9e61f4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
query/execute/aggregate.go
View File

@ -207,20 +207,20 @@ func (t *aggregateTransformation) Finish(id DatasetID, err error) {
func AppendAggregateTime(srcTime, dstTime string, key query.GroupKey, builder TableBuilder) error {
srcTimeIdx := ColIdx(srcTime, key.Cols())
if srcTimeIdx < 0 {
return fmt.Errorf("timeValue column %q does not exist", srcTime)
return fmt.Errorf("timeSrc column %q does not exist", srcTime)
}
srcTimeCol := key.Cols()[srcTimeIdx]
if srcTimeCol.Type != query.TTime {
return fmt.Errorf("timeValue column %q does not have type time", srcTime)
return fmt.Errorf("timeSrc column %q does not have type time", srcTime)
}
dstTimeIdx := ColIdx(dstTime, builder.Cols())
if dstTimeIdx < 0 {
return fmt.Errorf("timeValue column %q does not exist", dstTime)
return fmt.Errorf("timeDst column %q does not exist", dstTime)
}
dstTimeCol := builder.Cols()[dstTimeIdx]
if dstTimeCol.Type != query.TTime {
return fmt.Errorf("timeValue column %q does not have type time", dstTime)
return fmt.Errorf("timeDst column %q does not have type time", dstTime)
}
builder.AppendTime(dstTimeIdx, key.ValueTime(srcTimeIdx))