diff options
author | Junegunn Choi <junegunn.c@gmail.com> | 2015-08-02 14:00:18 +0900 |
---|---|---|
committer | Junegunn Choi <junegunn.c@gmail.com> | 2015-08-02 14:00:18 +0900 |
commit | 0ea66329b84cc6e4f8ff61ee99c00bb238070247 (patch) | |
tree | 72c3bc62ec491246390b56b2aac5b33645839503 /src/pattern_test.go | |
parent | 634670e3ea51a2fa1498a3de0c074b819828e2d8 (diff) |
Performance tuning - eager rune array conversion
> wc -l /tmp/list2
2594098 /tmp/list2
> time cat /tmp/list2 | fzf-0.10.1-darwin_amd64 -fqwerty > /dev/null
real 0m5.418s
user 0m10.990s
sys 0m1.302s
> time cat /tmp/list2 | fzf-head -fqwerty > /dev/null
real 0m4.862s
user 0m6.619s
sys 0m0.982s
Diffstat (limited to 'src/pattern_test.go')
-rw-r--r-- | src/pattern_test.go | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/src/pattern_test.go b/src/pattern_test.go index fe6561c1..8134cdc0 100644 --- a/src/pattern_test.go +++ b/src/pattern_test.go @@ -1,6 +1,7 @@ package fzf import ( + "reflect" "testing" "github.com/junegunn/fzf/src/algo" @@ -59,8 +60,8 @@ func TestExact(t *testing.T) { clearPatternCache() pattern := BuildPattern(ModeExtended, CaseSmart, []Range{}, nil, []rune("'abc")) - runes := []rune("aabbcc abc") - sidx, eidx := algo.ExactMatchNaive(pattern.caseSensitive, &runes, pattern.terms[0].text) + sidx, eidx := algo.ExactMatchNaive( + pattern.caseSensitive, []rune("aabbcc abc"), pattern.terms[0].text) if sidx != 7 || eidx != 10 { t.Errorf("%s / %d / %d", pattern.terms, sidx, eidx) } @@ -72,8 +73,8 @@ func TestEqual(t *testing.T) { pattern := BuildPattern(ModeExtended, CaseSmart, []Range{}, nil, []rune("^AbC$")) match := func(str string, sidxExpected int, eidxExpected int) { - runes := []rune(str) - sidx, eidx := algo.EqualMatch(pattern.caseSensitive, &runes, pattern.terms[0].text) + sidx, eidx := algo.EqualMatch( + pattern.caseSensitive, []rune(str), pattern.terms[0].text) if sidx != sidxExpected || eidx != eidxExpected { t.Errorf("%s / %d / %d", pattern.terms, sidx, eidx) } @@ -108,25 +109,23 @@ func TestCaseSensitivity(t *testing.T) { } func TestOrigTextAndTransformed(t *testing.T) { - strptr := func(str string) *string { - return &str - } pattern := BuildPattern(ModeExtended, CaseSmart, []Range{}, nil, []rune("jg")) - tokens := Tokenize(strptr("junegunn"), nil) + tokens := Tokenize([]rune("junegunn"), nil) trans := Transform(tokens, []Range{Range{1, 1}}) + origRunes := []rune("junegunn.choi") for _, mode := range []Mode{ModeFuzzy, ModeExtended} { chunk := Chunk{ &Item{ - text: strptr("junegunn"), - origText: strptr("junegunn.choi"), + text: []rune("junegunn"), + origText: &origRunes, transformed: trans}, } pattern.mode = mode matches := pattern.matchChunk(&chunk) - if *matches[0].text != "junegunn" || *matches[0].origText != "junegunn.choi" || + if string(matches[0].text) != "junegunn" || string(*matches[0].origText) != "junegunn.choi" || matches[0].offsets[0][0] != 0 || matches[0].offsets[0][1] != 5 || - matches[0].transformed != trans { + !reflect.DeepEqual(matches[0].transformed, trans) { t.Error("Invalid match result", matches) } } |