clandestined 1.0.0b → 1.0.0rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03d6d29e1c5fe16b7457ae7ae9d851a55ad2c03e
-  data.tar.gz: 9ce134bb758d8f00442ac45a1b592ccbe143f04c
+  metadata.gz: a5ff566c681b3dbb615337f7950d77952ed1a431
+  data.tar.gz: 3ecbd2a3a64361d73fdf2f964f7455d5c25cf4b0
 SHA512:
-  metadata.gz: ccdcbbbd4d4d9524cbb61a21efa5d3389da3ad6b7b366c1d1d6273a7da265686a600ece76eb1a8d68e6955761fcb3ec82323747a8ee9c6c2ef76d2fb4d4e09f3
-  data.tar.gz: 04e1699336e8e5b08e0d75207d80308955e86986dafd79c1cd2d8b7ae3ec1b94de470e26cc6e88aea31c9bdf06606df2a06769737faa00ee6cb70383d8cc400d
+  metadata.gz: a8537d75aed9c1e1efc253474ec5d47941fa3b0a2aab914f146151f4e03e00cf2311f444b1be8362431a6e0b2952ef0df311eced0d84829e7d6614b57975d8a6
+  data.tar.gz: ad82997d11d2d492b744bdcc5de5b869cb2e7c4d8dd6b61278649a4cc0fd1b0799294e7241c965e28d63e7104c2623db650afcab79528ca42c380312906af2a4

data/.gitignore

@@ -2,6 +2,9 @@
 /bin
 /vendor
 /.vendor
+/Gemfile.lock
+
+/.ruby-version
 
 /pkg
 /tmp

data/CHANGES.md

@@ -1,4 +1,10 @@
 
+v1.0.0rc1 (2014-07-13)
+======================
+
+  - `Rendezvous.find_node` breaks ties in the event of a hash collision. Winner
+    is chosen by `[node_id.to_s, node_id.to_s].max`
+
 v1.0.0b (2014-07-07)
 ====================
 

data/README.md

@@ -4,7 +4,7 @@ clandestined
 rendezvous hashing implementation based on murmur3 hash
 
 
-## motiviation
+## motivation
 
 in distributed systems, the need often arises to locate objects amongst a
 cluster of machines. consistent hashing and rendezvous hashing are methods of

data/Rakefile

@@ -1,4 +1,3 @@
-require "bundler/gem_tasks"
 require 'rake/testtask'
 require 'rake/extensiontask'
 

data/clandestined.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'clandestined'
-  s.version = '1.0.0b'
+  s.version = '1.0.0rc1'
   s.licenses = ['MIT']
   s.date = Time.now.strftime('%Y-%m-%d')
   s.summary = 'rendezvous hashing implementation based on murmur3 hash'
@@ -13,9 +13,15 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib', 'ext']
   s.extensions = ['ext/murmur3_native/extconf.rb']
 
-  s.add_development_dependency 'rake', '0.9.6'
-  s.add_development_dependency 'rake-compiler', '0.8.3'
-  s.add_development_dependency 'rubydoctest', '1.1.3'
+  if RUBY_VERSION < "1.9"
+    s.add_development_dependency 'rake', '0.8.7'
+    s.add_development_dependency 'rake-compiler', '0.8.3'
+    s.add_development_dependency 'rubydoctest', '1.1.3'
+  else
+    s.add_development_dependency 'rake'
+    s.add_development_dependency 'rake-compiler'
+    s.add_development_dependency 'rubydoctest'
+  end
 
   s.has_rdoc = false
 

data/lib/clandestined/cluster.rb

@@ -1,12 +1,9 @@
 
 require 'clandestined/rendezvous_hash'
-require 'murmur3'
 
 module Clandestined
   class Cluster
 
-    include Murmur3
-
     attr_reader :hash_function
     attr_reader :seed
     attr_reader :replicas

data/lib/clandestined/rendezvous_hash.rb

@@ -14,7 +14,6 @@ module Clandestined
       @seed = seed
 
       @hash_function = lambda { |key| murmur3_32(key, seed) }
-
     end
 
     def add_node(node)
@@ -30,7 +29,17 @@ module Clandestined
     end
 
     def find_node(key)
