Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Buffered filter output is significantly faster #133

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

Merged
zix99 merged 3 commits into from
Apr 26, 2025
Merged

Buffered filter output is significantly faster #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4f5e10
Buffered filter output is significantly faster. 12s->3s
zix99 Apr 26, 2025
7352851
Update benchmarks for buffered out
zix99 Apr 26, 2025
1ed569a
Flush after each batch
zix99 Apr 26, 2025
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
28 changes: 18 additions & 10 deletions cmd/filter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"fmt"
"bufio"
"os"

"rare/cmd/helpers"
Expand All @@ -21,36 +21,44 @@ func filterFunction(c *cli.Context) error {
batcher := helpers.BuildBatcherFromArguments(c)
extractor := helpers.BuildExtractorFromArgumentsEx(c, batcher, "\t")

stdout := bufio.NewWriter(os.Stdout)

readChan := extractor.ReadFull()
OUTER_LOOP:
for {
matchBatch, more := <-readChan
if !more {
break
}
for matchBatch := range readChan {
for _, match := range matchBatch {
if writeLines {
fmt.Printf("%s %s: ", color.Wrap(color.BrightGreen, match.Source), color.Wrapi(color.BrightYellow, match.LineNumber))
stdout.WriteString(color.Wrap(color.BrightGreen, match.Source))
stdout.WriteString(" ")
stdout.WriteString(color.Wrapi(color.BrightYellow, match.LineNumber))
stdout.WriteString(": ")
}
if !customExtractor {
if len(match.Indices) == 2 {
// Single match, highlight entire phrase
fmt.Println(color.WrapIndices(match.Line, match.Indices))
stdout.WriteString(color.WrapIndices(match.Line, match.Indices))
} else {
// Multi-match groups, highlight individual groups
fmt.Println(color.WrapIndices(match.Line, match.Indices[2:]))
stdout.WriteString(color.WrapIndices(match.Line, match.Indices[2:]))
}
} else {
fmt.Println(match.Extracted)
stdout.WriteString(match.Extracted)
}
stdout.WriteString("\n")

readLines++
if numLineLimit > 0 && readLines >= numLineLimit {
break OUTER_LOOP
}
}

// Flush after each batch to make file-following work as expected
stdout.Flush()
}

// Final flush
stdout.Flush()

if numLineLimit > 0 {
helpers.FWriteMatchSummary(os.Stderr, readLines, numLineLimit)
os.Stderr.WriteString("\n")
Expand Down
7 changes: 7 additions & 0 deletions cmd/filter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ func TestFilterExtract(t *testing.T) {
assert.Equal(t, "Matched: 3 / 6\n", eout)
}

func TestFilterLine(t *testing.T) {
out, eout, err := testCommandCapture(filterCommand(), `-l -m (\d+) -e "{1}" testdata/log.txt`)
assert.NoError(t, err)
assert.Equal(t, "testdata/log.txt 1: 5\ntestdata/log.txt 2: 22\ntestdata/log.txt 3: 5\n", out)
assert.Equal(t, "Matched: 3 / 6\n", eout)
}

func TestFilterMultiExtract(t *testing.T) {
out, eout, err := testCommandCapture(filterCommand(), `-m (\d+) -e "{1}" -e "b-{1}" testdata/log.txt`)
assert.NoError(t, err)
Expand Down
6 changes: 3 additions & 3 deletions docs/benchmarks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ $ time rare filter -m '" (\d{3})' -e "{1}" -z testdata/*.gz | wc -l
Matched: 8,373,328 / 8,373,328
8373328

real 0m12.550s
user 0m17.833s
sys 0m15.953s
real 0m3.266s
user 0m10.607s
sys 0m0.769s
```

When aggregating data, `rare` is significantly faster than alternatives.
Expand Down
Loading