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

Merge pull request #1196 from influxdata/sgc-fix-panic 

Fix panic when performing filters on value data
pull/10616/head
Stuart Carnie 2018-10-25 15:28:57 -07:00 committed by GitHub
parent f82eeb8338 49c3ea786f
commit bbe73b5cc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,9 +40,12 @@ func (c *floatArrayFilterCursor) reset(cur cursors.FloatArrayCursor) {
func (c *floatArrayFilterCursor) Next() *cursors.FloatArray {
pos := 0
c.res.Timestamps = c.res.Timestamps[:cap(c.res.Timestamps)]
c.res.Values = c.res.Values[:cap(c.res.Values)]
var a *cursors.FloatArray
if a.Len() > 0 {
if c.tmp.Len() > 0 {
a = c.tmp
c.tmp.Timestamps = nil
c.tmp.Values = nil
@ -253,9 +256,12 @@ func (c *integerArrayFilterCursor) reset(cur cursors.IntegerArrayCursor) {
func (c *integerArrayFilterCursor) Next() *cursors.IntegerArray {
pos := 0
c.res.Timestamps = c.res.Timestamps[:cap(c.res.Timestamps)]
c.res.Values = c.res.Values[:cap(c.res.Values)]
var a *cursors.IntegerArray
if a.Len() > 0 {
if c.tmp.Len() > 0 {
a = c.tmp
c.tmp.Timestamps = nil
c.tmp.Values = nil
@ -466,9 +472,12 @@ func (c *unsignedArrayFilterCursor) reset(cur cursors.UnsignedArrayCursor) {
func (c *unsignedArrayFilterCursor) Next() *cursors.UnsignedArray {
pos := 0
c.res.Timestamps = c.res.Timestamps[:cap(c.res.Timestamps)]
c.res.Values = c.res.Values[:cap(c.res.Values)]
var a *cursors.UnsignedArray
if a.Len() > 0 {
if c.tmp.Len() > 0 {
a = c.tmp
c.tmp.Timestamps = nil
c.tmp.Values = nil
@ -679,9 +688,12 @@ func (c *stringArrayFilterCursor) reset(cur cursors.StringArrayCursor) {
func (c *stringArrayFilterCursor) Next() *cursors.StringArray {
pos := 0
c.res.Timestamps = c.res.Timestamps[:cap(c.res.Timestamps)]
c.res.Values = c.res.Values[:cap(c.res.Values)]
var a *cursors.StringArray
if a.Len() > 0 {
if c.tmp.Len() > 0 {
a = c.tmp
c.tmp.Timestamps = nil
c.tmp.Values = nil
@ -854,9 +866,12 @@ func (c *booleanArrayFilterCursor) reset(cur cursors.BooleanArrayCursor) {
func (c *booleanArrayFilterCursor) Next() *cursors.BooleanArray {
pos := 0
c.res.Timestamps = c.res.Timestamps[:cap(c.res.Timestamps)]
c.res.Values = c.res.Values[:cap(c.res.Values)]
var a *cursors.BooleanArray
if a.Len() > 0 {
if c.tmp.Len() > 0 {
a = c.tmp
c.tmp.Timestamps = nil
c.tmp.Values = nil

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

@ -39,9 +39,12 @@ func (c *{{$type}}) reset(cur cursors.{{.Name}}ArrayCursor) {
func (c *{{$type}}) Next() {{$arrayType}} {
pos := 0
c.res.Timestamps = c.res.Timestamps[:cap(c.res.Timestamps)]
c.res.Values = c.res.Values[:cap(c.res.Values)]
var a {{$arrayType}}
if a.Len() > 0 {
if c.tmp.Len() > 0 {
a = c.tmp
c.tmp.Timestamps = nil
c.tmp.Values = nil