Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
49dc8215
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,发现更多精彩内容 >>
提交
49dc8215
编写于
8月 06, 2018
作者:
O
Oswaldo Ferreira
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Avoid N+1 on MRs page when metrics merging date cannot be found
上级
415b2f94
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
89 addition
and
11 deletion
+89
-11
app/models/merge_request.rb
app/models/merge_request.rb
+17
-11
changelogs/unreleased/osw-fix-n-plus-1-for-mrs-without-merge-info.yml
...nreleased/osw-fix-n-plus-1-for-mrs-without-merge-info.yml
+5
-0
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+67
-0
未找到文件。
app/models/merge_request.rb
浏览文件 @
49dc8215
...
...
@@ -1074,23 +1074,29 @@ class MergeRequest < ActiveRecord::Base
def
can_be_reverted?
(
current_user
)
return
false
unless
merge_commit
return
false
unless
merged_at
merged_at
=
metrics
&
.
merged_at
notes_association
=
notes_with_associations
# It is not guaranteed that Note#created_at will be strictly later than
# MergeRequestMetric#merged_at. Nanoseconds on MySQL may break this
# comparison, as will a HA environment if clocks are not *precisely*
# synchronized. Add a minute's leeway to compensate for both possibilities
cutoff
=
merged_at
-
1
.
minute
if
merged_at
# It is not guaranteed that Note#created_at will be strictly later than
# MergeRequestMetric#merged_at. Nanoseconds on MySQL may break this
# comparison, as will a HA environment if clocks are not *precisely*
# synchronized. Add a minute's leeway to compensate for both possibilities
cutoff
=
merged_at
-
1
.
minute
notes_association
=
notes_association
.
where
(
'created_at >= ?'
,
cutoff
)
end
notes_association
=
notes_with_associations
.
where
(
'created_at >= ?'
,
cutoff
)
!
merge_commit
.
has_been_reverted?
(
current_user
,
notes_association
)
end
def
merged_at
strong_memoize
(
:merged_at
)
do
next
unless
merged?
metrics
&
.
merged_at
||
merge_event
&
.
created_at
||
notes
.
system
.
reorder
(
nil
).
find_by
(
note:
'merged'
)
&
.
created_at
end
end
def
can_be_cherry_picked?
merge_commit
.
present?
end
...
...
changelogs/unreleased/osw-fix-n-plus-1-for-mrs-without-merge-info.yml
0 → 100644
浏览文件 @
49dc8215
---
title
:
Avoid N+1 on MRs page when metrics merging date cannot be found
merge_request
:
21053
author
:
type
:
performance
spec/models/merge_request_spec.rb
浏览文件 @
49dc8215
...
...
@@ -1288,6 +1288,16 @@ describe MergeRequest do
project
.
default_branch
==
branch
)
end
context
'but merged at timestamp cannot be found'
do
before
do
allow
(
subject
).
to
receive
(
:merged_at
)
{
nil
}
end
it
'returns false'
do
expect
(
subject
.
can_be_reverted?
(
current_user
)).
to
be_falsey
end
end
context
'when the revert commit is mentioned in a note after the MR was merged'
do
it
'returns false'
do
expect
(
subject
.
can_be_reverted?
(
current_user
)).
to
be_falsey
...
...
@@ -1327,6 +1337,63 @@ describe MergeRequest do
end
end
describe
'#merged_at'
do
context
'when MR is not merged'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
:closed
)
}
it
'returns nil'
do
expect
(
merge_request
.
merged_at
).
to
be_nil
end
end
context
'when metrics has merged_at data'
do
let
(
:merge_request
)
{
create
(
:merge_request
,
:merged
)
}
before
do
merge_request
.
metrics
.
update!
(
merged_at:
1
.
day
.
ago
)
end
it
'returns metrics merged_at'
do
expect
(
merge_request
.
merged_at
).
to
eq
(
merge_request
.
metrics
.
merged_at
)
end
end
context
'when merged event is persisted, but no metrics merged_at is persisted'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:merged
)
}
before
do
EventCreateService
.
new
.
merge_mr
(
merge_request
,
user
)
end
it
'returns merged event creation date'
do
expect
(
merge_request
.
merge_event
).
to
be_persisted
expect
(
merge_request
.
merged_at
).
to
eq
(
merge_request
.
merge_event
.
created_at
)
end
end
context
'when merging note is persisted, but no metrics or merge event exists'
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
,
:merged
)
}
before
do
merge_request
.
metrics
.
destroy!
SystemNoteService
.
change_status
(
merge_request
,
merge_request
.
target_project
,
user
,
merge_request
.
state
,
nil
)
end
it
'returns merging note creation date'
do
expect
(
merge_request
.
reload
.
metrics
).
to
be_nil
expect
(
merge_request
.
merge_event
).
to
be_nil
expect
(
merge_request
.
notes
.
count
).
to
eq
(
1
)
expect
(
merge_request
.
merged_at
).
to
eq
(
merge_request
.
notes
.
first
.
created_at
)
end
end
end
describe
'#participants'
do
let
(
:project
)
{
create
(
:project
,
:public
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录