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

Fix nil comparison for top/bottom

pull/5929/head
Nathaniel Cook 2016-03-07 15:21:22 -07:00
parent 46fc6e5516
commit 4961a4435b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
influxql/call_iterator.go
View File

@ -672,7 +672,7 @@ func newTopIterator(input Iterator, opt IteratorOptions, n *NumberLiteral, tags
func NewFloatTopReduceSliceFunc(n int, tags []int, interval Interval) FloatReduceSliceFunc { func NewFloatTopReduceSliceFunc(n int, tags []int, interval Interval) FloatReduceSliceFunc {
return func(a []FloatPoint) []FloatPoint { return func(a []FloatPoint) []FloatPoint {
// Filter by tags if they exist. // Filter by tags if they exist.
if tags != nil { if len(tags) > 0 {
a = filterFloatByUniqueTags(a, tags, func(cur, p *FloatPoint) bool { a = filterFloatByUniqueTags(a, tags, func(cur, p *FloatPoint) bool {
return p.Value > cur.Value || (p.Value == cur.Value && p.Time < cur.Time) return p.Value > cur.Value || (p.Value == cur.Value && p.Time < cur.Time)
}) })
@ -718,7 +718,7 @@ func NewFloatTopReduceSliceFunc(n int, tags []int, interval Interval) FloatReduc
func NewIntegerTopReduceSliceFunc(n int, tags []int, interval Interval) IntegerReduceSliceFunc { func NewIntegerTopReduceSliceFunc(n int, tags []int, interval Interval) IntegerReduceSliceFunc {
return func(a []IntegerPoint) []IntegerPoint { return func(a []IntegerPoint) []IntegerPoint {
// Filter by tags if they exist. // Filter by tags if they exist.
if tags != nil { if len(tags) > 0 {
a = filterIntegerByUniqueTags(a, tags, func(cur, p *IntegerPoint) bool { a = filterIntegerByUniqueTags(a, tags, func(cur, p *IntegerPoint) bool {
return p.Value > cur.Value || (p.Value == cur.Value && p.Time < cur.Time) return p.Value > cur.Value || (p.Value == cur.Value && p.Time < cur.Time)
}) })
@ -786,7 +786,7 @@ func newBottomIterator(input Iterator, opt IteratorOptions, n *NumberLiteral, ta
func NewFloatBottomReduceSliceFunc(n int, tags []int, interval Interval) FloatReduceSliceFunc { func NewFloatBottomReduceSliceFunc(n int, tags []int, interval Interval) FloatReduceSliceFunc {
return func(a []FloatPoint) []FloatPoint { return func(a []FloatPoint) []FloatPoint {
// Filter by tags if they exist. // Filter by tags if they exist.
if tags != nil { if len(tags) > 0 {
a = filterFloatByUniqueTags(a, tags, func(cur, p *FloatPoint) bool { a = filterFloatByUniqueTags(a, tags, func(cur, p *FloatPoint) bool {
return p.Value < cur.Value || (p.Value == cur.Value && p.Time < cur.Time) return p.Value < cur.Value || (p.Value == cur.Value && p.Time < cur.Time)
}) })
@ -832,7 +832,7 @@ func NewFloatBottomReduceSliceFunc(n int, tags []int, interval Interval) FloatRe
func NewIntegerBottomReduceSliceFunc(n int, tags []int, interval Interval) IntegerReduceSliceFunc { func NewIntegerBottomReduceSliceFunc(n int, tags []int, interval Interval) IntegerReduceSliceFunc {
return func(a []IntegerPoint) []IntegerPoint { return func(a []IntegerPoint) []IntegerPoint {
// Filter by tags if they exist. // Filter by tags if they exist.
if tags != nil { if len(tags) > 0 {
a = filterIntegerByUniqueTags(a, tags, func(cur, p *IntegerPoint) bool { a = filterIntegerByUniqueTags(a, tags, func(cur, p *IntegerPoint) bool {
return p.Value < cur.Value || (p.Value == cur.Value && p.Time < cur.Time) return p.Value < cur.Value || (p.Value == cur.Value && p.Time < cur.Time)
}) })