fast_hash_ring 0.1 → 0.1.1

data/Rakefile

@@ -20,7 +20,7 @@ CLEAN.include('pkg', 'tmp')
 
 gemspec = Gem::Specification.new do |s|
   s.name = 'fast_hash_ring'
-  s.version = '0.1'
+  s.version = '0.1.1'
   s.authors = [ 'Flinn' ]
   s.email = 'flinn@actsasflinn.com'
   s.homepage = 'http://github.com/actsasflinn/fast_hash_ring/'
@@ -51,7 +51,7 @@ Rake::GemPackageTask.new(gemspec) do |pkg|
   pkg.need_tar = true
 end
 
-Rake::PackageTask.new('fast_hash_ring', '0.1') do |pkg|
+Rake::PackageTask.new('fast_hash_ring', '0.1.1') do |pkg|
   pkg.need_zip = true
   pkg.package_files = FileList[
     'COPYING',

data/benchmarks/fast_hash_ring.rb

@@ -1,3 +1,7 @@
+#                           user     system      total        real
+# Hash Ring            44.970000   0.110000  45.080000 ( 45.194632)
+# Fash Hash Ring        1.820000   0.000000   1.820000 (  1.824138)
+
 require 'benchmark'
 require 'rubygems'
 require 'faker'
@@ -15,7 +19,7 @@ weights = {}
 end
 
 keys = []
-10_000.times do |i|
+100_000.times do |i|
   keys << Faker::Name.name
 end
 

data/ext/fast_hash_ring.c

@@ -18,6 +18,13 @@ unsigned int hash_val(char *key, int x){
            digest[0 + x]);
 }
 
+static VALUE cFastHashRing_hash_val(VALUE vself, VALUE vkey, VALUE vx){
+  VALUE vhash;
+
+  vhash = INT2NUM(hash_val(RSTRING_PTR(vkey), NUM2INT(vx)));
+  return vhash;
+}
+
 static VALUE cFastHashRing_generate_circle(VALUE vself){
   VALUE vnodes, vweights, vring, vsorted_keys;
   int i, j, n, vnodes_len;
@@ -71,16 +78,16 @@ static VALUE cFastHashRing_gen_key(VALUE vself, VALUE vstring_key){
   return INT2NUM(key);
 }
 
-int bisect(VALUE vsorted_keys, VALUE vkey){
+static VALUE cFastHashRing_bisect(VALUE vself, VALUE vsorted_keys, VALUE vkey){
   int i, vsorted_keys_len;
 
   vsorted_keys_len = RARRAY_LEN(vsorted_keys);
   for(i=0;i<vsorted_keys_len;i++){
     VALUE vsorted_key = rb_ary_entry(vsorted_keys, i);
-    if (NUM2LONG(vkey) < NUM2LONG(vsorted_key)) return i;
+    if (NUM2LONG(vkey) < NUM2LONG(vsorted_key)) return INT2NUM(i);
   }
 
-  return vsorted_keys_len;
+  return INT2NUM(vsorted_keys_len);
 }
 
 static VALUE cFastHashRing_get_node_pos(VALUE vself, VALUE vstring_key){
@@ -94,7 +101,7 @@ static VALUE cFastHashRing_get_node_pos(VALUE vself, VALUE vstring_key){
   vsorted_keys = rb_iv_get(vself, "@sorted_keys");
 
   vkey = cFastHashRing_gen_key(vself, vstring_key);
-  pos = bisect(vsorted_keys, vkey);
+  pos = NUM2INT(cFastHashRing_bisect(vself, vsorted_keys, vkey));
 
   if(pos == RARRAY_LEN(vsorted_keys))
     return INT2NUM(0);
@@ -189,4 +196,8 @@ void Init_fast_hash_ring(){
   rb_define_method(cFastHashRing, "gen_key", cFastHashRing_gen_key, 1);
   rb_define_method(cFastHashRing, "sorted_keys", cFastHashRing_sorted_keys, 0);
   rb_define_method(cFastHashRing, "nodes", cFastHashRing_nodes, 0);
+
+  // Make specs work
+  rb_define_protected_method(cFastHashRing, "hash_val", cFastHashRing_hash_val, 2);
+  rb_define_protected_method(cFastHashRing, "bisect", cFastHashRing_bisect, 2);
 }

data/spec/fast_hash_ring_spec.rb

@@ -22,15 +22,15 @@ describe FastHashRing do
     end
 
     it "should return 0 if it less than the first element" do
-      @ring.bisect(@test_array, 5).should eql(0)
+      @ring.send(:bisect, @test_array, 5).should eql(0)
     end
 
     it "should return the index it should go into to maintain order" do
-      @ring.bisect(@test_array, 15).should eql(1)
+      @ring.send(:bisect, @test_array, 15).should eql(1)
     end
 
     it "should return the final index if greater than all items" do
-      @ring.bisect(@test_array, 40).should eql(3)
+      @ring.send(:bisect, @test_array, 40).should eql(3)
     end
   end
 
@@ -149,19 +149,10 @@ describe FastHashRing do
       @ring = FastHashRing.new(['a'])
     end
 
-    it "should return the raw digest for _hash_digest" do
-      random_string = 'some random string'
-
-      m = Digest::MD5.new
-      m.update(random_string)
-      
-      @ring._hash_digest(random_string).should eql(m.digest)
-    end
-
-    it "should match the python output for _hash_val" do
+    it "should match the python output for hash_val" do
       # This output was taken directly from the python library
       py_output = 2830561728
-      ruby_output = @ring._hash_val(@ring._hash_digest('a')) { |x| x+4 }
+      ruby_output = @ring.send(:hash_val, 'a', 4)
 
       ruby_output.should eql(py_output)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fast_hash_ring
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - Flinn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-15 00:00:00 -05:00
+date: 2009-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: []