map_reduce 0.0.1.alpha → 0.0.1.alpha2

data/lib/map_reduce/version.rb

@@ -1,3 +1,3 @@
 module MapReduce
-  VERSION = "0.0.1.alpha"
+  VERSION = "0.0.1.alpha2"
 end

data/lib/map_reduce/worker.rb

@@ -96,7 +96,7 @@ module MapReduce
     #
     def pick_socket(key)
       shard = if worker_sockets.size > 1
-        Digest::MD5.hexdigest(key.to_s).to_i(16) % worker_socket.size
+        Digest::MD5.hexdigest(key.to_s).to_i(16) % worker_sockets.size
       else
         0
       end

data/spec/map_reduce/map_reduce_spec.rb

@@ -1,34 +1,36 @@
 require 'spec_helper'
 
 describe "MapReduce stack" do
-  before do
-    @pid = fork do
-      master = MapReduce::Master.new
-      master.run
+  describe "single master" do
+    before do
+      @pid = fork do
+        master = MapReduce::Master.new
+        master.run
+      end
     end
-  end
 
-  after do
-    Process.kill "TERM", @pid
-  end
+    after do
+      Process.kill "TERM", @pid
+    end
+
+    it "should map and reduce some data in CB mode" do
+      EM.run do
+        data = {}
+        worker = MapReduce::Worker.new
+        worker.map("Petr", ["Radiohead", "Muse", "R.E.M."] * ',') do
+          worker.map("Alex", ["Madonna", "Lady Gaga"] * ',') do
+            worker.map("Petr", ["Radiohead", "The Beatles", "Aquarium"] * ',') do
+              worker.map_finished do
+                worker.reduce do |key, values|
+                  if key
+                    data[key] = values
+                  else
+                    data.size.must_equal 2
+                    data["Petr"].must_equal [["Radiohead", "Muse", "R.E.M."] * ',', ["Radiohead", "The Beatles", "Aquarium"] * ',']
+                    data["Alex"].must_equal [["Madonna", "Lady Gaga"] * ',']
 
-  it "should map and reduce some data in CB mode" do
-    EM.run do
-      data = {}
-      worker = MapReduce::Worker.new
-      worker.map("Petr", ["Radiohead", "Muse", "R.E.M."] * ',') do
-        worker.map("Alex", ["Madonna", "Lady Gaga"] * ',') do
-          worker.map("Petr", ["Radiohead", "The Beatles", "Aquarium"] * ',') do
-            worker.map_finished do
-              worker.reduce do |key, values|
-                if key
-                  data[key] = values
-                else
-                  data.size.must_equal 2
-                  data["Petr"].must_equal [["Radiohead", "Muse", "R.E.M."] * ',', ["Radiohead", "The Beatles", "Aquarium"] * ',']
-                  data["Alex"].must_equal [["Madonna", "Lady Gaga"] * ',']
-
-                  EM.stop
+                    EM.stop
+                  end
                 end
               end
             end
@@ -36,24 +38,64 @@ describe "MapReduce stack" do
         end
       end
     end
+
+    it "should map and reduce some data in SYNC mode" do
+      EM.synchrony do
+        data = {}
+        worker = MapReduce::Worker.new type: :sync
+        worker.map("Petr", ["Radiohead", "Muse", "R.E.M."] * ',')
+        worker.map("Alex", ["Madonna", "Lady Gaga"] * ',')
+        worker.map("Petr", ["Radiohead", "The Beatles", "Aquarium"] * ',')
+        worker.map_finished
+        worker.reduce do |key, values|
+          data[key] = values  if key
+        end
+        data.size.must_equal 2
+        data["Petr"].must_equal [["Radiohead", "Muse", "R.E.M."] * ',', ["Radiohead", "The Beatles", "Aquarium"] * ',']
+        data["Alex"].must_equal [["Madonna", "Lady Gaga"] * ',']
+
+        EM.stop
+      end
+    end
   end
 
-  it "should map and reduce some data in SYNC mode" do
-    EM.synchrony do
-      data = {}
-      worker = MapReduce::Worker.new type: :sync
-      worker.map("Petr", ["Radiohead", "Muse", "R.E.M."] * ',')
-      worker.map("Alex", ["Madonna", "Lady Gaga"] * ',')
-      worker.map("Petr", ["Radiohead", "The Beatles", "Aquarium"] * ',')
-      worker.map_finished
-      worker.reduce do |key, values|
-        data[key] = values  if key
+  describe "multiple master" do
+    before do
+      @pid1 = fork do
+        master = MapReduce::Master.new socket: "ipc:///dev/shm/sock1.sock"
+        master.run
+      end
+      @pid2 = fork do
+        master = MapReduce::Master.new socket: "ipc:///dev/shm/sock2.sock"
+        master.run
       end
-      data.size.must_equal 2
-      data["Petr"].must_equal [["Radiohead", "Muse", "R.E.M."] * ',', ["Radiohead", "The Beatles", "Aquarium"] * ',']
-      data["Alex"].must_equal [["Madonna", "Lady Gaga"] * ',']
+    end
+
+    after do
+      Process.kill "TERM", @pid1
+      Process.kill "TERM", @pid2
+    end
+
+    it "should map and reduce some data in SYNC mode" do
+      EM.synchrony do
+        data = {}
+        worker = MapReduce::Worker.new type: :sync,  masters: ["ipc:///dev/shm/sock1.sock", "ipc:///dev/shm/sock2.sock"]
+        worker.map("Petr", ["Radiohead", "Muse", "R.E.M."] * ',')
+        worker.map("Alex", ["Madonna", "Lady Gaga"] * ',')
+        worker.map("Petr", ["Radiohead", "The Beatles", "Aquarium"] * ',')
+        worker.map("Michael", ["Blur"] * ',')
+        worker.map("Gosha", ["DDT", "Splin"] * ',')
+        worker.map("Obama", ["Adele", "Rolling Stones"] * ',')
+        worker.map_finished
+        worker.reduce do |key, values|
+          data[key] = values  if key
+        end
+        data.size.must_equal 5
+        data["Petr"].must_equal [["Radiohead", "Muse", "R.E.M."] * ',', ["Radiohead", "The Beatles", "Aquarium"] * ',']
+        data["Alex"].must_equal [["Madonna", "Lady Gaga"] * ',']
 
-      EM.stop
+        EM.stop
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: map_reduce
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha
+  version: 0.0.1.alpha2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: 2247563880137465180
+      hash: 2663364217523840830
       version: '0'
       segments:
       - 0