Skip to content

fix: ast left cycular reference result in oom #13501

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
MasslessParticle merged 6 commits into from
Aug 1, 2024
Merged

fix: ast left cycular reference result in oom #13501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4b53c73
ast left cycular reference result in oom
yincongcyincong Jul 12, 2024
af6fde6
update unit test
yincongcyincong Jul 12, 2024
6f91a1e
ast tree
yincongcyincong Jul 12, 2024
8c8b28f
fix ast bug
yincongcyincong Jul 12, 2024
5f40316
remove reflect deepequal
yincongcyincong Jul 13, 2024
177fb7c
Merge branch 'main' into ast_leaf_cycular_reference
MasslessParticle Aug 1, 2024
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
10 changes: 8 additions & 2 deletions pkg/logql/syntax/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,16 +185,22 @@ func (m MultiStageExpr) reorderStages() []StageExpr {
func combineFilters(in []*LineFilterExpr) StageExpr {
result := in[len(in)-1]
for i := len(in) - 2; i >= 0; i-- {
leafNode(result).Left = in[i]
leaf := leafNode(result, in[i])
if leaf != nil {
leaf.Left = in[i]
}
}

return result
}

func leafNode(in *LineFilterExpr) *LineFilterExpr {
func leafNode(in *LineFilterExpr, child *LineFilterExpr) *LineFilterExpr {
current := in
//nolint:revive
for ; current.Left != nil; current = current.Left {
if current == child || current.Left == child {
return nil
}
}
return current
}
Expand Down
21 changes: 21 additions & 0 deletions pkg/logql/syntax/ast_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,3 +1093,24 @@ func TestGroupingString(t *testing.T) {
}
require.Equal(t, " without ()", g.String())
}

func TestCombineFilters(t *testing.T) {
in := []*LineFilterExpr{
{LineFilter: LineFilter{Ty: log.LineMatchEqual, Match: "test1"}},
{LineFilter: LineFilter{Ty: log.LineMatchEqual, Match: "test2"}},
}

var combineFilter StageExpr
for i := 0; i < 2; i++ {
combineFilter = combineFilters(in)
}

current := combineFilter.(*LineFilterExpr)
i := 0
for ; current.Left != nil; current = current.Left {
i++
if i > 2 {
t.Fatalf("left num isn't a correct number")
}
}
}