fix(chstorage): properly negate matchers

go-faster · Jun 7, 2024 · a62d8ad · a62d8ad
1 parent f75bd30
commit a62d8ad
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/chstorage/querier_logs.go b/internal/chstorage/querier_logs.go
@@ -353,7 +353,7 @@ func (q *Querier) Series(ctx context.Context, opts logstorage.SeriesOptions) (re
 		for _, sel := range sels {
 			selExprs := make([]chsql.Expr, 0, len(sel.Matchers))
 			for _, m := range sel.Matchers {
-				expr, err := q.logqlLabelMatcher(m, mapping)
+				expr, err := q.logQLLabelMatcher(m, mapping)
 				if err != nil {
 					return result, err
 				}

diff --git a/internal/chstorage/querier_logs_query.go b/internal/chstorage/querier_logs_query.go
@@ -317,7 +317,7 @@ func (p logQueryPredicates) write(
 		chsql.InTimeRange("timestamp", p.Start, p.End),
 	)
 	for _, m := range p.Labels {
-		expr, err := q.logqlLabelMatcher(m, mapping)
+		expr, err := q.logQLLabelMatcher(m, mapping)
 		if err != nil {
 			return err
 		}
@@ -335,7 +335,7 @@ func (p logQueryPredicates) write(
 
 func (q *Querier) lineFilter(m logql.LineFilter) (e chsql.Expr, rerr error) {
 	defer func() {
-		if rerr != nil {
+		if rerr == nil {
 			switch m.Op {
 			case logql.OpNotEq, logql.OpNotRe:
 				e = chsql.Not(e)
@@ -367,12 +367,12 @@ func (q *Querier) lineFilter(m logql.LineFilter) (e chsql.Expr, rerr error) {
 	}
 }
 
-func (q *Querier) logqlLabelMatcher(
+func (q *Querier) logQLLabelMatcher(
 	m logql.LabelMatcher,
 	mapping map[string]string,
 ) (e chsql.Expr, rerr error) {
 	defer func() {
-		if rerr != nil {
+		if rerr == nil {
 			switch m.Op {
 			case logql.OpNotEq, logql.OpNotRe:
 				e = chsql.Not(e)

diff --git a/internal/chstorage/querier_metrics.go b/internal/chstorage/querier_metrics.go
@@ -184,7 +184,7 @@ func (p *promQuerier) LabelNames(ctx context.Context, matchers ...*labels.Matche
 
 func promQLLabelMatcher(valueSel []chsql.Expr, typ labels.MatchType, value string) (e chsql.Expr, rerr error) {
 	defer func() {
-		if rerr != nil {
+		if rerr == nil {
 			switch typ {
 			case labels.MatchNotEqual, labels.MatchNotRegexp:
 				e = chsql.Not(e)