-      nodes.max {|a,b| hash_function.call("#{a}-#{key}") <=> hash_function.call("#{b}-#{key}")}
+      high_score = -1
+      winner = nil
+      nodes.each do |node|
+        score = hash_function.call("#{node}-#{key}")
+        if score > high_score
+          high_score, winner = score, node
+        elsif score == high_score
+          high_score, winner = score, [node.to_s, winner.to_s].max
+        end
+      end
+      winner
     end
 
   end

data/test/test_collision.rb

@@ -0,0 +1,71 @@
+
+require 'test/unit'
+
+require 'clandestined/rendezvous_hash'
+require 'clandestined/cluster'
+
+include Clandestined
+
+class CollisionHashTestCase < Test::Unit::TestCase
+
+  def setup
+    RendezvousHash.class_eval do
+      def mock_murmur3_32(key, seed=0)
+        4294967295
+      end
+      alias original_murmur3_32 murmur3_32
+      alias murmur3_32 mock_murmur3_32
+    end
+  end
+
+  def teardown
+    RendezvousHash.class_eval do
+      alias murmur3_32 original_murmur3_32
+      remove_method(:mock_murmur3_32)
+      remove_method(:original_murmur3_32)
+    end
+  end
+
+  def test_monkey_patch
+    rendezvous = RendezvousHash.new()
+    assert_equal(rendezvous.hash_function.call('lol'), 4294967295)
+    assert_equal(rendezvous.hash_function.call('wat'), 4294967295)
+  end
+
+  def test_rendezvous_collision
+    nodes = ['c', 'b', 'a']
+    rendezvous = RendezvousHash.new(nodes)
+    for i in (0..1000)
+      assert_equal('c', rendezvous.find_node(i))
+    end
+  end
+
+  def test_rendezvous_names
+    nodes = [1, 2, 3, 'a', 'b', 'lol.wat.com']
+    rendezvous = RendezvousHash.new(nodes)
+    for i in (0..10)
+      assert_equal('lol.wat.com', rendezvous.find_node(i))
+    end
+    nodes = [1, 'a', '0']
+    rendezvous = RendezvousHash.new(nodes)
+    for i in (0..10)
+      assert_equal('a', rendezvous.find_node(i))
+    end
+  end
+
+  def test_cluster_collision
+    nodes = Hash[
+      '1' => Hash['zone' => 'a'],
+      '2' => Hash['zone' => 'a'],
+      '3' => Hash['zone' => 'b'],
+      '4' => Hash['zone' => 'b'],
+    ]
+    cluster = Cluster.new(nodes)
+    for n in (0..100)
+      for m in (0..100)
+        assert_equal(['2', '4'], cluster.find_nodes_by_index(n, m).sort)
+      end
+    end
+  end
+
+end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: clandestined
 version: !ruby/object:Gem::Version
-  version: 1.0.0b
+  version: 1.0.0rc1
 platform: ruby
 authors:
 - Ernest W. Durbin III
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydoctest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '0'
 description: |
   rendezvous hashing implementation based on murmur3 hash
 email: ewdurbin@gmail.com
@@ -64,7 +64,6 @@ files:
 - .travis.yml
 - CHANGES.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -76,6 +75,7 @@ files:
 - lib/murmur3.rb
 - lib/murmur3_ruby.rb
 - test/test_cluster.rb
+- test/test_collision.rb
 - test/test_rendezvous_hash.rb
 homepage: https://github.com/ewdurbin/clandestined-ruby
 licenses:
@@ -98,10 +98,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: rendezvous hashing implementation based on murmur3 hash
 test_files:
 - test/test_cluster.rb
+- test/test_collision.rb
 - test/test_rendezvous_hash.rb

data/Gemfile.lock

@@ -1,21 +0,0 @@
-PATH
-  remote: .
-  specs:
-    clandestined (1.0.0a)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    rake (0.9.6)
-    rake-compiler (0.8.3)
-      rake
-    rubydoctest (1.1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  clandestined!
-  rake (= 0.9.6)
-  rake-compiler (= 0.8.3)
-  rubydoctest (= 1.1.3)