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

all tests passing for top

pull/3930/head
Cory LaNou 2015-09-03 15:04:47 -05:00
parent 347ffc70b4
commit 3db5a85139
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
influxql/functions.go
View File

@ -1432,10 +1432,11 @@ func MapTop(itr Iterator, c *Call) interface{} {
collected++
}
}
o := positionOut{callArgs: topCallArgs(c), points: points}
sort.Sort(topMapOut{o})
points = o.points
// If we got more than we needed, sort them and return the top
if collected > needed {
o := positionOut{callArgs: topCallArgs(c), points: points}
sort.Sort(topMapOut{o})
points = o.points[:needed]
}

26
influxql/functions_test.go
View File

@ -18,10 +18,11 @@ type point struct {
}
type testIterator struct {
values []point
lastTags map[string]string
nextFunc func() (timestamp int64, value interface{})
tagsFunc func() map[string]string
values []point
lastTags map[string]string
nextFunc func() (timestamp int64, value interface{})
tagsFunc func() map[string]string
bucketTimeFunc func() int64
}
func (t *testIterator) Next() (timestamp int64, value interface{}) {
@ -45,6 +46,13 @@ func (t *testIterator) Tags() map[string]string {
return t.lastTags
}
func (t *testIterator) BucketTime() int64 {
if t.bucketTimeFunc != nil {
return t.bucketTimeFunc()
}
return -1
}
func TestMapMeanNoValues(t *testing.T) {
iter := &testIterator{}
if got := MapMean(iter); got != nil {
@ -497,19 +505,19 @@ func TestMapTop(t *testing.T) {
call: &Call{Name: "top", Args: []Expr{&VarRef{Val: "field1"}, &NumberLiteral{Val: 2}}},
},
{
name: "int64 - basic with extra tag",
name: "int64 - basic with tag",
iter: &testIterator{
values: []point{
{"", 10, int64(99), map[string]string{"host": "a"}},
{"", 10, int64(53), map[string]string{"host": "b"}},
{"", 20, int64(88), map[string]string{"host": "a"}},
{"", 20, int64(53), map[string]string{"host": "b"}},
{"", 30, int64(88), map[string]string{"host": "a"}},
},
},
exp: positionOut{
callArgs: []string{"host"},
points: PositionPoints{
positionPoint{10, int64(99), map[string]string{"host": "a"}},
positionPoint{20, int64(88), map[string]string{"host": "a"}},
positionPoint{20, int64(53), map[string]string{"host": "b"}},
},
},
call: &Call{Name: "top", Args: []Expr{&VarRef{Val: "field1"}, &VarRef{Val: "host"}, &NumberLiteral{Val: 2}}},
@ -519,7 +527,7 @@ func TestMapTop(t *testing.T) {
iter: &testIterator{
values: []point{
{"", 20, int64(99), map[string]string{"host": "a"}},
{"", 10, int64(53), map[string]string{"host": "b"}},
{"", 10, int64(53), map[string]string{"host": "a"}},
{"", 10, int64(99), map[string]string{"host": "a"}},
},
},