diff options
author | Thong Kuah <tkuah@gitlab.com> | 2018-10-29 15:28:36 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2018-12-05 10:16:44 +1300 |
commit | 5bb2814ae6eb45463bb1fa4c5ed5fdd376afa2ca (patch) | |
tree | b8442b8ecaabd9db1e32dfe8fdcebd8ea93c8025 /lib | |
parent | d3866fb48cdf640cd16d48b9825dba2c261a78f3 (diff) | |
download | gitlab-ce-5bb2814ae6eb45463bb1fa4c5ed5fdd376afa2ca.tar.gz |
Deploy to clusters for a project's groups
Look for matching clusters starting from the closest ancestor, then go
up the ancestor tree.
Then use Ruby to get clusters for each group in order. Not that
efficient, considering we will doing up to `NUMBER_OF_ANCESTORS_ALLOWED`
number of queries, but it's a finite number
Explicitly order query by depth
This allows us to control ordering explicitly and also to reverse the
order which is useful to allow us to be consistent with
Clusters::Cluster.on_environment (EE) which does reverse ordering.
Puts querying group clusters behind Feature Flag. Just in case we have
issues with performance, we can easily disable this
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/group_hierarchy.rb | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/gitlab/group_hierarchy.rb b/lib/gitlab/group_hierarchy.rb index c940ea7305e..2502887065f 100644 --- a/lib/gitlab/group_hierarchy.rb +++ b/lib/gitlab/group_hierarchy.rb @@ -45,11 +45,21 @@ module Gitlab # Passing an `upto` will stop the recursion once the specified parent_id is # reached. So all ancestors *lower* than the specified acestor will be # included. - def base_and_ancestors(upto: nil) + # + # Passing an `depth` with either `:asc` or `:desc` will cause the recursive + # query to use a depth column to order by depth (`:asc` returns most nested + # group to root; `desc` returns opposite order). We define 1 as the depth + # for the base and increment as we go up each parent. + # rubocop: disable CodeReuse/ActiveRecord + def base_and_ancestors(upto: nil, depth: nil) return ancestors_base unless Group.supports_nested_groups? - read_only(base_and_ancestors_cte(upto).apply_to(model.all)) + recursive_query = base_and_ancestors_cte(upto, depth).apply_to(model.all) + recursive_query = recursive_query.order(depth: depth) if depth + + read_only(recursive_query) end + # rubocop: enable CodeReuse/ActiveRecord # Returns a relation that includes the descendants_base set of groups # and all their descendants (recursively). @@ -107,16 +117,21 @@ module Gitlab private # rubocop: disable CodeReuse/ActiveRecord - def base_and_ancestors_cte(stop_id = nil) + def base_and_ancestors_cte(stop_id = nil, depth = nil) cte = SQL::RecursiveCTE.new(:base_and_ancestors) - cte << ancestors_base.except(:order) + base_query = ancestors_base.except(:order) + base_query = base_query.select('1 AS depth', groups_table[Arel.star]) if depth + + cte << base_query # Recursively get all the ancestors of the base set. parent_query = model .from([groups_table, cte.table]) .where(groups_table[:id].eq(cte.table[:parent_id])) .except(:order) + + parent_query = parent_query.select(cte.table[:depth] + 1, groups_table[Arel.star]) if depth parent_query = parent_query.where(cte.table[:parent_id].not_eq(stop_id)) if stop_id cte << parent_query |