Improve LogQL format stages requireLabel #4769
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This only includes required labels. ``` ➜ go test -benchmem -run=^$ -bench ^Benchmark_Pipeline ./pkg/logql/log -v -count 5 > after.txt && benchstat before.txt after.txt name old time/op new time/op delta _Pipeline/pipeline_bytes-16 13.8µs ± 6% 11.5µs ± 1% -16.42% (p=0.008 n=5+5) _Pipeline/pipeline_string-16 13.9µs ± 2% 11.5µs ± 2% -17.27% (p=0.008 n=5+5) _Pipeline/line_extractor_bytes-16 14.0µs ± 4% 11.6µs ± 0% -17.45% (p=0.016 n=5+4) _Pipeline/line_extractor_string-16 13.5µs ± 0% 11.5µs ± 0% -14.67% (p=0.008 n=5+5) _Pipeline/label_extractor_bytes-16 13.7µs ± 1% 11.7µs ± 1% -14.69% (p=0.008 n=5+5) _Pipeline/label_extractor_string-16 14.1µs ±11% 11.6µs ± 0% -17.89% (p=0.008 n=5+5) name old alloc/op new alloc/op delta _Pipeline/pipeline_bytes-16 9.51kB ± 0% 7.50kB ± 0% -21.19% (p=0.008 n=5+5) _Pipeline/pipeline_string-16 9.51kB ± 0% 7.50kB ± 0% -21.19% (p=0.008 n=5+5) _Pipeline/line_extractor_bytes-16 9.51kB ± 0% 7.50kB ± 0% -21.19% (p=0.008 n=5+5) _Pipeline/line_extractor_string-16 9.51kB ± 0% 7.50kB ± 0% ~ (p=0.079 n=4+5) _Pipeline/label_extractor_bytes-16 9.51kB ± 0% 7.50kB ± 0% -21.18% (p=0.008 n=5+5) _Pipeline/label_extractor_string-16 9.51kB ± 0% 7.50kB ± 0% -21.18% (p=0.008 n=5+5) name old allocs/op new allocs/op delta _Pipeline/pipeline_bytes-16 46.0 ± 0% 45.0 ± 0% -2.17% (p=0.008 n=5+5) _Pipeline/pipeline_string-16 46.0 ± 0% 45.0 ± 0% -2.17% (p=0.008 n=5+5) _Pipeline/line_extractor_bytes-16 46.0 ± 0% 45.0 ± 0% -2.17% (p=0.008 n=5+5) _Pipeline/line_extractor_string-16 46.0 ± 0% 45.0 ± 0% -2.17% (p=0.008 n=5+5) _Pipeline/label_extractor_bytes-16 46.0 ± 0% 45.0 ± 0% -2.17% (p=0.008 n=5+5) _Pipeline/label_extractor_string-16 46.0 ± 0% 45.0 ± 0% -2.17% (p=0.008 n=5+5) ``` Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
jeschkies
reviewed
Nov 17, 2021
pkg/logql/log/fmt.go
Outdated
| return nil, fmt.Errorf("invalid line template: %w", err) | ||
| } | ||
| names := uniqueString(listNodeFields([]parse.Node{t.Root})) | ||
| namesMap := make(map[string]struct{}, len(names)) |
There was a problem hiding this comment.
Is this just a hashset? We don't seem to use the values.
There was a problem hiding this comment.
it is. I need more time to think about this PR. It does improve but I think we can do better at source I might just split this PR into 2.
pkg/logql/log/fmt.go
Outdated
Comment on lines
296
to
307
| func (lf *LabelsFormatter) buildModel(lbs *LabelsBuilder) interface{} { | ||
| labels := lbs.Labels() | ||
| model := make(map[string]string, len(lf.requiredLabelNamesMap)) | ||
| if len(lf.requiredLabelNames) > 0 { | ||
| for _, l := range labels { | ||
| if _, ok := lf.requiredLabelNamesMap[l.Name]; ok { | ||
| model[l.Name] = l.Value | ||
| } | ||
| } | ||
| } | ||
| return model | ||
| } |
There was a problem hiding this comment.
This seems to be some code duplication.
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
|
@jeschkies I rollback the buildModel change but kept the new way to compute required node. I'll follow up with a better PR to improve performance later. |
cyriltovena
changed the title
Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
jeschkies
approved these changes
Nov 26, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This only includes required labels.
Also fixes the text/template parsing it was buggy.
Signed-off-by: Cyril Tovena cyril.tovena@gmail.com