remove wrong loop in matchData #785
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -130,21 +130,19 @@ | |
|
|
||
| func (mr MatchedRule) matchData(matchData types.MatchData) string { | ||
| log := &strings.Builder{} | ||
|
There was a problem hiding this comment. Let's restructure this function to something like op := mr.Rule_.Operator()
if op == "" {
log.WriteString("Matched.")
return
}
// Rest of logic |
||
| v := matchData.Variable().Name() | ||
| if matchData.Key() != "" { | ||
| v += fmt.Sprintf(":%s", matchData.Key()) | ||
|
There was a problem hiding this comment. It would be nice to remove the intermediate strings, while it's more lines I guess it's still not so bad. We're basically expanding printf into code, which should be worth it for this very hot path function log.WriteString("Matched Operator ")
log.WriteString(op)
log.WriteString(" matched ")
log.WriteString(value)
log.WriteString(" at ")
log.WriteString(matchData.Variable().Name())
if matchData.Key() != "" {
log.WriteString(":")
log.WriteString(matchData.Key())
}
log.WriteString(".") |
||
| } | ||
| value := matchData.Value() | ||
Hayak3 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| if len(value) > 200 { | ||
| value = value[:200] | ||
| } | ||
| if mr.Rule_.Operator() != "" { | ||
| log.WriteString(fmt.Sprintf("Matched \"Operator %s matched %s at %s.", | ||
|
There was a problem hiding this comment. I wonder if we need the first interpolation here @jptosso There was a problem hiding this comment. Looks like a bug, let's fix it by interpolating the operator There was a problem hiding this comment. BTW I'm wondering whether |
||
| "", value, v)) | ||
| } else { | ||
| log.WriteString("Matched.\"") | ||
| } | ||
| return log.String() | ||
| } | ||
|
|
||
Codecov
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know it's a bit unrelated, but while we're here, can we have this function accept
log *strings.Builderand pass it in from the caller instead of creating a new one?