tresse 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07e2b40e7224b8da9af9768fb077d0a9552b04ba
-  data.tar.gz: d5e471d9d944580185fe2aa97e53fec105f87ae8
+  metadata.gz: 80b7de6139b9cc1d3e7bacd2f86b7c6b0685d431
+  data.tar.gz: 673e625a9a20149d09120348e2ab299a06605c36
 SHA512:
-  metadata.gz: e69445a655dc2d80002b087ff8355d1e344a052919be4944b52c94bef65f4065b3d8eb0cf090a0f0e8276cebc028f002399a8b638d892584b51eaefa2cc881fa
-  data.tar.gz: e812e89f78b44ad82726bc978bd36c780957c645b4fc55278279b770f87ed219c5995ea4ed02a16d5196c78b6d0ebeb87e43ba313d847d0789cff2bb2ff63c2b
+  metadata.gz: 073fe8f17b480a03c32c1a22443ad3024f99c5eeff3da696d9e2313899e447f65daf6104af0f601943d1fb0ec618091ee23d75087a33fb6b3ea1f6ff151b1ca1
+  data.tar.gz: dd3631c389f68d0855a9f73b57f183a3a4c93a7565dc2c57d82a170ca369acbbd211da856310ca8e5242e92917ffab0c13b07d2986f01d30464cdd600bd69050

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 # 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)
+
+
+## tresse 1.1.2  released 2019-09-17
+
+* Let Tresse::Group#flatten accept non-arrays
+
+
+## tresse 1.1.1  released 2019-09-17
+
+* Refine Tresse::Group#source_each
+
+
+## tresse 1.1.0  released 2019-09-17
+
+* Introduce Tresse::Group#source_each(collection, &block)
+
+
 ## tresse 1.0.0  released 2019-09-16
 
 * #source / #map / #reduce

data/lib/tresse.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Tresse
 
-  VERSION = '1.0.0'
+  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
@@ -83,11 +69,19 @@ module Tresse
   self.init
 
 
+  def self.call_block(block, args)
+
+    block.call(*args[0, block.arity.abs])
+  end
+
+
   class Batch
 
     attr_reader :group
     attr_reader :map_index
+    attr_reader :completed
     attr_accessor :value
+    attr_reader :error
 
     def initialize(group, block_or_group)
 
@@ -96,6 +90,7 @@ module Tresse
 
       @map_index = -1
       @value = nil
+      @completed = false
     end
 
     def process
@@ -106,27 +101,31 @@ module Tresse
 
     def source
 
-      args = [ group ] + [ nil ] * 7
-      args = args[0, @bog.method(:call).arity]
-
-      @value = @bog.call(*args)
+      @value = Tresse.call_block(@bog, [ group ] + [ nil ] * 7)
     end
 
     def map(type, block)
 
-      args = [ @value, self ]
-      args = args[0, block.method(:call).arity.abs]
-
-      r = block.call(*args)
+      r = Tresse.call_block(block, [ @value, self ])
 
       @value = r if type == :map
     end
+
+    def complete
+
+      @completed = true
+    end
+
+    def error=(err)
+
+      @error = err
+      @group.send(:receive, self)
+    end
   end
 
   class Group
 
     attr_accessor :name
-    #attr_reader :batches
 
     def initialize(name=nil)
 
@@ -137,18 +136,29 @@ module Tresse
       @maps = [ nil ]
 
       @reduce = nil
-      @reduce_batches = []
+      @reduce_mutex = Mutex.new
       @reduction_queue = Queue.new
     end
 
     #
     # sourcing methods
 
-    def source(o=nil, &block)
+    def source(&block)
+
+      @batches << Tresse::Batch.new(self, block)
+
+      self
+    end
 
-      batch = Tresse::Batch.new(self, o ? o : block)
+    def source_each(collection, &block)
 
-      @batches << batch
+      if collection.is_a?(Hash)
+        collection.each { |k, v|
+          source { Tresse.call_block(block, [ k, v ]) } }
+      else
+        collection.each_with_index { |e, i|
+          source { Tresse.call_block(block, [ e, i ]) } }
+      end
 
       self
     end
@@ -177,7 +187,14 @@ module Tresse
 
     def flatten
 
-      do_reduce([], lambda { |a, e| a.concat(e) })
+      do_reduce(
+        [],
+        lambda { |a, e|
+          if e.respond_to?(:to_a) && ! e.is_a?(Hash)
+            a.concat(e.to_a)
+          else
+            a.push(e)
+          end })
     end
     alias values flatten
 
@@ -198,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
@@ -211,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]
@@ -224,15 +247,18 @@ module Tresse
 
     def queue_for_reduction(batch)
 
-      @reduce_batches << batch
+      @reduce_mutex.synchronize do
+
+        batch.complete
 
-      return if @reduce_batches.size < @batches.size
-      return unless @reduce
+        return unless @reduce
+        return if @batches.find { |b| ! b.completed }
 
-      es = @batches.collect(&:value)
-      target, block = @reduce
+        es = @batches.collect(&:value)
+        target, block = @reduce
 
-      @reduction_queue << es.inject(target, &block)
+        @reduction_queue << es.inject(target, &block)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tresse
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-16 00:00:00.000000000 Z
+date: 2019-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec