Merge pull request #259 from k0kubun/jit-chart-builder-bug

Fix chart builder logic for JIT

Author: tgxworld

app/services/chart_builder.rb

@@ -37,16 +37,17 @@ def initialize(benchmark_runs, benchmark_result_type)
   end
 
   def build_columns
+    keys = @benchmark_runs.map { |run| run.result.keys }.flatten.uniq
     @benchmark_runs.each do |benchmark_run|
       if block_given?
         version = yield(benchmark_run)
         @categories ||= []
         @categories << version if version != @categories.last
       end
 
-      benchmark_run.result.each do |key, value|
+      keys.each do |key|
         @columns[key] ||= []
-        @columns[key] << value.to_f
+        @columns[key] << benchmark_run.result[key]&.to_f
       end
     end
 

test/services/chart_builder_test.rb

@@ -3,7 +3,7 @@
 class ChartBuilderTest < ActiveSupport::TestCase
   test '#build_columns' do
     benchmark_run = create(:commit_benchmark_run, result: { 'some_time' => 5, 'some_other_time' => 5 })
-    other_benchmark_run = create(:commit_benchmark_run, result: { 'some_time' => 5, 'some_other_time' => 5 })
+    other_benchmark_run = create(:commit_benchmark_run, result: { 'some_time' => 5, 'some_other_time' => 5, 'jit_time' => 5 })
     chart_builder = ChartBuilder.new([benchmark_run, other_benchmark_run], benchmark_run.benchmark_result_type)
 
     chart_builder2 = chart_builder.build_columns do |benchmark_run|
@@ -19,7 +19,8 @@ class ChartBuilderTest < ActiveSupport::TestCase
     assert_equal(
       [
         { name: 'some_time', data: [benchmark_run.result['some_time'].to_f, other_benchmark_run.result['some_time'].to_f] },
-        { name: 'some_other_time', data: [benchmark_run.result['some_other_time'].to_f, other_benchmark_run.result['some_other_time'].to_f] }
+        { name: 'some_other_time', data: [benchmark_run.result['some_other_time'].to_f, other_benchmark_run.result['some_other_time'].to_f] },
+        { name: 'jit_time', data: [nil, other_benchmark_run.result['jit_time'].to_f] },
       ],
       chart_builder.columns
     )