Skip to content

Commit 3c62370

Browse files
authored
Fix perf regression for lines counter (#18)
1 parent 81bb71f commit 3c62370

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

cmd/catp/catp/app.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,6 @@ func (r *runner) st(s progress.Status) string {
125125
return res
126126
}
127127

128-
func (r *runner) readFile(rd io.Reader, out io.Writer) {
129-
b := bufio.NewReaderSize(rd, 64*1024)
130-
131-
_, err := io.Copy(out, b)
132-
if err != nil {
133-
log.Fatal(err)
134-
}
135-
}
136-
137128
func (r *runner) scanFile(rd io.Reader, out io.Writer) {
138129
s := bufio.NewScanner(rd)
139130
s.Buffer(make([]byte, 64*1024), 10*1024*1024)
@@ -266,6 +257,7 @@ func (r *runner) cat(filename string) (err error) {
266257

267258
crl.SetBytes(&r.currentBytesUncompressed)
268259
crl.SetLines(&r.currentLines)
260+
crl.SetLines(nil)
269261

270262
rd = crl
271263

@@ -307,11 +299,7 @@ func (r *runner) cat(filename string) (err error) {
307299
})
308300
}
309301

310-
if len(r.pass) > 0 || len(r.skip) > 0 || r.parallel > 1 {
311-
r.scanFile(rd, out)
312-
} else {
313-
r.readFile(rd, out)
314-
}
302+
r.scanFile(rd, out)
315303

316304
if r.parallel <= 1 {
317305
r.pr.Stop()

0 commit comments

Comments
 (0)