Skip to content

fix(logql): correct OR filter behavior when one side is a TrueFilter #20145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kim-Yukyung wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(logql): correct OR filter behavior when one side is a TrueFilter #20145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions pkg/logql/log/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,11 +307,16 @@ type orFilter struct {

// newOrFilter creates a new filter which matches only if left or right matches.
func newOrFilter(left MatcherFilterer, right MatcherFilterer) MatcherFilterer {
if left == nil || isTrueFilter(left) {
return right
// If either side matches all, OR matches all.
if isTrueFilter(left) || isTrueFilter(right) {
return TrueFilter
}

if right == nil || isTrueFilter(right) {
// nil behaves as false: nil OR X = X.
if left == nil {
return right
}
if right == nil {
return left
}

Expand Down
15 changes: 15 additions & 0 deletions pkg/logql/log/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,21 @@ func Test_TrueFilter(t *testing.T) {
}
}

func Test_OrFilterWithEmptyString(t *testing.T) {
// empty string produces TrueFilter
notfoundFilter := newContainsFilter([]byte("notfound"), false)
emptyFilter := newContainsFilter([]byte(""), false)

// notfound OR "" produces TrueFilter
orFilter := newOrFilter(notfoundFilter, emptyFilter)
require.Equal(t, TrueFilter, orFilter)

// "(notfound|)" contains an empty branch → TrueFilter
regexFilter, err := parseRegexpFilter("(notfound|)", true, false)
require.NoError(t, err)
require.Equal(t, TrueFilter, regexFilter)
}

func Benchmark_LineFilter(b *testing.B) {
b.ReportAllocs()
logline := `level=bar ts=2020-02-22T14:57:59.398312973Z caller=logging.go:44 traceID=2107b6b551458908 msg="GET /buzz (200) 4.599635ms`
Expand Down
Loading