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
9f2cc6df
Commit
9f2cc6df
authored
Aug 30, 2021
by
Stan Hu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upsert_mr_metrics' into 'master'
Use upsert for MR metrics See merge request gitlab-org/gitlab!69240
parents
d411ff5d
6eec5ba5
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
22 deletions
+51
-22
app/models/merge_request.rb
app/models/merge_request.rb
+23
-19
app/models/merge_request/metrics.rb
app/models/merge_request/metrics.rb
+17
-2
config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
...ure_flags/development/use_upsert_query_for_mr_metrics.yml
+8
-0
ee/lib/analytics/merge_request_metrics_refresh.rb
ee/lib/analytics/merge_request_metrics_refresh.rb
+3
-1
No files found.
app/models/merge_request.rb
View file @
9f2cc6df
...
...
@@ -1853,6 +1853,9 @@ class MergeRequest < ApplicationRecord
override
:ensure_metrics
def
ensure_metrics
if
Feature
.
enabled?
(
:use_upsert_query_for_mr_metrics
)
MergeRequest
::
Metrics
.
record!
(
self
)
else
# Backward compatibility: some merge request metrics records will not have target_project_id filled in.
# In that case the first `safe_find_or_create_by` will return false.
# The second finder call will be eliminated in https://gitlab.com/gitlab-org/gitlab/-/issues/233507
...
...
@@ -1874,6 +1877,7 @@ class MergeRequest < ApplicationRecord
association
(
:metrics
).
target
=
metrics_record
end
end
end
def
allows_reviewers?
true
...
...
app/models/merge_request/metrics.rb
View file @
9f2cc6df
...
...
@@ -14,10 +14,25 @@ class MergeRequest::Metrics < ApplicationRecord
scope
:with_valid_time_to_merge
,
->
{
where
(
arel_table
[
:merged_at
].
gt
(
arel_table
[
:created_at
]))
}
scope
:by_target_project
,
->
(
project
)
{
where
(
target_project_id:
project
)
}
def
self
.
time_to_merge_expression
class
<<
self
def
time_to_merge_expression
Arel
.
sql
(
'EXTRACT(epoch FROM SUM(AGE(merge_request_metrics.merged_at, merge_request_metrics.created_at)))'
)
end
def
record!
(
mr
)
sql
=
<<~
SQL
INSERT INTO
#{
self
.
table_name
}
(merge_request_id, target_project_id, updated_at, created_at)
VALUES (
#{
mr
.
id
}
,
#{
mr
.
target_project_id
}
, NOW(), NOW())
ON CONFLICT (merge_request_id)
DO UPDATE SET
target_project_id = EXCLUDED.target_project_id,
updated_at = NOW()
SQL
connection
.
execute
(
sql
)
end
end
private
def
ensure_target_project_id
...
...
config/feature_flags/development/use_upsert_query_for_mr_metrics.yml
0 → 100644
View file @
9f2cc6df
---
name
:
use_upsert_query_for_mr_metrics
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/69240
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/339677
milestone
:
'
14.3'
type
:
development
group
:
group::optimize
default_enabled
:
false
ee/lib/analytics/merge_request_metrics_refresh.rb
View file @
9f2cc6df
...
...
@@ -8,7 +8,9 @@ module Analytics
def
execute
(
force:
false
)
merge_requests
.
each
do
|
mr
|
metrics
=
mr
.
ensure_metrics
mr
.
ensure_metrics
mr
.
reset
# clear already loaded (nil) metrics association
metrics
=
mr
.
metrics
next
if
!
force
&&
metric_already_present?
(
metrics
)
...
...
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