tresse 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79478c19e535535d6939c00b57f34348dc024d3
-  data.tar.gz: f614a4fbc5b34a37617e3bb09863d09c5a1a95c6
+  metadata.gz: 80b7de6139b9cc1d3e7bacd2f86b7c6b0685d431
+  data.tar.gz: 673e625a9a20149d09120348e2ab299a06605c36
 SHA512:
-  metadata.gz: 59dc4a2a63a63dfe420ae6ffb65b0a7e5083f55da03f630d74e42cb4f3c174081bf430e668820d55af76a6843f0db7b954f24a45e57978b8a33cb5ae2f1d5b24
-  data.tar.gz: e35f1a82c2c2e5aa65c5b17e0ca76d2aef068b9c9177b6f9a79f9fa2622ba2100e9663117ec333e0f70687a8383ba6d990fd844176dcfad03d958fe81cf91d3f
+  metadata.gz: 073fe8f17b480a03c32c1a22443ad3024f99c5eeff3da696d9e2313899e447f65daf6104af0f601943d1fb0ec618091ee23d75087a33fb6b3ea1f6ff151b1ca1
+  data.tar.gz: dd3631c389f68d0855a9f73b57f183a3a4c93a7565dc2c57d82a170ca369acbbd211da856310ca8e5242e92917ffab0c13b07d2986f01d30464cdd600bd69050

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## tresse 1.2.0  released 2019-09-17
+
+* Re-raise errors at reduction stage
+
+
 ## tresse 1.1.3  released 2019-09-17
 
 * Fix ready for reduction check (prevent it from hanging)

data/lib/tresse.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Tresse
 
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 
   class << self
 
@@ -12,15 +12,6 @@ module Tresse
 
       @work_queue = Queue.new
       @work_threads = 8.times.collect { |i| make_work_thread }
-
-      @on_error =
-        lambda do |where, err|
-          puts "-" * 80
-          p where
-          p err
-          puts err.backtrace
-          puts "-" * 80
-        end
     end
 
     def enqueue(batch)
@@ -30,11 +21,6 @@ module Tresse
       batch.group
     end
 
-    def on_error(&block)
-
-      @on_error = block
-    end
-
     def max_work_thread_count
 
       @work_threads.size
@@ -73,7 +59,7 @@ module Tresse
 
           rescue => err
 
-            @on_error.call(:in_worker_thread, err)
+            batch.error = err
           end
         end
       end
@@ -95,6 +81,7 @@ module Tresse
     attr_reader :map_index
     attr_reader :completed
     attr_accessor :value
+    attr_reader :error
 
     def initialize(group, block_or_group)
 
@@ -128,6 +115,12 @@ module Tresse
 
       @completed = true
     end
+
+    def error=(err)
+
+      @error = err
+      @group.send(:receive, self)
+    end
   end
 
   class Group
@@ -222,7 +215,11 @@ module Tresse
 
       launch
 
-      @reduction_queue.pop
+      r = @reduction_queue.pop
+
+      raise r.error if r.is_a?(Tresse::Batch)
+
+      r
     end
 
     def launch
@@ -235,7 +232,9 @@ module Tresse
 
     def receive(batch)
 
-      if batch.map_index == 0
+      if batch.error
+        @reduction_queue << batch
+      elsif batch.map_index == 0
         batch.source
         Tresse.enqueue(batch)
       elsif m = @maps[batch.map_index]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tresse
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - John Mettraux