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

Jump to bottom

Performance tweaks #285

Merged
merged 2 commits into from
Jan 9, 2018
Merged

Performance tweaks #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dde18d1
Avoid extraneous CalcLineCounts
wfleming Jan 9, 2018
ef1160f
gcov: only fetch git head once
wfleming Jan 9, 2018
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
1 change: 0 additions & 1 deletion formatters/cobertura/cobertura.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ func (r Formatter) Format() (formatters.Report, error) {
num++
}
}
sf.CalcLineCounts()
err = rep.AddSourceFile(sf)
if err != nil {
return rep, errors.WithStack(err)
Expand Down
7 changes: 4 additions & 3 deletions formatters/gcov/gcov.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/codeclimate/test-reporter/env"
"github.com/codeclimate/test-reporter/formatters"
"github.com/pkg/errors"
"gopkg.in/src-d/go-git.v4/plumbing/object"
)

// Formatter collects GCov files, parses them, then formats them into a single report.
Expand Down Expand Up @@ -55,8 +56,9 @@ func (f *Formatter) Format() (formatters.Report, error) {
return rep, err
}

gitHead, _ := env.GetHead()
for _, file := range f.FileNames {
sf, err := parseSourceFile(file)
sf, err := parseSourceFile(file, gitHead)
if err != nil {
return rep, errors.WithStack(err)
}
Expand All @@ -70,8 +72,7 @@ func (f *Formatter) Format() (formatters.Report, error) {
}

// Parse a single GCov source file.
func parseSourceFile(fileName string) (formatters.SourceFile, error) {
gitHead, _ := env.GetHead()
func parseSourceFile(fileName string, gitHead *object.Commit) (formatters.SourceFile, error) {
sf, err := formatters.NewSourceFile(fileName, gitHead)
if err != nil {
return sf, errors.WithStack(err)
Expand Down
1 change: 0 additions & 1 deletion formatters/jacoco/jacoco.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func (r Formatter) Format() (formatters.Report, error) {
sf.Coverage = append(sf.Coverage, ni)
num++
}
sf.CalcLineCounts()
err = rep.AddSourceFile(sf)
if err != nil {
return rep, errors.WithStack(err)
Expand Down