diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-05-09 01:44:19 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-05-09 01:44:19 +0300 |
| commit | 33fd67aad42c81ae224fde1dfdc6bda5e8153fcf (patch) | |
| tree | 48d3cce71983d44b8c46d8678d8e414a62b58753 | |
| parent | 882a2746a10f3c8ba094488d150f7361338659fb (diff) | |
| parent | e6ff2e86ae747c101aba5238c6fb1c6f2d15b7b8 (diff) | |
Merge branch 'jc-use-perl-regexp' into 'master'
Use --perl-regexp for code search
See merge request gitlab-org/gitaly!1241
| -rw-r--r-- | changelogs/unreleased/jc-use-perl-regexp.yml | 5 | ||||
| -rw-r--r-- | internal/service/repository/search_files.go | 2 | ||||
| -rw-r--r-- | internal/service/repository/search_files_test.go | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/changelogs/unreleased/jc-use-perl-regexp.yml b/changelogs/unreleased/jc-use-perl-regexp.yml new file mode 100644 index 000000000..141217302 --- /dev/null +++ b/changelogs/unreleased/jc-use-perl-regexp.yml @@ -0,0 +1,5 @@ +--- +title: Use --perl-regexp for code search +merge_request: 1241 +author: +type: performance diff --git a/internal/service/repository/search_files.go b/internal/service/repository/search_files.go index 31a9f8efa..8865e0b56 100644 --- a/internal/service/repository/search_files.go +++ b/internal/service/repository/search_files.go @@ -38,7 +38,7 @@ func (s *server) SearchFilesByContent(req *gitalypb.SearchFilesByContentRequest, "--null", "--before-context", surroundContext, "--after-context", surroundContext, - "--extended-regexp", + "--perl-regexp", "-e", // next arg is pattern, keep this last req.GetQuery(), string(req.GetRef()), diff --git a/internal/service/repository/search_files_test.go b/internal/service/repository/search_files_test.go index 28ea0f203..b2d217c60 100644 --- a/internal/service/repository/search_files_test.go +++ b/internal/service/repository/search_files_test.go @@ -118,6 +118,12 @@ func TestSearchFilesByContentSuccessful(t *testing.T) { ref: "many_files", output: [][]byte{}, }, + { + desc: "with regexp limiter only recognized by pcre", + query: "(*LIMIT_MATCH=1)foobar", + ref: "many_files", + output: contentOutputLines, + }, } for _, tc := range testCases { |