Skip to content

fix(query-engine): Fix OR operations being silently dropped #21204

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

Merged
DylanGuedes merged 1 commit into from
Mar 19, 2026
Merged

fix(query-engine): Fix OR operations being silently dropped #21204

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions pkg/engine/internal/planner/logical/planner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,18 +530,29 @@ func convertMatcherType(t labels.MatchType) types.BinaryOp {
}

func convertLineFilterExpr(expr *syntax.LineFilterExpr) Value {
current := convertLineFilter(expr.LineFilter)

if expr.Or != nil {

@trevorwhitney trevorwhitney Mar 19, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this mean we're also missing and operations?

@DylanGuedes DylanGuedes Mar 19, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I replied to Trevor offline but for others following this PR: we somehow don't support and operations in line filters, just labels filters, I was somewhat surprised by that.
current = &BinOp{
Left: current,
Right: convertLineFilterExpr(expr.Or),
Op: types.BinaryOpOr,
}
}

if expr.Left != nil {
op := types.BinaryOpAnd
if expr.IsOrChild {
op = types.BinaryOpOr
}
return &BinOp{
Left: convertLineFilterExpr(expr.Left),
Right: convertLineFilter(expr.LineFilter),
Right: current,
Op: op,
}
}
return convertLineFilter(expr.LineFilter)

return current
}

func convertLineFilter(filter syntax.LineFilter) Value {
Expand Down
104 changes: 92 additions & 12 deletions pkg/engine/internal/planner/logical/planner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,19 +102,21 @@ func TestConvertAST_Success(t *testing.T) {
%6 = OR %4 %5
%7 = MATCH_STR builtin.message "metric.go"
%8 = MATCH_STR builtin.message "foo"
%9 = AND %7 %8
%10 = NOT_MATCH_RE builtin.message "(a|b|c)"
%11 = AND %9 %10
%12 = MAKETABLE [selector=%3, predicates=[%6, %11], shard=0_of_1]
%13 = GTE builtin.timestamp 1970-01-01T01:00:00Z
%14 = SELECT %12 [predicate=%13]
%15 = LT builtin.timestamp 1970-01-01T02:00:00Z
%9 = MATCH_STR builtin.message "bar"
%10 = OR %8 %9
%11 = AND %7 %10
%12 = NOT_MATCH_RE builtin.message "(a|b|c)"
%13 = AND %11 %12
%14 = MAKETABLE [selector=%3, predicates=[%6, %13], shard=0_of_1]
%15 = GTE builtin.timestamp 1970-01-01T01:00:00Z
%16 = SELECT %14 [predicate=%15]
%17 = SELECT %16 [predicate=%6]
%18 = SELECT %17 [predicate=%11]
%19 = TOPK %18 [sort_by=builtin.timestamp, k=1000, asc=false, nulls_first=false]
%20 = LOGQL_COMPAT %19
RETURN %20
%17 = LT builtin.timestamp 1970-01-01T02:00:00Z
%18 = SELECT %16 [predicate=%17]
%19 = SELECT %18 [predicate=%6]
%20 = SELECT %19 [predicate=%13]
%21 = TOPK %20 [sort_by=builtin.timestamp, k=1000, asc=false, nulls_first=false]
%22 = LOGQL_COMPAT %21
RETURN %22
`

require.Equal(t, expected, logicalPlan.String())
Expand All @@ -125,6 +127,84 @@ RETURN %20
t.Logf("\n%s\n", sb.String())
}

func TestConvertAST_LineFilterOr(t *testing.T) {
tests := []struct {
name string
query string
contains []string
}{
{
name: "simple or",
query: `{app="loki"} |= "foo" or "bar"`,
contains: []string{
`MATCH_STR builtin.message "foo"`,
`MATCH_STR builtin.message "bar"`,
"OR %",
},
},
{
name: "or with regex",
query: `{app="loki"} |~ "(?i)abc" or "(?i)def"`,
contains: []string{
`MATCH_RE builtin.message "(?i)abc"`,
`MATCH_RE builtin.message "(?i)def"`,
"OR %",
},
},
{
name: "three-way or",
query: `{app="loki"} |= "a" or "b" or "c"`,
contains: []string{
`MATCH_STR builtin.message "a"`,
`MATCH_STR builtin.message "b"`,
`MATCH_STR builtin.message "c"`,
"OR %",
},
},
{
name: "or preceded by and",
query: `{app="loki"} |= "first" |= "foo" or "bar"`,
contains: []string{
`MATCH_STR builtin.message "first"`,
`MATCH_STR builtin.message "foo"`,
`MATCH_STR builtin.message "bar"`,
"OR %",
"AND %",
},
},
{
name: "negative filter or becomes and",
query: `{app="loki"} != "foo" or "bar"`,
contains: []string{
`NOT_MATCH_STR builtin.message "foo"`,
`NOT_MATCH_STR builtin.message "bar"`,
"AND %",
},
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
q := &query{
statement: tc.query,
start: 3600,
end: 7200,
direction: logproto.BACKWARD,
limit: 1000,
}
plan, err := BuildPlan(context.Background(), q)
require.NoError(t, err)

planStr := plan.String()
t.Logf("\n%s\n", planStr)

for _, substr := range tc.contains {
require.Contains(t, planStr, substr, "plan should contain %q", substr)
}
})
}
}

func TestConvertAST_MetricQuery_Success(t *testing.T) {
t.Run("simple metric query", func(t *testing.T) {
q := &query{
Expand Down
Loading