Reverted the addition of extra function to the ast for #2956.

Accidentally added due to ignorance really.
influxdata · Jun 25, 2015 · 8bb2fc5 · 8bb2fc5
1 parent 956b716
commit 8bb2fc5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/influxql/ast.go b/influxql/ast.go
@@ -949,7 +949,7 @@ func (s *SelectStatement) validateAggregates(tr targetRequirement) error {
 	for _, f := range s.Fields {
 		if c, ok := f.Expr.(*Call); ok {
 			switch c.Name {
-			case "derivative", "non_negative_derivative", "non_integer_derivative":
+			case "derivative", "non_negative_derivative":
 				if min, max, got := 1, 2, len(c.Args); got > max || got < min {
 					return fmt.Errorf("invalid number of arguments for %s, expected at least %d but no more than %d, got %d", c.Name, min, max, got)
 				}

diff --git a/influxql/engine_test.go b/influxql/engine_test.go
@@ -208,7 +208,7 @@ func TestProcessDerivative(t *testing.T) {
 		},
 		{
 			name:     "float derivatives",
-			fn:       "non_integer_derivative",
+			fn:       "derivative",
 			interval: "1d",
 			in: [][]interface{}{
 				[]interface{}{