diff options
author | Timothy Andrew <mail@timothyandrew.net> | 2016-09-20 08:44:40 +0300 |
---|---|---|
committer | Timothy Andrew <mail@timothyandrew.net> | 2016-09-20 10:53:14 +0300 |
commit | cebfe053a85c8e376b35101686ba05225c6f4e65 (patch) | |
tree | 9f7062de41dfee954991a695abfd6e78d7467d6f | |
parent | b43214c533ae5942ec4b50c9f32e749b8ca5daae (diff) |
CycleAnalytics operates on merge requests that have been deployed.
1. Look for merge requests (and issues that they close) that have been
deployed to production in the last X days (where X is given by the
`from` parameter).
2. Cycle analytics queries only operate on this fitered set of merge
requests and issues.
-rw-r--r-- | app/models/cycle_analytics.rb | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/app/models/cycle_analytics.rb b/app/models/cycle_analytics.rb index d4f682c4a33..561ddd258db 100644 --- a/app/models/cycle_analytics.rb +++ b/app/models/cycle_analytics.rb @@ -15,63 +15,56 @@ class CycleAnalytics calculate_metric!(:issue, TableReferences.issues[:created_at], [TableReferences.issue_metrics[:first_associated_with_milestone_at], - TableReferences.issue_metrics[:first_added_to_board_at]], - load_merge_requests: false) + TableReferences.issue_metrics[:first_added_to_board_at]]) end def plan calculate_metric!(:plan, [TableReferences.issue_metrics[:first_associated_with_milestone_at], TableReferences.issue_metrics[:first_added_to_board_at]], - TableReferences.issue_metrics[:first_mentioned_in_commit_at], - load_merge_requests: false) + TableReferences.issue_metrics[:first_mentioned_in_commit_at]) end def code calculate_metric!(:code, TableReferences.issue_metrics[:first_mentioned_in_commit_at], - TableReferences.merge_requests[:created_at], - load_merge_requests: true) + TableReferences.merge_requests[:created_at]) end def test calculate_metric!(:test, TableReferences.merge_request_metrics[:latest_build_started_at], - TableReferences.merge_request_metrics[:latest_build_finished_at], - load_merge_requests: true) + TableReferences.merge_request_metrics[:latest_build_finished_at]) end def review calculate_metric!(:review, TableReferences.merge_requests[:created_at], - TableReferences.merge_request_metrics[:merged_at], - load_merge_requests: true) + TableReferences.merge_request_metrics[:merged_at]) end def staging calculate_metric!(:staging, TableReferences.merge_request_metrics[:merged_at], - TableReferences.merge_request_metrics[:first_deployed_to_production_at], - load_merge_requests: true) + TableReferences.merge_request_metrics[:first_deployed_to_production_at]) end def production calculate_metric!(:production, TableReferences.issues[:created_at], - TableReferences.merge_request_metrics[:first_deployed_to_production_at], - load_merge_requests: true) + TableReferences.merge_request_metrics[:first_deployed_to_production_at]) end private - def calculate_metric!(name, start_time_attrs, end_time_attrs, load_merge_requests: false) + def calculate_metric!(name, start_time_attrs, end_time_attrs) cte_table = Arel::Table.new("cte_table_for_#{name}") # Add a `SELECT` for (end_time - start-time), and add an alias for it. # Note: We use COALESCE to pick up the first non-null column for end_time / start_time. query = Arel::Nodes::As.new( cte_table, - base_query(load_merge_requests: load_merge_requests).project( + base_query.project( Arel::Nodes::Subtraction.new( Arel::Nodes::NamedFunction.new("COALESCE", Array.wrap(end_time_attrs)), Arel::Nodes::NamedFunction.new("COALESCE", Array.wrap(start_time_attrs)) @@ -86,20 +79,21 @@ class CycleAnalytics # closes the given issue) with issue and merge request metrics included. The metrics # are loaded with an inner join, so issues / merge requests without metrics are # automatically excluded. - def base_query(load_merge_requests:) + def base_query arel_table = TableReferences.merge_requests_closing_issues + # Load issues query = arel_table.join(TableReferences.issues).on(TableReferences.issues[:id].eq(arel_table[:issue_id])). join(TableReferences.issue_metrics).on(TableReferences.issues[:id].eq(TableReferences.issue_metrics[:issue_id])). where(TableReferences.issues[:project_id].eq(@project.id)). where(TableReferences.issues[:deleted_at].eq(nil)). where(TableReferences.issues[:created_at].gteq(@from)) - if load_merge_requests - query.join(TableReferences.merge_requests, Arel::Nodes::OuterJoin).on(TableReferences.merge_requests[:id].eq(arel_table[:merge_request_id])). - join(TableReferences.merge_request_metrics).on(TableReferences.merge_requests[:id].eq(TableReferences.merge_request_metrics[:merge_request_id])) - else - query - end + # Load merge_requests + query = query.join(TableReferences.merge_requests, Arel::Nodes::OuterJoin).on(TableReferences.merge_requests[:id].eq(arel_table[:merge_request_id])). + join(TableReferences.merge_request_metrics).on(TableReferences.merge_requests[:id].eq(TableReferences.merge_request_metrics[:merge_request_id])) + + # Limit to merge requests that have been deployed to production after `@from` + query.where(TableReferences.merge_request_metrics[:first_deployed_to_production_at].gteq(@from)) end end |