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
8170384d
Commit
8170384d
authored
Jul 14, 2017
by
Sean McGivern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'revert-
2c879643
' into 'master'"
This reverts merge request !12633
parent
7fbcdfb0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
52 deletions
+4
-52
app/controllers/projects/issues_controller.rb
app/controllers/projects/issues_controller.rb
+1
-1
app/models/concerns/sortable.rb
app/models/concerns/sortable.rb
+0
-23
app/models/project.rb
app/models/project.rb
+3
-3
changelogs/unreleased/dm-drop-default-scope-on-sortable-finders.yml
.../unreleased/dm-drop-default-scope-on-sortable-finders.yml
+0
-4
spec/models/concerns/sortable_spec.rb
spec/models/concerns/sortable_spec.rb
+0
-21
No files found.
app/controllers/projects/issues_controller.rb
View file @
8170384d
...
@@ -227,7 +227,7 @@ class Projects::IssuesController < Projects::ApplicationController
...
@@ -227,7 +227,7 @@ class Projects::IssuesController < Projects::ApplicationController
def
issue
def
issue
return
@issue
if
defined?
(
@issue
)
return
@issue
if
defined?
(
@issue
)
# The Sortable default scope causes performance issues when used with find_by
# The Sortable default scope causes performance issues when used with find_by
@noteable
=
@issue
||=
@project
.
issues
.
find_by!
(
iid:
params
[
:id
])
@noteable
=
@issue
||=
@project
.
issues
.
where
(
iid:
params
[
:id
]).
reorder
(
nil
).
take!
return
render_404
unless
can?
(
current_user
,
:read_issue
,
@issue
)
return
render_404
unless
can?
(
current_user
,
:read_issue
,
@issue
)
...
...
app/models/concerns/sortable.rb
View file @
8170384d
...
@@ -5,25 +5,6 @@
...
@@ -5,25 +5,6 @@
module
Sortable
module
Sortable
extend
ActiveSupport
::
Concern
extend
ActiveSupport
::
Concern
module
DropDefaultScopeOnFinders
# Override these methods to drop the `ORDER BY id DESC` default scope.
# See http://dba.stackexchange.com/a/110919 for why we do this.
%i[find find_by find_by!]
.
each
do
|
meth
|
define_method
meth
do
|*
args
,
&
block
|
return
super
(
*
args
,
&
block
)
if
block
unordered_relation
=
unscope
(
:order
)
# We cannot simply call `meth` on `unscope(:order)`, since that is also
# an instance of the same relation class this module is included into,
# which means we'd get infinite recursion.
# We explicitly use the original implementation to prevent this.
original_impl
=
method
(
__method__
).
super_method
.
unbind
original_impl
.
bind
(
unordered_relation
).
call
(
*
args
)
end
end
end
included
do
included
do
# By default all models should be ordered
# By default all models should be ordered
# by created_at field starting from newest
# by created_at field starting from newest
...
@@ -37,10 +18,6 @@ module Sortable
...
@@ -37,10 +18,6 @@ module Sortable
scope
:order_updated_asc
,
->
{
reorder
(
updated_at: :asc
)
}
scope
:order_updated_asc
,
->
{
reorder
(
updated_at: :asc
)
}
scope
:order_name_asc
,
->
{
reorder
(
name: :asc
)
}
scope
:order_name_asc
,
->
{
reorder
(
name: :asc
)
}
scope
:order_name_desc
,
->
{
reorder
(
name: :desc
)
}
scope
:order_name_desc
,
->
{
reorder
(
name: :desc
)
}
# All queries (relations) on this model are instances of this `relation_klass`.
relation_klass
=
relation_delegate_class
(
ActiveRecord
::
Relation
)
relation_klass
.
prepend
DropDefaultScopeOnFinders
end
end
module
ClassMethods
module
ClassMethods
...
...
app/models/project.rb
View file @
8170384d
...
@@ -845,7 +845,7 @@ class Project < ActiveRecord::Base
...
@@ -845,7 +845,7 @@ class Project < ActiveRecord::Base
end
end
def
ci_service
def
ci_service
@ci_service
||=
ci_services
.
find_by
(
active:
true
)
@ci_service
||=
ci_services
.
reorder
(
nil
).
find_by
(
active:
true
)
end
end
def
deployment_services
def
deployment_services
...
@@ -853,7 +853,7 @@ class Project < ActiveRecord::Base
...
@@ -853,7 +853,7 @@ class Project < ActiveRecord::Base
end
end
def
deployment_service
def
deployment_service
@deployment_service
||=
deployment_services
.
find_by
(
active:
true
)
@deployment_service
||=
deployment_services
.
reorder
(
nil
).
find_by
(
active:
true
)
end
end
def
monitoring_services
def
monitoring_services
...
@@ -861,7 +861,7 @@ class Project < ActiveRecord::Base
...
@@ -861,7 +861,7 @@ class Project < ActiveRecord::Base
end
end
def
monitoring_service
def
monitoring_service
@monitoring_service
||=
monitoring_services
.
find_by
(
active:
true
)
@monitoring_service
||=
monitoring_services
.
reorder
(
nil
).
find_by
(
active:
true
)
end
end
def
jira_tracker?
def
jira_tracker?
...
...
changelogs/unreleased/dm-drop-default-scope-on-sortable-finders.yml
deleted
100644 → 0
View file @
7fbcdfb0
---
title
:
Improve performance of lookups of issues, merge requests etc by dropping unnecessary ORDER BY clause
merge_request
:
author
:
spec/models/concerns/sortable_spec.rb
deleted
100644 → 0
View file @
7fbcdfb0
require
'spec_helper'
describe
Sortable
do
let
(
:relation
)
{
Issue
.
all
}
describe
'#where'
do
it
'orders by id, descending'
do
order_node
=
relation
.
where
(
iid:
1
).
order_values
.
first
expect
(
order_node
).
to
be_a
(
Arel
::
Nodes
::
Descending
)
expect
(
order_node
.
expr
.
name
).
to
eq
(
:id
)
end
end
describe
'#find_by'
do
it
'does not order'
do
expect
(
relation
).
to
receive
(
:unscope
).
with
(
:order
).
and_call_original
relation
.
find_by
(
iid:
1
)
end
end
end
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