barbeque 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a27e1555a662fc67cff6d20504bff8e7649f761c4c7500e14f8200347a822ee
-  data.tar.gz: 535818478a8701f4c1e00f9600328b9e0e2d6c7ccd45ca16e3851319ac8a4676
+  metadata.gz: 3026b077536df0611a58ba0aa89d874684f9034c770acda9dcb3157bd3eb3038
+  data.tar.gz: 2483622e8a5509fba04ee65cb211f9310499de78c4728f043e020e86dad3d1ee
 SHA512:
-  metadata.gz: 768ca47dc94d8479804de1a4c9ddbb3f989732eddbb9c8eb2bbc9778503c076d965929a8a5990e663209ea78e87ca61a62cbd874f2d42876018ba339f15031a9
-  data.tar.gz: d916df13c88917745c35e1e32c09b1e0c5d2ad1c2801abee8ec35ec2004d07f9048d1372bdf182652e89966c0249608bf2dabc7d0389d9eecac8708aa78cbcf3
+  metadata.gz: 0f3ad0c7751118435c9e08f1a7dabc8a9b26244d1658b4a09726234fb1da4b0a8de06e41b7909f378dfed6c1f3fc4d3946eccf2104982376ab517e3cd48b0b33
+  data.tar.gz: 6b0872c02ecea57d88b2512ffb23ffc6bbb65942a25f9240eafa4b251a114aae3d41f19aa0e8e012c5c5035908f9de19904cd1df6a809fc6d04e7bcc129bb729

data/app/controllers/barbeque/monitors_controller.rb

@@ -1,21 +1,40 @@
 class Barbeque::MonitorsController < Barbeque::ApplicationController
   def index
-    hour_sql = "date_format(#{Barbeque::JobExecution.table_name}.created_at, '%Y-%m-%d %H:00:00')"
     now = Time.zone.now
     from = 6.hours.ago(now.beginning_of_hour)
-    rows = Barbeque::JobExecution.
-      joins(job_definition: :app).
-      where(created_at: from .. now).
-      group("#{hour_sql}, #{Barbeque::JobDefinition.table_name}.id").
-      pluck("#{hour_sql}, #{Barbeque::App.table_name}.id, #{Barbeque::App.table_name}.name, #{Barbeque::JobDefinition.table_name}.id, #{Barbeque::JobDefinition.table_name}.job, count(1)")
+    rows = Barbeque::JobExecution.find_by_sql([<<SQL.strip_heredoc, from, now]).map(&:attributes)
+    select
+      t.date_hour
+      , app.id as app_id
+      , app.name as app_name
+      , def.id as job_id
+      , def.job as job_name
+      , t.cnt
+    from
+      (
+        select
+          date_format(e.created_at, '%Y-%m-%d %H:00:00') as date_hour
+          , e.job_definition_id
+          , count(1) as cnt
+        from #{Barbeque::JobExecution.table_name} e
+        where
+          e.created_at between ? and ?
+        group by
+          date_hour
+          , e.job_definition_id
+      ) t
+      inner join #{Barbeque::JobDefinition.table_name} def on def.id = t.job_definition_id
+      inner join #{Barbeque::App.table_name} app on app.id = def.app_id
+SQL
 
     jobs = {}
-    rows.each do |_, app_id, app_name, job_id, job_name, _|
+    rows.each do |row|
+      job_id = row.fetch('job_id')
       job = {
-        app_id: app_id,
-        app_name: app_name,
+        app_id: row.fetch('app_id'),
+        app_name: row.fetch('app_name'),
         job_id: job_id,
-        job_name: job_name,
+        job_name: row.fetch('job_name'),
       }
       jobs[job_id] = job
     end
@@ -30,9 +49,10 @@ class Barbeque::MonitorsController < Barbeque::ApplicationController
       t += 1.hour
     end
 
-    rows.each do |date_hour, _, _, job_id, _, count|
-      date_hour = Time.zone.parse("#{date_hour} UTC")
-      @recently_processed_jobs[date_hour][job_id] = jobs[job_id].merge(count: count)
+    rows.each do |row|
+      date_hour = Time.zone.parse("#{row.fetch('date_hour')} UTC")
+      job_id = row.fetch('job_id')
+      @recently_processed_jobs[date_hour][job_id] = jobs[job_id].merge(count: row.fetch('cnt'))
     end
   end
 end

data/db/migrate/20180411070937_add_index_to_barbeque_job_executions_created_at.rb

@@ -0,0 +1,5 @@
+class AddIndexToBarbequeJobExecutionsCreatedAt < ActiveRecord::Migration[5.1]
+  def change
+    add_index :barbeque_job_executions, :created_at
+  end
+end

data/lib/barbeque/version.rb

@@ -1,3 +1,3 @@
 module Barbeque
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barbeque
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adminlte2-rails
@@ -420,6 +420,7 @@ files:
 - db/migrate/20170711085157_create_barbeque_docker_containers.rb
 - db/migrate/20170712075449_create_barbeque_ecs_hako_tasks.rb
 - db/migrate/20170724025542_add_index_to_job_execution_status.rb
+- db/migrate/20180411070937_add_index_to_barbeque_job_executions_created_at.rb
 - lib/barbeque.rb
 - lib/barbeque/config.rb
 - lib/barbeque/docker_image.rb