fix bug of not updating map in ContainsSameLabelset

sipian · sipian · commit fc9efa414cd0 · 2018-09-12T23:46:50.000+05:30
Signed-off-by: Harsh Agarwal &lt;cs15btech11019@iith.ac.in&gt;
diff --git a/promql/engine.go b/promql/engine.go
@@ -719,9 +719,6 @@ func (ev *evaluator) rangeEval(f func([]Value, *EvalNodeHelper) Vector, exprs ..
 		// Make the function call.
 		enh.ts = ts
 		result := f(args, enh)
-		if result.ContainsSameLabelset() {
-			panic(fmt.Errorf("vector cannot contain metrics with the same labelset"))
-		}
 		enh.out = result[:0] // Reuse result vector.
 		// If this could be an instant query, shortcut so as not to change sort order.
 		if ev.endTimestamp == ev.startTimestamp {
@@ -730,6 +727,9 @@ func (ev *evaluator) rangeEval(f func([]Value, *EvalNodeHelper) Vector, exprs ..
 				s.Point.T = ts
 				mat[i] = Series{Metric: s.Metric, Points: []Point{s.Point}}
 			}
+			if mat.ContainsSameLabelset() {
+				ev.errorf("vector cannot contain metrics with the same labelset")
+			}
 			return mat
 		}
 		// Add samples in output vector to output series.
@@ -758,6 +758,9 @@ func (ev *evaluator) rangeEval(f func([]Value, *EvalNodeHelper) Vector, exprs ..
 	for _, ss := range seriess {
 		mat = append(mat, ss)
 	}
+	if mat.ContainsSameLabelset() {
+		ev.errorf("vector cannot contain metrics with the same labelset")
+	}
 	return mat
 }
 
@@ -874,9 +877,6 @@ func (ev *evaluator) eval(expr Expr) Value {
 				enh.ts = ts
 				// Make the function call.
 				outVec := e.Func.Call(inArgs, e.Args, enh)
-				if outVec.ContainsSameLabelset() {
-					panic(fmt.Errorf("vector cannot contain metrics with the same labelset"))
-				}
 				enh.out = outVec[:0]
 				if len(outVec) > 0 {
 					ss.Points = append(ss.Points, Point{V: outVec[0].Point.V, T: ts})
@@ -888,6 +888,10 @@ func (ev *evaluator) eval(expr Expr) Value {
 				mat = append(mat, ss)
 			}
 		}
+		if mat.ContainsSameLabelset() {
+			ev.errorf("vector cannot contain metrics with the same labelset")
+		}
+
 		putPointSlice(points)
 		return mat
 
diff --git a/promql/value.go b/promql/value.go
@@ -149,6 +149,8 @@ func (vec Vector) ContainsSameLabelset() bool {
 		hash := s.Metric.Hash()
 		if _, ok := l[hash]; ok {
 			return true
+		} else {
+			l[hash] = struct{}{}
 		}
 	}
 	return false
@@ -182,6 +184,8 @@ func (m Matrix) ContainsSameLabelset() bool {
 		hash := ss.Metric.Hash()
 		if _, ok := l[hash]; ok {
 			return true
+		} else {
+			l[hash] = struct{}{}
 		}
 	}
 	return false

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,8 @@ func (vec Vector) ContainsSameLabelset() bool {`
`149`	`149`	`hash := s.Metric.Hash()`
`150`	`150`	`if _, ok := l[hash]; ok {`
`151`	`151`	`return true`
	`152`	`+ } else {`
	`153`	`+ l[hash] = struct{}{}`
`152`	`154`	`}`
`153`	`155`	`}`
`154`	`156`	`return false`
`@@ -182,6 +184,8 @@ func (m Matrix) ContainsSameLabelset() bool {`
`182`	`184`	`hash := ss.Metric.Hash()`
`183`	`185`	`if _, ok := l[hash]; ok {`
`184`	`186`	`return true`
	`187`	`+ } else {`
	`188`	`+ l[hash] = struct{}{}`
`185`	`189`	`}`
`186`	`190`	`}`
`187`	`191`	`return false`