Merge pull request #1049 from influxdb/fix-988

Fix #988: top/bottom error messages
influxdata · Oct 23, 2014 · 69b2515 · 69b2515
2 parents 06f0798 + 8367a29
commit 69b2515
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/engine/aggregator_operators.go b/engine/aggregator_operators.go
@@ -1508,6 +1508,10 @@ func NewTopOrBottomAggregator(name string, v *parser.Value, isTop bool, defaultV
 		return nil, err
 	}
 
+	if limit < 1 {
+		return nil, common.NewQueryError(common.InvalidArgument, fmt.Sprintf("function %s() second parameter must be > 0", name))
+	}
+
 	return &TopOrBottomAggregator{
 		AbstractAggregator: AbstractAggregator{
 			value: v.Elems[0],