Skip to content
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

Disable sharding of count/avg when labels are mutated #5474

Merged
merged 1 commit into from
Feb 25, 2022
Merged

Disable sharding of count/avg when labels are mutated #5474

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
14 changes: 12 additions & 2 deletions pkg/logql/ast.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,8 @@ func (e *LineFilterExpr) String() string {
}

func (e *LineFilterExpr) Filter() (log.Filterer, error) {

acc := make([]log.Filterer, 0)
for curr := e; curr != nil; curr = curr.Left {

switch curr.Op {
case OpFilterIP:
var err error
Expand Down Expand Up @@ -964,6 +962,18 @@ func (e *VectorAggregationExpr) String() string {

// impl SampleExpr
func (e *VectorAggregationExpr) Shardable() bool {
if e.Operation == OpTypeCount || e.Operation == OpTypeAvg {
Copy link
Member

Choose a reason for hiding this comment

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

We really need a way to express operations that aren't always or never shardable, but shardable depending on how they're combined with other operations. This is a great start 👍.

// count is shardable is labels are not mutated
// otherwise distinct values can be counted twice per shard
shardable := true
e.Walk(func(e interface{}) {
switch e.(type) {
case *LabelParserExpr, LabelFmtExpr:
shardable = false
}
})
return shardable
}
return shardableOps[e.Operation] && e.Left.Shardable()
}

Expand Down
1 change: 0 additions & 1 deletion pkg/logql/ast_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,6 @@ func BenchmarkContainsFilter(b *testing.B) {
}
})
}

}

func Test_parserExpr_Parser(t *testing.T) {
Expand Down
8 changes: 8 additions & 0 deletions pkg/logql/shardmapper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,14 @@ func TestMappingStrings(t *testing.T) {
in: `rate({foo="bar"} | json | label_format foo=bar [5m])`,
out: `rate({foo="bar"} | json | label_format foo=bar [5m])`,
},
{
in: `count(rate({foo="bar"} | json [5m]))`,
out: `count(downstream<rate({foo="bar"} | json [5m]), shard=0_of_2> ++ downstream<rate({foo="bar"} | json [5m]), shard=1_of_2>)`,
},
{
in: `avg(rate({foo="bar"} | json [5m]))`,
out: `avg(downstream<rate({foo="bar"} | json [5m]), shard=0_of_2> ++ downstream<rate({foo="bar"} | json [5m]), shard=1_of_2>)`,
},
{
in: `{foo="bar"} |= "id=123"`,
out: `downstream<{foo="bar"}|="id=123", shard=0_of_2> ++ downstream<{foo="bar"}|="id=123", shard=1_of_2>`,
Expand Down