mperham-memcache-client 1.6.3 → 1.6.4

data/History.txt

@@ -1,7 +1,18 @@
-= 1.6.3 (2009-02-10)
+= 1.6.4 (2009-02-19)
+
+* Remove native code altogether.  The speedup was only 10% on Ruby 1.8.6 and did not work
+  on Ruby 1.9.1.
+
+* Removed memcache_util.rb from the distribution.  If you are using it, please copy the code
+  into your own project.  The file will live in the github repository for a few more months
+  for this purposes. http://github.com/mperham/memcache-client/raw/7a276089aa3c914e47e3960f9740ac7377204970/lib/memcache_util.rb
+
+* Roll continuum.rb into memcache.rb.  The project is again a single Ruby file, with no dependencies.
+
+= 1.6.3 (2009-02-14)
 
 * Remove gem native extension in preference to RubyInline.  This allows the gem to install
-and work on JRuby.
+and work on JRuby and Ruby 1.8.5 when the native code fails to compile.
 
 = 1.6.2 (2009-02-04)
 

data/lib/memcache.rb

@@ -6,8 +6,6 @@ require 'timeout'
 require 'zlib'
 require 'digest/sha1'
 
-require 'continuum'
-
 ##
 # A Ruby client library for memcached.
 #
@@ -17,7 +15,7 @@ class MemCache
   ##
   # The version of MemCache you are using.
 
-  VERSION = '1.6.2'
+  VERSION = '1.6.4'
 
   ##
   # Default options for the cache object.
@@ -120,6 +118,8 @@ class MemCache
 
     logger.info { "memcache-client #{VERSION} #{Array(servers).inspect}" } if logger
 
+    Thread.current[:memcache_client] = self.object_id if !@multithread
+
     self.servers = servers
   end
 
@@ -606,6 +606,8 @@ class MemCache
   # failures (but does still apply to unexpectedly lost connections etc.).
 
   def with_socket_management(server, &block)
+    check_multithread_status!
+
     @mutex.lock if @multithread
     retried = false
 
@@ -697,6 +699,18 @@ class MemCache
     ((total_servers * Continuum::POINTS_PER_SERVER * server.weight) / Float(total_weight)).floor
   end
 
+  def check_multithread_status!
+    return if @multithread
+
+    if Thread.current[:memcache_client] != self.object_id
+      raise MemCacheError, <<-EOM
+        You are accessing this memcache-client instance from multiple threads but have not enabled multithread support.
+        Normally:  MemCache.new(['localhost:11211'], :multithread => true)
+        In Rails:  config.cache_store = [:mem_cache_store, 'localhost:11211', { :multithread => true }]
+      EOM
+    end
+  end
+
   ##
   # This class represents a memcached server instance.
 
@@ -894,3 +908,42 @@ class TCPTimeoutSocket
     @sock.close
   end
 end
+
+module Continuum
+  POINTS_PER_SERVER = 160 # this is the default in libmemcached
+
+  # Find the closest index in Continuum with value <= the given value
+  def self.binary_search(ary, value, &block)
+    upper = ary.size - 1
+    lower = 0
+    idx = 0
+
+    while(lower <= upper) do
+      idx = (lower + upper) / 2
+      comp = ary[idx].value <=> value
+
+      if comp == 0
+        return idx
+      elsif comp > 0
+        upper = idx - 1
+      else
+        lower = idx + 1
+      end
+    end
+    return upper
+  end
+
+  class Entry
+    attr_reader :value
+    attr_reader :server
+
+    def initialize(val, srv)
+      @value = val
+      @server = srv
+    end
+
+    def inspect
+      "<#{value}, #{server.host}:#{server.port}>"
+    end
+  end
+end

data/test/test_mem_cache.rb

@@ -333,6 +333,32 @@ class TestMemCache < Test::Unit::TestCase
     assert !server.alive?
   end
 
+  def test_multithread_error
+    server = FakeServer.new
+
+    # Write two messages to the socket to test failover
+    server.socket.data.write "bogus response\r\nbogus response\r\n"
+    server.socket.data.rewind
+
+    @cache.servers = []
+    @cache.servers << server
+
+    assert_nothing_raised do
+      @cache.set 'a', 1
+    end
+
+    passed = true
+    Thread.new do
+      begin
+        @cache.set 'b', 2
+        passed = false
+      rescue MemCache::MemCacheError => me
+        passed = me.message =~ /multiple threads/
+      end
+    end
+    assert passed
+  end
+
   def test_initialize
     cache = MemCache.new :namespace => 'my_namespace', :readonly => true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mperham-memcache-client
 version: !ruby/object:Gem::Version 
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors: 
 - Eric Hodel
@@ -11,19 +11,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-05 00:00:00 -08:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: 
-  - RubyInline
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: A Ruby library for accessing memcached.
 email: mperham@gmail.com
 executables: []
@@ -37,9 +28,7 @@ files:
 - LICENSE.txt
 - History.txt
 - Rakefile
-- lib/continuum.rb
 - lib/memcache.rb
-- lib/memcache_util.rb
 has_rdoc: false
 homepage: http://github.com/mperham/memcache-client
 post_install_message: 

data/lib/continuum.rb

