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

Merge pull request #6173 from benbjohnson/init-merge-iterator 

Mark MergeIterator as initialized
pull/6174/head
Ben Johnson 2016-03-31 10:10:16 -06:00
parent 63b89b9215 b28c4db3d0
commit 497ff7643c
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
influxql/iterator.gen.go
View File

@ -182,6 +182,7 @@ func (itr *floatMergeIterator) Next() *FloatPoint {
itr.heap.items = append(itr.heap.items, item)
}
heap.Init(itr.heap)
itr.init = true
}
for {
@ -1994,6 +1995,7 @@ func (itr *integerMergeIterator) Next() *IntegerPoint {
itr.heap.items = append(itr.heap.items, item)
}
heap.Init(itr.heap)
itr.init = true
}
for {
@ -3803,6 +3805,7 @@ func (itr *stringMergeIterator) Next() *StringPoint {
itr.heap.items = append(itr.heap.items, item)
}
heap.Init(itr.heap)
itr.init = true
}
for {
@ -5612,6 +5615,7 @@ func (itr *booleanMergeIterator) Next() *BooleanPoint {
itr.heap.items = append(itr.heap.items, item)
}
heap.Init(itr.heap)
itr.init = true
}
for {

1
influxql/iterator.gen.go.tmpl
View File

@ -179,6 +179,7 @@ func (itr *{{$k.name}}MergeIterator) Next() *{{$k.Name}}Point {
itr.heap.items = append(itr.heap.items, item)
}
heap.Init(itr.heap)
itr.init = true
}
for {