Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
869696bc
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
869696bc
编写于
11月 08, 2016
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Faster search
上级
e671cd89
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
18 deletion
+33
-18
app/models/repository.rb
app/models/repository.rb
+4
-0
changelogs/unreleased/faster_project_search.yml
changelogs/unreleased/faster_project_search.yml
+4
-0
lib/gitlab/project_search_results.rb
lib/gitlab/project_search_results.rb
+12
-18
spec/models/repository_spec.rb
spec/models/repository_spec.rb
+13
-0
未找到文件。
app/models/repository.rb
浏览文件 @
869696bc
...
...
@@ -1064,6 +1064,10 @@ class Repository
end
def
search_files
(
query
,
ref
)
unless
exists?
&&
has_visible_content?
&&
query
.
present?
return
[]
end
offset
=
2
args
=
%W(
#{
Gitlab
.
config
.
git
.
bin_path
}
grep -i -I -n --before-context
#{
offset
}
--after-context
#{
offset
}
-E -e
#{
Regexp
.
escape
(
query
)
}
#{
ref
||
root_ref
}
)
Gitlab
::
Popen
.
popen
(
args
,
path_to_repo
).
first
.
scrub
.
split
(
/^--$/
)
...
...
changelogs/unreleased/faster_project_search.yml
0 → 100644
浏览文件 @
869696bc
---
title
:
Faster search inside Project
merge_request
:
author
:
lib/gitlab/project_search_results.rb
浏览文件 @
869696bc
...
...
@@ -5,11 +5,7 @@ module Gitlab
def
initialize
(
current_user
,
project
,
query
,
repository_ref
=
nil
)
@current_user
=
current_user
@project
=
project
@repository_ref
=
if
repository_ref
.
present?
repository_ref
else
nil
end
@repository_ref
=
repository_ref
.
presence
@query
=
query
end
...
...
@@ -47,33 +43,31 @@ module Gitlab
private
def
blobs
if
project
.
empty_repo?
||
query
.
blank?
[]
else
project
.
repository
.
search_files
(
query
,
repository_ref
)
end
@blobs
||=
project
.
repository
.
search_files
(
query
,
repository_ref
)
end
def
wiki_blobs
if
project
.
wiki_enabled?
&&
query
.
present?
project_wiki
=
ProjectWiki
.
new
(
project
)
@wiki_blobs
||=
begin
if
project
.
wiki_enabled?
&&
query
.
present?
project_wiki
=
ProjectWiki
.
new
(
project
)
unless
project_wiki
.
empty?
project_wiki
.
search_files
(
query
)
unless
project_wiki
.
empty?
project_wiki
.
search_files
(
query
)
else
[]
end
else
[]
end
else
[]
end
end
def
notes
project
.
notes
.
user
.
search
(
query
,
as_user:
@current_user
).
order
(
'updated_at DESC'
)
@notes
||=
project
.
notes
.
user
.
search
(
query
,
as_user:
@current_user
).
order
(
'updated_at DESC'
)
end
def
commits
project
.
repository
.
find_commits_by_message
(
query
)
@commits
||=
project
.
repository
.
find_commits_by_message
(
query
)
end
def
project_ids_relation
...
...
spec/models/repository_spec.rb
浏览文件 @
869696bc
...
...
@@ -362,6 +362,19 @@ describe Repository, models: true do
expect
(
results
.
first
).
not_to
start_with
(
'fatal:'
)
end
it
'properly handles when query is not present'
do
results
=
repository
.
search_files
(
''
,
'master'
)
expect
(
results
).
to
match_array
([])
end
it
'properly handles query when repo is empty'
do
repository
=
create
(
:empty_project
).
repository
results
=
repository
.
search_files
(
'test'
,
'master'
)
expect
(
results
).
to
match_array
([])
end
describe
'result'
do
subject
{
results
.
first
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录