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
08ec6881
Commit
08ec6881
authored
Sep 21, 2021
by
Vitali Tatarintev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide decomposed query behind a feature flag
https://gitlab.com/gitlab-org/gitlab/-/issues/341341
parent
4e95bcd8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
146 additions
and
90 deletions
+146
-90
app/finders/ci/pipelines_for_merge_request_finder.rb
app/finders/ci/pipelines_for_merge_request_finder.rb
+40
-4
config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml
...mposed_ci_query_in_pipelines_for_merge_request_finder.yml
+8
-0
spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
+98
-86
No files found.
app/finders/ci/pipelines_for_merge_request_finder.rb
View file @
08ec6881
...
@@ -47,13 +47,49 @@ module Ci
...
@@ -47,13 +47,49 @@ module Ci
private
private
# rubocop: disable CodeReuse/ActiveRecord
def
pipelines_using_cte
sha_relation
=
merge_request
.
all_commits
.
select
(
:sha
).
distinct
cte
=
Gitlab
::
SQL
::
CTE
.
new
(
:shas
,
sha_relation
)
pipelines_for_merge_requests
=
triggered_by_merge_request
pipelines_for_branch
=
filter_by_sha
(
triggered_for_branch
,
cte
)
Ci
::
Pipeline
.
with
(
cte
.
to_arel
)
# rubocop: disable CodeReuse/ActiveRecord
.
from_union
([
pipelines_for_merge_requests
,
pipelines_for_branch
])
end
# rubocop: enable CodeReuse/ActiveRecord
def
filter_by_sha
(
pipelines
,
cte
)
hex
=
Arel
::
Nodes
::
SqlLiteral
.
new
(
"'hex'"
)
string_sha
=
Arel
::
Nodes
::
NamedFunction
.
new
(
'encode'
,
[
cte
.
table
[
:sha
],
hex
])
join_condition
=
string_sha
.
eq
(
Ci
::
Pipeline
.
arel_table
[
:sha
])
filter_by
(
pipelines
,
cte
,
join_condition
)
end
def
filter_by
(
pipelines
,
cte
,
join_condition
)
shas_table
=
Ci
::
Pipeline
.
arel_table
.
join
(
cte
.
table
,
Arel
::
Nodes
::
InnerJoin
)
.
on
(
join_condition
)
.
join_sources
pipelines
.
joins
(
shas_table
)
# rubocop: disable CodeReuse/ActiveRecord
end
def
all_pipelines_for_merge_request
def
all_pipelines_for_merge_request
if
Feature
.
enabled?
(
:decomposed_ci_query_in_pipelines_for_merge_request_finder
,
source_project
,
default_enabled: :yaml
)
pipelines_using_cte
else
shas
=
merge_request
.
all_commit_shas
shas
=
merge_request
.
all_commit_shas
pipelines_for_merge_request
=
triggered_by_merge_request
pipelines_for_merge_request
=
triggered_by_merge_request
pipelines_for_branch
=
triggered_for_branch
.
for_sha
(
shas
)
pipelines_for_branch
=
triggered_for_branch
.
for_sha
(
shas
)
Ci
::
Pipeline
.
from_union
([
pipelines_for_merge_request
,
pipelines_for_branch
])
Ci
::
Pipeline
.
from_union
([
pipelines_for_merge_request
,
pipelines_for_branch
])
end
end
end
# NOTE: this method returns only parent merge request pipelines.
# NOTE: this method returns only parent merge request pipelines.
# Child merge request pipelines have a different source.
# Child merge request pipelines have a different source.
...
...
config/feature_flags/development/decomposed_ci_query_in_pipelines_for_merge_request_finder.yml
0 → 100644
View file @
08ec6881
---
name
:
decomposed_ci_query_in_pipelines_for_merge_request_finder
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68549
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/341341
milestone
:
'
14.4'
type
:
development
group
:
group::pipeline execution
default_enabled
:
false
spec/finders/ci/pipelines_for_merge_request_finder_spec.rb
View file @
08ec6881
...
@@ -134,6 +134,7 @@ RSpec.describe Ci::PipelinesForMergeRequestFinder do
...
@@ -134,6 +134,7 @@ RSpec.describe Ci::PipelinesForMergeRequestFinder do
end
end
end
end
shared_examples
'returns all pipelines for merge request'
do
context
'when pipelines exist for the branch and merge request'
do
context
'when pipelines exist for the branch and merge request'
do
let
(
:source_ref
)
{
'feature'
}
let
(
:source_ref
)
{
'feature'
}
let
(
:target_ref
)
{
'master'
}
let
(
:target_ref
)
{
'master'
}
...
@@ -247,4 +248,15 @@ RSpec.describe Ci::PipelinesForMergeRequestFinder do
...
@@ -247,4 +248,15 @@ RSpec.describe Ci::PipelinesForMergeRequestFinder do
end
end
end
end
end
end
it_behaves_like
'returns all pipelines for merge request'
context
'when `decomposed_ci_query_in_pipelines_for_merge_request_finder` feature flag disabled'
do
before
do
stub_feature_flags
(
decomposed_ci_query_in_pipelines_for_merge_request_finder:
false
)
end
it_behaves_like
'returns all pipelines for merge request'
end
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