bramble 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78abeda625df09bdbbfbaa059768757a54380f9
-  data.tar.gz: b641d188443171568abe011b22fc5b3ccf7083e6
+  metadata.gz: 2baaf8e5894d3d7673a6888e6eab091883520c7d
+  data.tar.gz: 55f0b6791f770a1a6fe710d3a98972677cdfed31
 SHA512:
-  metadata.gz: 3d5e01178d77d2cd06c99634318835143dbdcb3ba203ecc6477cb7bb60d32019521d531660bc1a8f6e7eab258d0d55ec617113ee61e112c3e31a74a9094b655a
-  data.tar.gz: a54391b20995074b7b16382d75823d247f9fb267f27bae2804db4ed5e97c3fc2fbd331cbf666e8a5d42817aafabe8a26c3f194148bf29cc6010876cd2763c4d4
+  metadata.gz: e081ada613296ab5d5a410bf0759b2a425610a3618ae2d0762b762ee25689e344b10d8a2943bdf45a9b9e22534ffc78c4aac36f22fa09db9fa4d957534e78e78
+  data.tar.gz: 4196394526521889d7d56a4f981fad5a7152847cdf62ee1146e0d5ac4411b392fc46b6578dafac648918320ec4af0750ef50d7f4499f1fe0be38e4baf10e859d

data/lib/bramble/keys.rb

@@ -14,16 +14,20 @@ module Bramble
       "#{namespace(handle)}:keys"
     end
 
+    def map_total_count_key(handle)
+      "#{namespace(handle)}:map_total_count"
+    end
+
     def map_finished_count_key(handle)
       "#{namespace(handle)}:map_finished_count"
     end
 
-    def reduce_finished_count_key(handle)
-      "#{namespace(handle)}:reduce_finished_count"
+    def reduce_total_count_key(handle)
+      "#{namespace(handle)}:reduce_total_count"
     end
 
-    def total_count_key(handle)
-      "#{namespace(handle)}:total_count"
+    def reduce_finished_count_key(handle)
+      "#{namespace(handle)}:reduce_finished_count"
     end
 
     def result_key(handle)

data/lib/bramble/map.rb

@@ -6,7 +6,7 @@ module Bramble
 
     def perform(handle, implementation, values)
       Bramble::State.running?(handle) do
-        storage.set(total_count_key(handle), values.length)
+        storage.set(map_total_count_key(handle), values.length)
         values.each do |value|
           Bramble::MapJob.perform_later(handle, implementation.name, Bramble::Serialize.dump(value))
         end
@@ -25,10 +25,9 @@ module Bramble
         end
         Bramble::State.running?(handle) do
           finished = storage.increment(map_finished_count_key(handle))
-          total = storage.get(total_count_key(handle)).to_i
+          total = storage.get(map_total_count_key(handle)).to_i
           if finished == total
             Bramble::Reduce.perform(handle, implementation)
-            Bramble::State.clear_map(handle)
           end
         end
       end

data/lib/bramble/reduce.rb

@@ -5,9 +5,12 @@ module Bramble
     module_function
 
     def perform(handle, implementation)
-      all_raw_keys = storage.map_keys_get(keys_key(handle))
-      all_raw_keys.each do |raw_key|
-        Bramble::ReduceJob.perform_later(handle, implementation.name, raw_key)
+      Bramble::State.running?(handle) do
+        all_raw_keys = storage.map_keys_get(keys_key(handle))
+        storage.set(reduce_total_count_key(handle), all_raw_keys.length)
+        all_raw_keys.each do |raw_key|
+          Bramble::ReduceJob.perform_later(handle, implementation.name, raw_key)
+        end
       end
     end
 

data/lib/bramble/result.rb

@@ -28,7 +28,7 @@ module Bramble
     private
 
     def total_count
-      @total_count ||= storage.get(Bramble::Keys.total_count_key(handle)).to_i
+      @total_count ||= storage.get(Bramble::Keys.reduce_total_count_key(handle)).to_i
     end
 
     def finished_count

data/lib/bramble/state.rb

@@ -38,11 +38,12 @@ module Bramble
         storage.delete(data_key(handle, group_key))
       end
       storage.delete(keys_key(handle))
+      storage.delete(map_total_count_key(handle))
       storage.delete(map_finished_count_key(handle))
     end
 
     def clear_reduce(handle)
-      storage.delete(total_count_key(handle))
+      storage.delete(reduce_total_count_key(handle))
       storage.delete(reduce_finished_count_key(handle))
       storage.delete(result_key(handle))
     end

data/lib/bramble/version.rb

@@ -1,3 +1,3 @@
 module Bramble
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bramble
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Mosolgo