Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
033acc01
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 搜索 >>
未验证
提交
033acc01
编写于
7月 06, 2017
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some N+1 queries in the GET /projects API
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
050eae8c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
57 addition
and
4 deletion
+57
-4
lib/api/entities.rb
lib/api/entities.rb
+10
-2
lib/api/projects.rb
lib/api/projects.rb
+8
-0
spec/requests/api/projects_spec.rb
spec/requests/api/projects_spec.rb
+39
-2
未找到文件。
lib/api/entities.rb
浏览文件 @
033acc01
...
...
@@ -503,12 +503,20 @@ module API
class
ProjectWithAccess
<
Project
expose
:permissions
do
expose
:project_access
,
using:
Entities
::
ProjectAccess
do
|
project
,
options
|
project
.
project_members
.
find_by
(
user_id:
options
[
:current_user
].
id
)
if
options
.
key?
(
:project_members
)
(
options
[
:project_members
]
||
[]).
find
{
|
member
|
member
.
source_id
==
project
.
id
}
else
project
.
project_members
.
find_by
(
user_id:
options
[
:current_user
].
id
)
end
end
expose
:group_access
,
using:
Entities
::
GroupAccess
do
|
project
,
options
|
if
project
.
group
project
.
group
.
group_members
.
find_by
(
user_id:
options
[
:current_user
].
id
)
if
options
.
key?
(
:group_members
)
(
options
[
:group_members
]
||
[]).
find
{
|
member
|
member
.
source_id
==
project
.
namespace_id
}
else
project
.
group
.
group_members
.
find_by
(
user_id:
options
[
:current_user
].
id
)
end
end
end
end
...
...
lib/api/projects.rb
浏览文件 @
033acc01
...
...
@@ -77,9 +77,17 @@ module API
projects
=
projects
.
with_issues_enabled
if
params
[
:with_issues_enabled
]
projects
=
projects
.
with_merge_requests_enabled
if
params
[
:with_merge_requests_enabled
]
if
current_user
projects
=
projects
.
includes
(
:route
,
:taggings
,
namespace: :route
)
project_members
=
current_user
.
project_members
group_members
=
current_user
.
group_members
end
options
=
options
.
reverse_merge
(
with:
current_user
?
Entities
::
ProjectWithAccess
:
Entities
::
BasicProjectDetails
,
statistics:
params
[
:statistics
],
project_members:
project_members
,
group_members:
group_members
,
current_user:
current_user
)
options
[
:with
]
=
Entities
::
BasicProjectDetails
if
params
[
:simple
]
...
...
spec/requests/api/projects_spec.rb
浏览文件 @
033acc01
...
...
@@ -52,6 +52,24 @@ describe API::Projects do
end
end
shared_examples_for
'projects response without N + 1 queries'
do
it
'avoids N + 1 queries'
do
control_count
=
ActiveRecord
::
QueryRecorder
.
new
do
get
api
(
'/projects'
,
current_user
)
end
.
count
if
defined?
(
additional_project
)
additional_project
else
create
(
:empty_project
,
:public
)
end
expect
do
get
api
(
'/projects'
,
current_user
)
end
.
not_to
exceed_query_limit
(
control_count
+
8
)
end
end
let!
(
:public_project
)
{
create
(
:empty_project
,
:public
,
name:
'public_project'
)
}
before
do
project
...
...
@@ -62,9 +80,13 @@ describe API::Projects do
context
'when unauthenticated'
do
it_behaves_like
'projects response'
do
let
(
:filter
)
{
{}
}
let
(
:filter
)
{
{
search:
project
.
name
}
}
let
(
:current_user
)
{
user
}
let
(
:projects
)
{
[
project
]
}
end
it_behaves_like
'projects response without N + 1 queries'
do
let
(
:current_user
)
{
nil
}
let
(
:projects
)
{
[
public_project
]
}
end
end
...
...
@@ -75,6 +97,21 @@ describe API::Projects do
let
(
:projects
)
{
[
public_project
,
project
,
project2
,
project3
]
}
end
it_behaves_like
'projects response without N + 1 queries'
do
let
(
:current_user
)
{
user
}
end
context
'when some projects are in a group'
do
before
do
create
(
:empty_project
,
:public
,
group:
create
(
:group
))
end
it_behaves_like
'projects response without N + 1 queries'
do
let
(
:current_user
)
{
user
}
let
(
:additional_project
)
{
create
(
:empty_project
,
:public
,
group:
create
(
:group
))
}
end
end
it
'includes the project labels as the tag_list'
do
get
api
(
'/projects'
,
user
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录