@@ -1,77 +0,0 @@
-module Continuum
-  POINTS_PER_SERVER = 160 # this is the default in libmemcached
-
-  class << self
-
-    begin
-      require 'inline'
-      inline do |builder|
-        builder.c <<-EOM
-        int binary_search(VALUE ary, unsigned int r) {
-            int upper = RARRAY_LEN(ary) - 1;
-            int lower = 0;
-            int idx = 0;
-            ID value = rb_intern("value");
-
-            while (lower <= upper) {
-                idx = (lower + upper) / 2;
-
-                VALUE continuumValue = rb_funcall(RARRAY_PTR(ary)[idx], value, 0);
-                unsigned int l = NUM2UINT(continuumValue);
-                if (l == r) {
-                    return idx;
-                }
-                else if (l > r) {
-                    upper = idx - 1;
-                }
-                else {
-                    lower = idx + 1;
-                }
-            }
-            return upper;
-        }
-        EOM
-      end
-    rescue Exception => e
-      puts "Unable to generate native code, falling back to Ruby: #{e.message}"
-
-      # slow but pure ruby version
-      # Find the closest index in Continuum with value <= the given value
-      def binary_search(ary, value, &block)
-        upper = ary.size - 1
-        lower = 0
-        idx = 0
-
-        while(lower <= upper) do
-          idx = (lower + upper) / 2
-          comp = ary[idx].value <=> value
-
-          if comp == 0
-            return idx
-          elsif comp > 0
-            upper = idx - 1
-          else
-            lower = idx + 1
-          end
-        end
-        return upper
-      end
-
-    end
-  end
-
-
-  class Entry
-    attr_reader :value
-    attr_reader :server
-
-    def initialize(val, srv)
-      @value = val
-      @server = srv
-    end
-
-    def inspect
-      "<#{value}, #{server.host}:#{server.port}>"
-    end
-  end
-end

data/lib/memcache_util.rb

@@ -1,102 +0,0 @@
-##
-# A utility wrapper around the MemCache client to simplify cache access.  All
-# methods silently ignore MemCache errors.
-
-module Cache
-  
-  ##
-  # Try to return a logger object that does not rely
-  # on ActiveRecord for logging.
-  def self.logger
-    @logger ||= if defined? Rails.logger # Rails 2.1 +
-      Rails.logger
-    elsif defined? RAILS_DEFAULT_LOGGER # Rails 1.2.2 +
-      RAILS_DEFAULT_LOGGER
-    else
-      ActiveRecord::Base.logger # ... very old Rails.
-    end
-  end
-  ##
-  # Returns the object at +key+ from the cache if successful, or nil if either
-  # the object is not in the cache or if there was an error attermpting to
-  # access the cache.
-  #
-  # If there is a cache miss and a block is given the result of the block will
-  # be stored in the cache with optional +expiry+, using the +add+ method rather
-  # than +set+.
-
-  def self.get(key, expiry = 0)
-    start_time = Time.now
-    value = CACHE.get key
-    elapsed = Time.now - start_time
-    logger.debug('MemCache Get (%0.6f)  %s' % [elapsed, key])
-    if value.nil? and block_given? then
-      value = yield
-      add key, value, expiry
-    end
-    value
-  rescue MemCache::MemCacheError => err
-    logger.debug "MemCache Error: #{err.message}"
-    if block_given? then
-      value = yield
-      put key, value, expiry
-    end
-    value
-  end
-
-  ##
-  # Sets +value+ in the cache at +key+, with an optional +expiry+ time in
-  # seconds.
-
-  def self.put(key, value, expiry = 0)
-    start_time = Time.now
-    CACHE.set key, value, expiry
-    elapsed = Time.now - start_time
-    logger.debug('MemCache Set (%0.6f)  %s' % [elapsed, key])
-    value
-  rescue MemCache::MemCacheError => err
-    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
-    nil
-  end
-
-  ##
-  # Sets +value+ in the cache at +key+, with an optional +expiry+ time in
-  # seconds.  If +key+ already exists in cache, returns nil.
-
-  def self.add(key, value, expiry = 0)
-    start_time = Time.now
-    response = CACHE.add key, value, expiry
-    elapsed = Time.now - start_time
-    logger.debug('MemCache Add (%0.6f)  %s' % [elapsed, key])
-    (response == "STORED\r\n") ? value : nil
-  rescue MemCache::MemCacheError => err
-    ActiveRecord::Base.logger.debug "MemCache Error: #{err.message}"
-    nil
-  end
-
-  ##
-  # Deletes +key+ from the cache in +delay+ seconds.
-
-  def self.delete(key, delay = nil)
-    start_time = Time.now
-    CACHE.delete key, delay
-    elapsed = Time.now - start_time
-    logger.debug('MemCache Delete (%0.6f)  %s' %
-                                    [elapsed, key])
-    nil
-  rescue MemCache::MemCacheError => err
-    logger.debug "MemCache Error: #{err.message}"
-    nil
-  end
-
-  ##
-  # Resets all connections to MemCache servers.
-
-  def self.reset
-    CACHE.reset
-    logger.debug 'MemCache Connections Reset'
-    nil
-  end
-
-end
-