pr changes

Author: stivenbb

expr/func_filterseries.go

@@ -8,10 +8,10 @@ import (
 )
 
 type FuncFilterSeries struct {
-	in         GraphiteFunc
-	fn         string
-	operator   string
-	threshhold float64
+	in        GraphiteFunc
+	fn        string
+	operator  string
+	threshold float64
 }
 
 func NewFilterSeries() GraphiteFunc {
@@ -23,33 +23,45 @@ func (s *FuncFilterSeries) Signature() ([]Arg, []Arg) {
 		ArgSeriesList{val: &s.in},
 		ArgString{key: "func", val: &s.fn, validator: []Validator{IsConsolFunc}},
 		ArgString{key: "operator", val: &s.operator, validator: []Validator{IsOperator}},
-		ArgFloat{key: "threshhold", val: &s.threshhold},
+		ArgFloat{key: "threshold", val: &s.threshold},
 	}, []Arg{ArgSeriesList{}}
 }
 
 func (s *FuncFilterSeries) Context(context Context) Context {
 	return context
 }
 
-func (s *FuncFilterSeries) operatorFunc(val float64) bool {
-	if math.IsNaN(val) {
-		return true
-	}
+func (s *FuncFilterSeries) getOperatorFunc() func(float64) bool {
 	switch s.operator {
 	case "=":
-		return val == s.threshhold
+		return func(val float64) bool {
+			return val == s.threshold
+		}
+
 	case "!=":
-		return val != s.threshhold
+		return func(val float64) bool {
+			return val != s.threshold
+		}
+
 	case ">":
-		return val > s.threshhold
+		return func(val float64) bool {
+			return val > s.threshold
+		}
 	case ">=":
-		return val >= s.threshhold
+		return func(val float64) bool {
+			return val >= s.threshold
+		}
+
 	case "<":
-		return val < s.threshhold
+		return func(val float64) bool {
+			return math.IsNaN(val) || val < s.threshold
+		}
 	case "<=":
-		return val <= s.threshhold
+		return func(val float64) bool {
+			return math.IsNaN(val) || val <= s.threshold
+		}
 	}
-	return false // should never happen
+	return func(val float64) bool { return false } // should never happen
 }
 
 func (s *FuncFilterSeries) Exec(cache map[Req][]models.Series) ([]models.Series, error) {
@@ -59,10 +71,11 @@ func (s *FuncFilterSeries) Exec(cache map[Req][]models.Series) ([]models.Series,
 	}
 
 	consolidationFunc := consolidation.GetAggFunc(consolidation.FromConsolidateBy(s.fn))
+	operatorFunc := s.getOperatorFunc()
 
 	out := make([]models.Series, 0, len(series))
 	for _, serie := range series {
-		if s.operatorFunc(consolidationFunc(serie.Datapoints)) {
+		if operatorFunc(consolidationFunc(serie.Datapoints)) {
 			out = append(out, serie)
 		}
 	}

expr/func_filterseries_test.go

@@ -286,33 +286,33 @@ func TestFilterSeriesMoreThanOrEqual(t *testing.T) {
 	)
 }
 
-func testFilterSeries(name string, fn string, operator string, threshhold float64, in []models.Series, out []models.Series, t *testing.T) {
+func testFilterSeries(name string, fn string, operator string, threshold float64, in []models.Series, out []models.Series, t *testing.T) {
 	f := NewFilterSeries()
 	f.(*FuncFilterSeries).in = NewMock(in)
 	f.(*FuncFilterSeries).fn = fn
 	f.(*FuncFilterSeries).operator = operator
-	f.(*FuncFilterSeries).threshhold = threshhold
+	f.(*FuncFilterSeries).threshold = threshold
 	gots, err := f.Exec(make(map[Req][]models.Series))
 	if err != nil {
-		t.Fatalf("case %q (%s, %s, %f): err should be nil. got %q", name, fn, operator, threshhold, err)
+		t.Fatalf("case %q (%s, %s, %f): err should be nil. got %q", name, fn, operator, threshold, err)
 	}
 	if len(gots) != len(out) {
-		t.Fatalf("case %q (%s, %s, %f): isNonNull len output expected %d, got %d", name, fn, operator, threshhold, len(out), len(gots))
+		t.Fatalf("case %q (%s, %s, %f): isNonNull len output expected %d, got %d", name, fn, operator, threshold, len(out), len(gots))
 	}
 	for i, g := range gots {
 		exp := out[i]
 		if g.Target != exp.Target {
-			t.Fatalf("case %q (%s, %s, %f): expected target %q, got %q", name, fn, operator, threshhold, exp.Target, g.Target)
+			t.Fatalf("case %q (%s, %s, %f): expected target %q, got %q", name, fn, operator, threshold, exp.Target, g.Target)
 		}
 		if len(g.Datapoints) != len(exp.Datapoints) {
-			t.Fatalf("case %q (%s, %s, %f) len output expected %d, got %d", name, fn, operator, threshhold, len(exp.Datapoints), len(g.Datapoints))
+			t.Fatalf("case %q (%s, %s, %f) len output expected %d, got %d", name, fn, operator, threshold, len(exp.Datapoints), len(g.Datapoints))
 		}
 		for j, p := range g.Datapoints {
 			bothNaN := math.IsNaN(p.Val) && math.IsNaN(exp.Datapoints[j].Val)
 			if (bothNaN || p.Val == exp.Datapoints[j].Val) && p.Ts == exp.Datapoints[j].Ts {
 				continue
 			}
-			t.Fatalf("case %q (%s, %s, %f): output point %d - expected %v got %v", name, fn, operator, threshhold, j, exp.Datapoints[j], p)
+			t.Fatalf("case %q (%s, %s, %f): output point %d - expected %v got %v", name, fn, operator, threshold, j, exp.Datapoints[j], p)
 		}
 	}
 }
@@ -375,7 +375,7 @@ func benchmarkFilterSeries(b *testing.B, numSeries int, fn0, fn1 func() []schema
 		f.(*FuncFilterSeries).in = NewMock(input)
 		f.(*FuncFilterSeries).fn = "sum"
 		f.(*FuncFilterSeries).operator = ">"
-		f.(*FuncFilterSeries).threshhold = rand.Float64()
+		f.(*FuncFilterSeries).threshold = rand.Float64()
 		got, err := f.Exec(make(map[Req][]models.Series))
 		if err != nil {
 			b.Fatalf("%s", err)