Commit 27476997 authored by Ahmad Sherif's avatar Ahmad Sherif

Use fewer queries for CI charts

parent f4804d5b
module Ci module Ci
module Charts module Charts
module DailyInterval
def grouped_count(query)
query.
group("DATE(#{Ci::Build.table_name}.created_at)").
count(:created_at).
transform_keys { |date| date.strftime(@format) }
end
def interval_step
@interval_step ||= 1.day
end
end
module MonthlyInterval
def grouped_count(query)
if Gitlab::Database.postgresql?
query.
group("to_char(#{Ci::Build.table_name}.created_at, '01 Month YYYY')").
count(:created_at).
transform_keys(&:squish)
else
query.
group("DATE_FORMAT(#{Ci::Build.table_name}.created_at, '01 %M %Y')").
count(:created_at)
end
end
def interval_step
@interval_step ||= 1.month
end
end
class Chart class Chart
attr_reader :labels, :total, :success, :project, :build_times attr_reader :labels, :total, :success, :project, :build_times
...@@ -13,47 +45,59 @@ module Ci ...@@ -13,47 +45,59 @@ module Ci
collect collect
end end
def push(from, to, format) def collect
@labels << from.strftime(format) query = project.builds.
@total << project.builds. where("? > #{Ci::Build.table_name}.created_at AND #{Ci::Build.table_name}.created_at > ?", @to, @from)
where("? > #{Ci::Build.table_name}.created_at AND #{Ci::Build.table_name}.created_at > ?", to, from).
count(:all) totals_count = grouped_count(query)
@success << project.builds. success_count = grouped_count(query.success)
where("? > #{Ci::Build.table_name}.created_at AND #{Ci::Build.table_name}.created_at > ?", to, from).
success.count(:all) current = @from
while current < @to
label = current.strftime(@format)
@labels << label
@total << (totals_count[label] || 0)
@success << (success_count[label] || 0)
current += interval_step
end
end end
end end
class YearChart < Chart class YearChart < Chart
def collect include MonthlyInterval
13.times do |i|
start_month = (Date.today.years_ago(1) + i.month).beginning_of_month
end_month = start_month.end_of_month
push(start_month, end_month, "%d %B %Y") def initialize(*)
end @to = Date.today.end_of_month
@from = @to.years_ago(1).beginning_of_month
@format = '%d %B %Y'
super
end end
end end
class MonthChart < Chart class MonthChart < Chart
def collect include DailyInterval
30.times do |i|
start_day = Date.today - 30.days + i.days
end_day = Date.today - 30.days + i.day + 1.day
push(start_day, end_day, "%d %B") def initialize(*)
end @to = Date.today
@from = @to - 30.days
@format = '%d %B'
super
end end
end end
class WeekChart < Chart class WeekChart < Chart
def collect include DailyInterval
7.times do |i|
start_day = Date.today - 7.days + i.days
end_day = Date.today - 7.days + i.day + 1.day
push(start_day, end_day, "%d %B") def initialize(*)
end @to = Date.today
@from = @to - 7.days
@format = '%d %B'
super
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment