tresse 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e4b902710be0f597feab968d7b8fbcfbfa221f
-  data.tar.gz: c0fa95c1637ab3391138bc27424bd916dd1e74d9
+  metadata.gz: a79478c19e535535d6939c00b57f34348dc024d3
+  data.tar.gz: f614a4fbc5b34a37617e3bb09863d09c5a1a95c6
 SHA512:
-  metadata.gz: 62bbacc7d76b0c80eb11401221c6e4a088c97ea40d077344b5fa05fee41e77dfb36b0a28600cc1eba1e7c2f38607b44e164358e4d9e66f1fa82d185ad516f6d0
-  data.tar.gz: 4cc9b5c16c00f742e509853d26ae7a6547650c67ba01d4b9a11da57ad55156b57d761f631b0b5b23d7c079304553cb380093479622c31f5d4003d8c633b80d9d
+  metadata.gz: 59dc4a2a63a63dfe420ae6ffb65b0a7e5083f55da03f630d74e42cb4f3c174081bf430e668820d55af76a6843f0db7b954f24a45e57978b8a33cb5ae2f1d5b24
+  data.tar.gz: e35f1a82c2c2e5aa65c5b17e0ca76d2aef068b9c9177b6f9a79f9fa2622ba2100e9663117ec333e0f70687a8383ba6d990fd844176dcfad03d958fe81cf91d3f

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 # CHANGELOG.md
 
 
+## 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

data/lib/tresse.rb

@@ -4,7 +4,7 @@ require 'thread'
 
 module Tresse
 
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 
   class << self
 
@@ -93,6 +93,7 @@ module Tresse
 
     attr_reader :group
     attr_reader :map_index
+    attr_reader :completed
     attr_accessor :value
 
     def initialize(group, block_or_group)
@@ -102,6 +103,7 @@ module Tresse
 
       @map_index = -1
       @value = nil
+      @completed = false
     end
 
     def process
@@ -121,12 +123,16 @@ module Tresse
 
       @value = r if type == :map
     end
+
+    def complete
+
+      @completed = true
+    end
   end
 
   class Group
 
     attr_accessor :name
-    #attr_reader :batches
 
     def initialize(name=nil)
 
@@ -137,7 +143,7 @@ module Tresse
       @maps = [ nil ]
 
       @reduce = nil
-      @reduce_batches = []
+      @reduce_mutex = Mutex.new
       @reduction_queue = Queue.new
     end
 
@@ -242,15 +248,18 @@ module Tresse
 
     def queue_for_reduction(batch)
 
-      @reduce_batches << batch
+      @reduce_mutex.synchronize do
 
-      return if @reduce_batches.size < @batches.size
-      return unless @reduce
+        batch.complete
 
-      es = @batches.collect(&:value)
-      target, block = @reduce
+        return unless @reduce
+        return if @batches.find { |b| ! b.completed }
 
-      @reduction_queue << es.inject(target, &block)
+        es = @batches.collect(&:value)
+        target, block = @reduce
+
+        @reduction_queue << es.inject(target, &block)
+      end
     end
   end
 end

metadata

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