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

fix(query/functions/window): Fix window asignment bug

pull/10616/head
Nathaniel Cook 2018-05-29 14:54:16 -06:00
parent a073ff0538
commit ffa065abc2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
query/functions/window.go
View File

@ -250,7 +250,8 @@ func (t *fixedWindowTransformation) Process(id execute.DatasetID, b query.Block)
startColIdx := -1 startColIdx := -1
stopColIdx := -1 stopColIdx := -1
for j, c := range b.Cols() { for j, c := range b.Cols() {
keyed := b.Key().HasCol(c.Label) keyIdx := execute.ColIdx(c.Label, b.Key().Cols())
keyed := keyIdx >= 0
if c.Label == t.startColLabel { if c.Label == t.startColLabel {
startColIdx = j startColIdx = j
keyed = true keyed = true
@ -262,7 +263,7 @@ func (t *fixedWindowTransformation) Process(id execute.DatasetID, b query.Block)
newCols = append(newCols, c) newCols = append(newCols, c)
if keyed { if keyed {
keyCols = append(keyCols, c) keyCols = append(keyCols, c)
keyColMap = append(keyColMap, j) keyColMap = append(keyColMap, keyIdx)
} }
} }
if startColIdx == -1 { if startColIdx == -1 {
@ -273,7 +274,7 @@ func (t *fixedWindowTransformation) Process(id execute.DatasetID, b query.Block)
} }
newCols = append(newCols, c) newCols = append(newCols, c)
keyCols = append(keyCols, c) keyCols = append(keyCols, c)
keyColMap = append(keyColMap, startColIdx) keyColMap = append(keyColMap, len(keyColMap))
} }
if stopColIdx == -1 { if stopColIdx == -1 {
stopColIdx = len(newCols) stopColIdx = len(newCols)
@ -283,7 +284,7 @@ func (t *fixedWindowTransformation) Process(id execute.DatasetID, b query.Block)
} }
newCols = append(newCols, c) newCols = append(newCols, c)
keyCols = append(keyCols, c) keyCols = append(keyCols, c)
keyColMap = append(keyColMap, stopColIdx) keyColMap = append(keyColMap, len(keyColMap))
} }
return b.Do(func(cr query.ColReader) error { return b.Do(func(cr query.ColReader) error {