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

fix: Continue reading until itrs is empty, even for nil cursors 

Closes #20035
pull/20071/head
Stuart Carnie 2020-11-17 16:59:19 +11:00 committed by Daniel Moran
parent 35227ca887
commit bec12ab1b4
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
storage/reads/array_cursor.gen.go
View File

@ -313,8 +313,10 @@ func (c *floatMultiShardArrayCursor) nextArrayCursor() bool {
var itr cursors.CursorIterator var itr cursors.CursorIterator
var cur cursors.Cursor var cur cursors.Cursor
itr, c.itrs = c.itrs[0], c.itrs[1:] for cur == nil && len(c.itrs) > 0 {
cur, _ = itr.Next(c.ctx, c.req) itr, c.itrs = c.itrs[0], c.itrs[1:]
cur, _ = itr.Next(c.ctx, c.req)
}
var ok bool var ok bool
if cur != nil { if cur != nil {
@ -1190,8 +1192,10 @@ func (c *integerMultiShardArrayCursor) nextArrayCursor() bool {
var itr cursors.CursorIterator var itr cursors.CursorIterator
var cur cursors.Cursor var cur cursors.Cursor
itr, c.itrs = c.itrs[0], c.itrs[1:] for cur == nil && len(c.itrs) > 0 {
cur, _ = itr.Next(c.ctx, c.req) itr, c.itrs = c.itrs[0], c.itrs[1:]
cur, _ = itr.Next(c.ctx, c.req)
}
var ok bool var ok bool
if cur != nil { if cur != nil {
@ -2067,8 +2071,10 @@ func (c *unsignedMultiShardArrayCursor) nextArrayCursor() bool {
var itr cursors.CursorIterator var itr cursors.CursorIterator
var cur cursors.Cursor var cur cursors.Cursor
itr, c.itrs = c.itrs[0], c.itrs[1:] for cur == nil && len(c.itrs) > 0 {
cur, _ = itr.Next(c.ctx, c.req) itr, c.itrs = c.itrs[0], c.itrs[1:]
cur, _ = itr.Next(c.ctx, c.req)
}
var ok bool var ok bool
if cur != nil { if cur != nil {
@ -2944,8 +2950,10 @@ func (c *stringMultiShardArrayCursor) nextArrayCursor() bool {
var itr cursors.CursorIterator var itr cursors.CursorIterator
var cur cursors.Cursor var cur cursors.Cursor
itr, c.itrs = c.itrs[0], c.itrs[1:] for cur == nil && len(c.itrs) > 0 {
cur, _ = itr.Next(c.ctx, c.req) itr, c.itrs = c.itrs[0], c.itrs[1:]
cur, _ = itr.Next(c.ctx, c.req)
}
var ok bool var ok bool
if cur != nil { if cur != nil {
@ -3366,8 +3374,10 @@ func (c *booleanMultiShardArrayCursor) nextArrayCursor() bool {
var itr cursors.CursorIterator var itr cursors.CursorIterator
var cur cursors.Cursor var cur cursors.Cursor
itr, c.itrs = c.itrs[0], c.itrs[1:] for cur == nil && len(c.itrs) > 0 {
cur, _ = itr.Next(c.ctx, c.req) itr, c.itrs = c.itrs[0], c.itrs[1:]
cur, _ = itr.Next(c.ctx, c.req)
}
var ok bool var ok bool
if cur != nil { if cur != nil {

6
storage/reads/array_cursor.gen.go.tmpl
View File

@ -261,8 +261,10 @@ func (c *{{.name}}MultiShardArrayCursor) nextArrayCursor() bool {
var itr cursors.CursorIterator var itr cursors.CursorIterator
var cur cursors.Cursor var cur cursors.Cursor
itr, c.itrs = c.itrs[0], c.itrs[1:] for cur == nil && len(c.itrs) > 0 {
cur, _ = itr.Next(c.ctx, c.req) itr, c.itrs = c.itrs[0], c.itrs[1:]
cur, _ = itr.Next(c.ctx, c.req)
}
var ok bool var ok bool
if cur != nil { if cur != nil {