Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
5701ecf0
Commit
5701ecf0
authored
Jul 06, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[EE] Fix some N+1 queries in the GET /projects API
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
0115f8f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
4 deletions
+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
No files found.
lib/api/entities.rb
View file @
5701ecf0
...
...
@@ -572,12 +572,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
View file @
5701ecf0
...
...
@@ -85,9 +85,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
View file @
5701ecf0
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment