memcache 1.2.7 → 1.2.8

data/README.rdoc

@@ -221,6 +221,19 @@ NativeServer also accepts a few other options:
          is actually Jenkins's one-at-a-time hash), the default hashing method if you
          don't specify one is <tt>:crc</tt>.
 
+[+distribution+] The libmemcached distribution method. See http://docs.tangent.org/libmemcached/index.html
+                 for more detail. One of:
+
+                 <tt>:modula :consistent :ketama :ketama_spy</tt>
+
+                 NOTE: <tt>:modula</tt> is the default. internally, <tt>:consistent</tt>
+                 is an alias for <tt>:ketama</tt>, and <tt>:ketama_spy</tt> provides
+                 compatibility with the SPY Memcached client for Java.
+
+[+ketama] Sets the default distribution to <tt>:ketama</tt> and hash to <tt>:md5</tt>.
+
+[+ketama_wieghted] Enables ketama weighting and sets the default distribution to <tt>:ketama</tt> and hash to <tt>:md5</tt>.
+
 [+binary+] A boolean value specifying whether to use memcached's binary protocol instead
            of the default ascii protocol. This is slightly slower, but should allow you to use unicode keys.
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :build: 
 :minor: 2
-:patch: 7
+:patch: 8
 :major: 1

data/ext/native_server.c

@@ -11,11 +11,15 @@ VALUE cMemcacheClientError;
 VALUE cMemcacheConnectionError;
 VALUE sym_host;
 VALUE sym_port;
+VALUE sym_weight;
 VALUE sym_prefix;
 VALUE sym_hash;
 VALUE sym_hash_with_prefix;
+VALUE sym_distribution;
 VALUE sym_binary;
 VALUE sym_servers;
+VALUE sym_ketama;
+VALUE sym_ketama_weighted;
 
 ID id_default;
 ID id_md5;
@@ -27,6 +31,10 @@ ID id_fnv1a_32;
 ID id_jenkins;
 ID id_hsieh;
 ID id_murmur;
+ID id_modula;
+ID id_consistent;
+ID id_ketama;
+ID id_ketama_spy;
 
 static ID iv_memcache_flags, iv_memcache_cas;
 
@@ -38,8 +46,7 @@ static VALUE mc_alloc(VALUE klass) {
   memcached_st *mc;
   VALUE obj;
 
-  mc  = memcached_create(NULL);
-/*   memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_VERIFY_KEY, true); */
+  mc = memcached_create(NULL);
   memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_CACHE_LOOKUPS, true);
 
   obj = Data_Wrap_Struct(klass, 0, mc_free, mc);
@@ -77,21 +84,39 @@ static memcached_hash_t hash_behavior(VALUE sym) {
   rb_raise(cMemcacheError, "Invalid hash behavior");
 }
 
+static memcached_hash_t distribution_behavior(VALUE sym) {
+  ID id = SYM2ID(sym);
+
+  if (id == id_modula     ) return MEMCACHED_DISTRIBUTION_MODULA;
+  if (id == id_consistent ) return MEMCACHED_DISTRIBUTION_CONSISTENT;
+  if (id == id_ketama     ) return MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA;
+  if (id == id_ketama_spy ) return MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY;
+  rb_raise(cMemcacheError, "Invalid distribution behavior");
+}
+
 static VALUE mc_initialize(VALUE self, VALUE opts) {
   memcached_st *mc;
-  VALUE hostv, portv, servers_aryv, prefixv, hashv;
-  char* host;
-  char* server;
-  char* hashkit;
-  int   port, i;
+  VALUE servers_aryv, prefixv, hashv, distributionv;
 
   Data_Get_Struct(self, memcached_st, mc);
-  hashv        = rb_hash_aref(opts, sym_hash);
-  prefixv      = rb_hash_aref(opts, sym_prefix);
-  servers_aryv = rb_hash_aref(opts, sym_servers);
+  hashv         = rb_hash_aref(opts, sym_hash);
+  distributionv = rb_hash_aref(opts, sym_distribution);
+  prefixv       = rb_hash_aref(opts, sym_prefix);
+  servers_aryv  = rb_hash_aref(opts, sym_servers);
+
+  if (!NIL_P(hashv)) {
+    memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_HASH,        hash_behavior(hashv));
+    memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_KETAMA_HASH, hash_behavior(hashv));
+  }
 
-  if (!NIL_P(hashv))
-    memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_HASH, hash_behavior(hashv));
+  if (!NIL_P(distributionv))
+    memcached_behavior_set_distribution(mc, distribution_behavior(distributionv));
+
+  if (RTEST( rb_hash_aref(opts, sym_ketama) ))
+    memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_KETAMA, true);
+
+  if (RTEST( rb_hash_aref(opts, sym_ketama_weighted) ))
+    memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_KETAMA_WEIGHTED, true);
 
   if (RTEST( rb_hash_aref(opts, sym_hash_with_prefix) ))
     memcached_behavior_set(mc, MEMCACHED_BEHAVIOR_HASH_WITH_PREFIX_KEY, true);
@@ -103,17 +128,26 @@ static VALUE mc_initialize(VALUE self, VALUE opts) {
     memcached_callback_set(mc, MEMCACHED_CALLBACK_PREFIX_KEY, STR2CSTR(prefixv));
 
   if (!NIL_P(servers_aryv)) {
+    char* server;
+    int i;
+
     for (i = 0; i < RARRAY(servers_aryv)->len; i++) {
       server    = StringValuePtr(RARRAY(servers_aryv)->ptr[i]);
       memcached_server_push(mc, memcached_servers_parse(server));
     }
   } else {
-    hostv = rb_hash_aref(opts, sym_host);
-    portv = rb_hash_aref(opts, sym_port);
-    host  = StringValuePtr(hostv);
-    port  = NIL_P(portv) ? MEMCACHED_DEFAULT_PORT : NUM2INT(portv);
-
-    memcached_server_add(mc, host, port);
+    VALUE hostv, portv, weightv;
+    char* host;
+    int   port, weight;
+
+    hostv   = rb_hash_aref(opts, sym_host);
+    portv   = rb_hash_aref(opts, sym_port);
+    weightv = rb_hash_aref(opts, sym_weight);
+    host    = StringValuePtr(hostv);
+    port    = NIL_P(portv) ? MEMCACHED_DEFAULT_PORT : NUM2INT(portv);
+    weight  = NIL_P(weightv) ? 0 : NUM2INT(weightv);
+
+    memcached_server_add_with_weight(mc, StringValuePtr(hostv), port, weight);
   }
 
   return self;
@@ -538,25 +572,33 @@ VALUE mc_close(VALUE self) {
 void Init_native_server() {
   sym_host             = ID2SYM(rb_intern("host"));
   sym_port             = ID2SYM(rb_intern("port"));
+  sym_weight           = ID2SYM(rb_intern("weight"));
   sym_prefix           = ID2SYM(rb_intern("prefix"));
   sym_hash             = ID2SYM(rb_intern("hash"));
   sym_hash_with_prefix = ID2SYM(rb_intern("hash_with_prefix"));
+  sym_distribution     = ID2SYM(rb_intern("distribution"));
   sym_binary           = ID2SYM(rb_intern("binary"));
   sym_servers          = ID2SYM(rb_intern("servers"));
+  sym_ketama           = ID2SYM(rb_intern("ketama"));
+  sym_ketama_weighted  = ID2SYM(rb_intern("ketama_weighted"));
 
   iv_memcache_flags = rb_intern("@memcache_flags");
   iv_memcache_cas   = rb_intern("@memcache_cas");
 
-  id_default  = rb_intern("default");
-  id_md5      = rb_intern("md5");
-  id_crc      = rb_intern("crc");
-  id_fnv1_64  = rb_intern("fnv1_64");
-  id_fnv1a_64 = rb_intern("fnv1a_64");
-  id_fnv1_32  = rb_intern("fnv1_32");
-  id_fnv1a_32 = rb_intern("fnv1a_32");
-  id_jenkins  = rb_intern("jenkins");
-  id_hsieh    = rb_intern("hsieh");
-  id_murmur   = rb_intern("murmur");
+  id_default    = rb_intern("default");
+  id_md5        = rb_intern("md5");
+  id_crc        = rb_intern("crc");
+  id_fnv1_64    = rb_intern("fnv1_64");
+  id_fnv1a_64   = rb_intern("fnv1a_64");
+  id_fnv1_32    = rb_intern("fnv1_32");
+  id_fnv1a_32   = rb_intern("fnv1a_32");
+  id_jenkins    = rb_intern("jenkins");
+  id_hsieh      = rb_intern("hsieh");
+  id_murmur     = rb_intern("murmur");
+  id_modula     = rb_intern("modula");
+  id_consistent = rb_intern("consistent");
+  id_ketama     = rb_intern("ketama");
+  id_ketama_spy = rb_intern("ketama_spy");
 
   cMemcache = rb_define_class("Memcache", rb_cObject);
 

data/lib/memcache.rb

@@ -38,13 +38,12 @@ class Memcache
     @hash_with_prefix = opts[:hash_with_prefix].nil? ? true : opts[:hash_with_prefix]
 
     if opts[:native]
-      native_opts = {}
+      native_opts = opts.clone
       native_opts[:servers] = (opts[:servers] || [ opts[:server] ]).collect do |server|
-        server.is_a?(Hash) ? "#{server[:host]}:#{server[:port]}" : server
+        server.is_a?(Hash) ? "#{server[:host]}:#{server[:port]}:#{server[:weight]}" : server
       end
-      native_opts[:hash] = opts[:hash] || :crc
+      native_opts[:hash] ||= :crc unless native_opts[:ketama] or native_opts[:ketama_wieghted]
       native_opts[:hash_with_prefix] = @hash_with_prefix
-      native_opts[:binary] = opts[:binary]
 
       server_class = opts[:segment_large_values] ? SegmentedNativeServer : NativeServer
       @servers = [server_class.new(native_opts)]
@@ -239,6 +238,13 @@ class Memcache
     end
   end
 
+  def add_or_get(key, value, opts = {})
+    # Try to add, but if that fails, get the existing value.
+    add(key, value, opts)
+  rescue Memcache::Error
+    get(key)
+  end
+
   def get_some(keys, opts = {})
     keys = keys.collect {|key| key.to_s}
     records = opts[:disable] ? {} : self.multi_get(keys, opts)
@@ -249,10 +255,10 @@ class Memcache
     end
 
     keys_to_fetch = keys - records.keys
-    method = opts[:overwrite] ? :set : :add
+    method = opts[:overwrite] ? :set : :add_or_get
     if keys_to_fetch.any?
       yield(keys_to_fetch).each do |key, value|
-        self.send(method, key, value, opts) unless opts[:disable] or opts[:disable_write]
+        value = self.send(method, key, value, opts) unless opts[:disable] or opts[:disable_write]
         records[key] = value
       end
     end

data/lib/memcache/base.rb

@@ -57,8 +57,9 @@ class Memcache
   protected
 
     def cache_key(key)
+      raise Memcache::Error, "length zero key not permitted" if key.length == 0
       key = "#{prefix}#{key}"
-      raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
+      raise Memcache::Error, "key too long #{key.inspect}" if key.length > 250
       key
     end
   end

data/memcache.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.2.7"
+  s.version = "1.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors: 
 - Justin Balthrop