Allow math functions to be used in the condition

influxdata · Apr 10, 2018 · 1f9227e · 1f9227e
1 parent 529c028
commit 1f9227e
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 15 deletions.
diff --git a/tsdb/engine/tsm1/iterator.gen.go b/tsdb/engine/tsm1/iterator.gen.go
@@ -270,7 +270,13 @@ func (itr *floatIterator) Next() (*query.FloatPoint, error) {
 		}
 
 		// Evaluate condition, if one exists. Retry if it fails.
-		if itr.opt.Condition != nil && !influxql.EvalBool(itr.opt.Condition, itr.m) {
+		valuer := influxql.ValuerEval{
+			Valuer: influxql.MultiValuer(
+				query.MathValuer{},
+				influxql.MapValuer(itr.m),
+			),
+		}
+		if itr.opt.Condition != nil && !valuer.EvalBool(itr.opt.Condition) {
 			continue
 		}
 
@@ -742,7 +748,13 @@ func (itr *integerIterator) Next() (*query.IntegerPoint, error) {
 		}
 
 		// Evaluate condition, if one exists. Retry if it fails.
-		if itr.opt.Condition != nil && !influxql.EvalBool(itr.opt.Condition, itr.m) {
+		valuer := influxql.ValuerEval{
+			Valuer: influxql.MultiValuer(
+				query.MathValuer{},
+				influxql.MapValuer(itr.m),
+			),
+		}
+		if itr.opt.Condition != nil && !valuer.EvalBool(itr.opt.Condition) {
 			continue
 		}
 
@@ -1214,7 +1226,13 @@ func (itr *unsignedIterator) Next() (*query.UnsignedPoint, error) {
 		}
 
 		// Evaluate condition, if one exists. Retry if it fails.
-		if itr.opt.Condition != nil && !influxql.EvalBool(itr.opt.Condition, itr.m) {
+		valuer := influxql.ValuerEval{
+			Valuer: influxql.MultiValuer(
+				query.MathValuer{},
+				influxql.MapValuer(itr.m),
+			),
+		}
+		if itr.opt.Condition != nil && !valuer.EvalBool(itr.opt.Condition) {
 			continue
 		}
 
@@ -1686,7 +1704,13 @@ func (itr *stringIterator) Next() (*query.StringPoint, error) {
 		}
 
 		// Evaluate condition, if one exists. Retry if it fails.
-		if itr.opt.Condition != nil && !influxql.EvalBool(itr.opt.Condition, itr.m) {
+		valuer := influxql.ValuerEval{
+			Valuer: influxql.MultiValuer(
+				query.MathValuer{},
+				influxql.MapValuer(itr.m),
+			),
+		}
+		if itr.opt.Condition != nil && !valuer.EvalBool(itr.opt.Condition) {
 			continue
 		}
 
@@ -2158,7 +2182,13 @@ func (itr *booleanIterator) Next() (*query.BooleanPoint, error) {
 		}
 
 		// Evaluate condition, if one exists. Retry if it fails.
-		if itr.opt.Condition != nil && !influxql.EvalBool(itr.opt.Condition, itr.m) {
+		valuer := influxql.ValuerEval{
+			Valuer: influxql.MultiValuer(
+				query.MathValuer{},
+				influxql.MapValuer(itr.m),
+			),
+		}
+		if itr.opt.Condition != nil && !valuer.EvalBool(itr.opt.Condition) {
 			continue
 		}
 

diff --git a/tsdb/engine/tsm1/iterator.gen.go.tmpl b/tsdb/engine/tsm1/iterator.gen.go.tmpl
@@ -268,7 +268,13 @@ func (itr *{{.name}}Iterator) Next() (*query.{{.Name}}Point, error) {
 		}
 
 		// Evaluate condition, if one exists. Retry if it fails.
-		if itr.opt.Condition != nil && !influxql.EvalBool(itr.opt.Condition, itr.m) {
+		valuer := influxql.ValuerEval{
+			Valuer: influxql.MultiValuer(
+				query.MathValuer{},
+				influxql.MapValuer(itr.m),
+			),
+		}
+		if itr.opt.Condition != nil && !valuer.EvalBool(itr.opt.Condition) {
 			continue
 		}
 

diff --git a/tsdb/index.go b/tsdb/index.go
@@ -1850,7 +1850,13 @@ func (is IndexSet) seriesByBinaryExprIterator(name []byte, n *influxql.BinaryExp
 	if !ok {
 		key, ok = n.RHS.(*influxql.VarRef)
 		if !ok {
-			return nil, fmt.Errorf("invalid expression: %s", n.String())
+			// This is an expression we do not know how to evaluate. Let the
+			// query engine take care of this.
+			itr, err := is.measurementSeriesIDIterator(name)
+			if err != nil {
+				return nil, err
+			}
+			return newSeriesIDExprIterator(itr, n), nil
 		}
 		value = n.LHS
 	}
@@ -1882,10 +1888,13 @@ func (is IndexSet) seriesByBinaryExprIterator(name []byte, n *influxql.BinaryExp
 	case *influxql.VarRef:
 		return is.seriesByBinaryExprVarRefIterator(name, []byte(key.Val), value, n.Op)
 	default:
-		if n.Op == influxql.NEQ || n.Op == influxql.NEQREGEX {
-			return is.measurementSeriesIDIterator(name)
+		// We do not know how to evaluate this expression so pass it
+		// on to the query engine.
+		itr, err := is.measurementSeriesIDIterator(name)
+		if err != nil {
+			return nil, err
 		}
-		return nil, nil
+		return newSeriesIDExprIterator(itr, n), nil
 	}
 }
 

diff --git a/tsdb/index/inmem/meta.go b/tsdb/index/inmem/meta.go
@@ -632,7 +632,9 @@ func (m *measurement) idsForExpr(n *influxql.BinaryExpr) (seriesIDs, influxql.Ex
 	if !ok {
 		name, ok = n.RHS.(*influxql.VarRef)
 		if !ok {
-			return nil, nil, fmt.Errorf("invalid expression: %s", n.String())
+			// This is an expression we do not know how to evaluate. Let the
+			// query engine take care of this.
+			return m.SeriesIDs(), n, nil
 		}
 		value = n.LHS
 	}
@@ -771,10 +773,9 @@ func (m *measurement) idsForExpr(n *influxql.BinaryExpr) (seriesIDs, influxql.Ex
 		return ids, nil, nil
 	}
 
-	if n.Op == influxql.NEQ || n.Op == influxql.NEQREGEX {
-		return m.SeriesIDs(), nil, nil
-	}
-	return nil, nil, nil
+	// We do not know how to evaluate this expression so pass it
+	// on to the query engine.
+	return m.SeriesIDs(), n, nil
 }
 
 // FilterExprs represents a map of series IDs to filter expressions.