hash_ring 0.0.1 → 0.0.2

data/ext/hash_ring/extconf.rb

@@ -4,6 +4,6 @@ extension_name = 'hash_ring'
 
 dir_config(extension_name)
 
-have_library("hashring")
+abort "libhashring is required" unless have_library("hashring")
 
 create_makefile("hash_ring/hash_ring")

data/ext/hash_ring/hash_ring.c

@@ -1,18 +1,21 @@
 #include "ruby.h"
 #include "hash_ring.h"
 
+#define CHECK_RING(data) \
+  if (!data) \
+    rb_raise(rb_eRuntimeError, "uninitialized data");
+
 VALUE cHashRing;
 
 static VALUE hash_ring_dealloc(void * ring)
 {
-  hash_ring_free(ring);
+  if (ring)
+    hash_ring_free(ring);
 }
 
 static VALUE hash_ring_alloc(VALUE klass)
 {
-  hash_ring_t * ring;
-  VALUE obj = Data_Make_Struct(klass, hash_ring_t, NULL, hash_ring_dealloc, ring);
-  return obj;
+  return Data_Wrap_Struct(klass, NULL, hash_ring_dealloc, NULL);
 }
 
 static VALUE method_initialize(VALUE self, VALUE num_replicas, VALUE hash_function)
@@ -21,18 +24,24 @@ static VALUE method_initialize(VALUE self, VALUE num_replicas, VALUE hash_functi
   Check_Type(hash_function, T_FIXNUM);
 
   hash_ring_t * ring;
-  hash_ring_t * new_ring;
+  Data_Get_Struct(self, hash_ring_t, ring);
+
+  /* If this method is called twice, free the old ring. */
+  if (ring)
+    hash_ring_free(ring);
 
   int nr_int = FIX2INT(num_replicas);
   int hf_int = FIX2INT(hash_function);
 
-  Data_Get_Struct(self, hash_ring_t, ring);
+  ring = hash_ring_create(nr_int, hf_int);
 
-  new_ring = hash_ring_create(nr_int, hf_int);
+  VALUE ary = rb_ary_new();
 
-  MEMCPY(ring, new_ring, hash_ring_t, 1);
+  rb_iv_set(self, "@num_replicas", num_replicas);
+  rb_iv_set(self, "@hash_function", hash_function);
+  rb_iv_set(self, "@nodes", ary);
 
-  hash_ring_free(new_ring);
+  DATA_PTR(self) = ring;
 
   return self;
 }
@@ -43,9 +52,17 @@ static VALUE method_add_node(VALUE self, VALUE name)
   hash_ring_t *ring;
 
   Data_Get_Struct(self, hash_ring_t, ring);
+  CHECK_RING(ring);
 
   char * cname = StringValuePtr(name);
-  hash_ring_add_node(ring, cname, strlen(cname));
+
+  if(hash_ring_add_node(ring, cname, strlen(cname)) == 0){
+    VALUE ary = rb_iv_get(self, "@nodes");
+    rb_ary_push(ary, name);
+    rb_iv_set(self, "@nodes", ary);
+  } else {
+    return Qnil;
+  }
 
   return self;
 }
@@ -59,8 +76,15 @@ static VALUE method_remove_node(VALUE self, VALUE name)
   char * cname = StringValuePtr(name);
 
   Data_Get_Struct(self, hash_ring_t, ring);
+  CHECK_RING(ring);
 
-  hash_ring_remove_node(ring, cname, strlen(cname));
+  if(hash_ring_remove_node(ring, cname, strlen(cname)) == 0){
+    VALUE ary = rb_iv_get(self, "@nodes");
+    rb_ary_delete(ary, name);
+    rb_iv_set(self, "@nodes", ary);
+  } else {
+    return Qnil;
+  }
 
   return self;
 }
@@ -69,6 +93,7 @@ static VALUE method_print_ring(VALUE self)
 {
   hash_ring_t * ring;
   Data_Get_Struct(self, hash_ring_t, ring);
+  CHECK_RING(ring);
 
   hash_ring_print(ring);
   return self;
@@ -81,6 +106,7 @@ static VALUE method_find_node(VALUE self, VALUE key){
 
   hash_ring_t * ring;
   Data_Get_Struct(self, hash_ring_t, ring);
+  CHECK_RING(ring);
 
   hash_ring_node_t *node = hash_ring_find_node(ring, ckey, strlen(ckey));
 
@@ -101,9 +127,9 @@ void Init_hash_ring()
 
   rb_define_alloc_func(cHashRing, hash_ring_alloc);
 
-  rb_define_method(cHashRing, "init",         method_initialize,   2);
-  rb_define_method(cHashRing, "addNode",      method_add_node,     1);
-  rb_define_method(cHashRing, "removeNode",   method_remove_node,  1);
-  rb_define_method(cHashRing, "findNode",     method_find_node,    1);
-  rb_define_method(cHashRing, "printRing",    method_print_ring,   0);
+  rb_define_method(cHashRing, "initialize",    method_initialize,   2);
+  rb_define_method(cHashRing, "add_node",      method_add_node,     1);
+  rb_define_method(cHashRing, "remove_node",   method_remove_node,  1);
+  rb_define_method(cHashRing, "find_node",     method_find_node,    1);
+  rb_define_method(cHashRing, "print_ring",    method_print_ring,   0);
 }

data/lib/hash_ring.rb

@@ -1,37 +1,13 @@
-require 'hash_ring/hash_ring'
-
 class HashRing
-  VERSION = "0.0.1"
-
-  attr_accessor :nodes, :num_replicas, :hash_function
-
-  def initialize(num_replicas, hash_function)
-    @nodes = []
-    @num_replicas = num_replicas
-    @hash_function = hash_function
-    init(num_replicas, hash_function)
-  end
-
-  def add_node(name)
-    @nodes << name
-    @nodes.uniq!
-    self.addNode(name)
-  end
-
-  def remove_node(name)
-    @nodes.reject!{|n| n == name}
-    self.removeNode(name)
-  end
-
-  def find_node(name)
-    self.findNode(name)
-  end
+  VERSION = "0.0.2"
 
   def print
-    self.printRing
+    self.print_ring
   end
 
   def to_s
     "<HashRing:#{self.object_id} @num_replicas=#{@num_replicas} @hash_function=#{@hash_function} @nodes=#{@nodes}>"
   end
 end
+
+require 'hash_ring/hash_ring'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_ring
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000Z
+date: 2012-02-13 00:00:00.000000000Z
 dependencies: []
-description: Wraps https://github.com/mikeyk/hash-ring
+description: Wraps https://github.com/chrismoos/hash-ring
 email: michaelrbernstein@gmail.com
 executables: []
 extensions: