tem_mr_search 0.3.3 → 0.3.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.3.4. More detailed per-TEM timings.
+
 v0.3.3. Map-Reduce scheduler tweak.
 
 v0.3.2. Map-Reduce timing statistics available in the results.

data/lib/tem_mr_search/map_reduce_executor.rb

@@ -47,9 +47,9 @@ class MapReduceExecutor
     @outputs = {}
     
     # Protected by @lock
-    @timings = { :tems => Array.new(@tems.length, 0.0),
-                 :tasks => { :map => 0.0, :reduce => 0.0, :finalize => 0.0,
-                             :migrate => 0.0, :tem_ids => 0.0 } }
+    tasks = { :map => 0.0, :reduce => 0.0, :finalize => 0.0,
+              :migrate => 0.0, :tem_ids => 0.0 }
+    @timings = { :tems => Array.new(@tems.length) { tasks.dup } }
     
     # Thread-safe.
     @thread_queues = tems.map { |tem| Queue.new }
@@ -92,8 +92,7 @@ class MapReduceExecutor
         time_delta = Time.now - t0
         @lock.synchronize do
           @tem_certs[index] = ecert
-          @timings[:tasks][:tem_ids] += time_delta
-          @timings[:tems][index] += time_delta
+          @timings[:tems][index][:tem_ids] += time_delta
         end
       end
     end
@@ -128,8 +127,7 @@ class MapReduceExecutor
       
       @lock.synchronize do
         @tem_parts[action[:secpack]][action[:to]] = out_part
-        @timings[:tems][tem_index] += time_delta
-        @timings[:tasks][:migrate] += time_delta
+        @timings[:tems][tem_index][:migrate] += time_delta
       end
       
     when :map
@@ -145,8 +143,7 @@ class MapReduceExecutor
       
       @lock.synchronize do
         @outputs[action[:output_id]] = output
-        @timings[:tems][tem_index] += time_delta
-        @timings[:tasks][:map] += time_delta
+        @timings[:tems][tem_index][:map] += time_delta
       end
       
     when :reduce
@@ -163,8 +160,7 @@ class MapReduceExecutor
       
       @lock.synchronize do
         @outputs[action[:output_id]] = output
-        @timings[:tems][tem_index] += time_delta
-        @timings[:tasks][:reduce] += time_delta
+        @timings[:tems][tem_index][:reduce] += time_delta
       end
 
     when :finalize
@@ -180,8 +176,7 @@ class MapReduceExecutor
       
       @lock.synchronize do
         @outputs[action[:final_id]] = final_output
-        @timings[:tems][tem_index] += time_delta
-        @timings[:tasks][:finalize] += time_delta
+        @timings[:tems][tem_index][:finalize] += time_delta
       end
     end
   end

data/tem_mr_search.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tem_mr_search}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]

data/test/test_map_reduce_executor.rb

@@ -34,12 +34,13 @@ class MapReduceExecutorTest < MrTestCase
                  'Incorrect Map-Reduce result (score)'
   
     assert data[:timings], 'No timings returned'
-    assert data[:timings][:tasks], 'No tasks data in the timings'
-    [:tem_ids, :migrate, :map, :reduce, :finalize].each do |task|
-      assert data[:timings][:tasks][task], "No data on #{task} in the timings"
+    assert_equal tems.length, data[:timings][:tems].length,
+                 'No TEM data in the timings'
+    data[:timings][:tems].each do |tem_data|
+      [:tem_ids, :migrate, :map, :reduce, :finalize].each do |task|
+        assert tem_data[task], "No data on #{task} in the per-TEM timings"
+      end      
     end
-    assert_operator data[:timings][:tems], :kind_of?, Array,
-                    'No per-TEM data in the timings'
     assert data[:timings][:total], 'No total time in the timings'
 
     # Dump timing stats to show scheduler performance.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tem_mr_search
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Victor Costan