memcache 1.2.12 → 1.2.13

data/README.rdoc

@@ -3,9 +3,9 @@
 This is the Geni memcached client. It started out as a fork of fiveruns/memcache-client,
 which was a fork of seattle.rb's memcache-client, but over time, our client has diverged,
 and I've rewritten the majority of the code. Of course, a lot of credit is due to those
-whose code served as a starting point for this code. Also, thanks to Evan Weaver for the
-idea to include the libmemcached source and the code to make it compile when installing
-the gem.
+whose code served as a starting point for this code. Thanks to fauna for the idea to
+include the libmemcached source and the code to make it compile when installing the
+gem. Thanks to develon for the improvements to SegementedServer.
 
 == Usage
 

data/Rakefile

@@ -59,12 +59,14 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-namespace :test do
+namespace :test => 'lib/memcache/native_server.o' do
   Rake::TestTask.new(:native) do |t|
-    `cd ext && make && cp native_server.bundle native_server.o ../lib/memcache/`
     t.libs << 'test'
     t.pattern = 'test/memcache_*native_server_test.rb'
     t.verbose
   end
 end
 
+file 'lib/memcache/native_server.o' do
+  `cd ext && ruby extconf.rb && make && cp native_server.bundle native_server.o ../lib/memcache/`
+end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:build: 
 :minor: 2
-:patch: 12
+:patch: 13
+:build: 
 :major: 1

data/ext/extconf.rb

@@ -27,7 +27,7 @@ if !ENV["EXTERNAL_LIB"]
       raise "'#{cmd}' failed" unless system(cmd)
 
       Dir.chdir(BUNDLE_PATH) do
-        puts(cmd = "env CFLAGS='-fPIC' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{$EXTRA_CONF} 2>&1")
+        puts(cmd = "env CFLAGS='-fPIC' ./configure --prefix=#{HERE} --without-memcached --disable-shared --disable-utils --disable-dependency-tracking #{ARGV.join(' ')} 2>&1")
         raise "'#{cmd}' failed" unless system(cmd)
 
         puts(cmd = "make CXXFLAGS='#{$CXXFLAGS}' || true 2>&1")

data/lib/memcache.rb

@@ -108,7 +108,7 @@ class Memcache
     raise 'opts must be hash' unless opts.instance_of?(Hash)
 
     if keys.instance_of?(Array)
-      keys.collect! {|key| key.to_s}
+      keys = keys.collect {|key| key.to_s}
       multi_get(keys, opts)
     else
       key = keys.to_s
@@ -196,7 +196,8 @@ class Memcache
   end
 
   def count(key)
-    get(key, :raw => true).to_i
+    value = get(key, :raw => true)
+    value.to_i if value
   end
 
   def incr(key, amount = 1)
@@ -262,7 +263,12 @@ class Memcache
     method = opts[:overwrite] ? :set : :add
     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]
+        begin
+          self.send(method, key, value, opts) unless opts[:disable] or opts[:disable_write]
+        rescue Memcache::Error => e
+          raise if opts[:strict_write]
+          $stderr.puts "Memcache error in get_some: #{e.class} #{e.to_s} on key '#{key}' while storing value: #{value}"
+        end
         records[key] = value
       end
     end
@@ -414,7 +420,7 @@ protected
     object.memcache_cas   = value.memcache_cas
     object
   rescue Exception => e
-    puts "Memcache read error: #{e.class} #{e.to_s} on key '#{key}' while unmarshalling value: #{value}"
+    $stderr.puts "Memcache read error: #{e.class} #{e.to_s} on key '#{key}' while unmarshalling value: #{value}"
     nil
   end
 

data/lib/memcache/segmented.rb

@@ -14,13 +14,8 @@ class Memcache
       keys_to_fetch = []
       results.each do |key, value|
         next unless segmented?(value)
-        hash, num = value.split(':')
-        keys[key] = []
-        num.to_i.times do |i|
-          hash_key = "#{hash}:#{i}"
-          keys_to_fetch << hash_key
-          keys[key]     << hash_key
-        end
+        keys[key] = segment_keys(value)
+        keys_to_fetch.concat keys[key]
       end
 
       parts = super(keys_to_fetch)
@@ -45,13 +40,17 @@ class Memcache
     end
 
     def set(key, value, expiry = 0, flags = 0)
-      hash, flags = store_segments(key, value, expiry, flags)
-      super(key, hash, expiry, flags) && value
+      delete(key) do
+        hash, flags = store_segments(key, value, expiry, flags)
+        super(key, hash, expiry, flags) && value
+      end
     end
 
     def cas(key, value, cas, expiry = 0, flags = 0)
-      hash, flags = store_segments(key, value, expiry, flags)
-      super(key, hash, cas, expiry, flags) && value
+      delete(key) do
+        hash, flags = store_segments(key, value, expiry, flags)
+        super(key, hash, cas, expiry, flags) && value
+      end
     end
 
     def add(key, value, expiry = 0, flags = 0)
@@ -60,8 +59,19 @@ class Memcache
     end
 
     def replace(key, value, expiry = 0, flags = 0)
-      hash, flags = store_segments(key, value, expiry, flags)
-      super(key, hash, expiry, flags) && value
+      delete(key) do
+        hash, flags = store_segments(key, value, expiry, flags)
+        super(key, hash, expiry, flags) && value
+      end
+    end
+
+    def delete(key)
+      value  = super_get(key)
+      result = block_given? ? yield : super
+      if result and segmented?(value)
+        segment_keys(value).each {|k| super(k)}
+      end
+      result
     end
 
   private
@@ -94,6 +104,18 @@ class Memcache
         [value, flags]
       end
     end
+
+    def segment_keys(value)
+      hash, num = value.split(':')
+      (0...num.to_i).collect {|i| "#{hash}:#{i}"}
+    end
+
+    def self.included(klass)
+      super_get = klass.ancestors[2].instance_method(:get)
+      klass.send(:define_method, :super_get) do |key|
+        super_get.bind(self).call([key])[key]
+      end
+    end
   end
 
   class SegmentedServer < Server

data/lib/memcache/server.rb

@@ -216,7 +216,7 @@ class Memcache
     end
 
     def read_command(command, &block)
-      raise ConnectionError, "Server dead, will retry at #{retry_at}" unless alive?
+      raise ConnectionError, "Server #{name} dead, will retry at #{retry_at}" unless alive?
       send_command(command) do |response|
         while response do
           return if response == "END\r\n"

data/memcache.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcache}
-  s.version = "1.2.12"
+  s.version = "1.2.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Balthrop"]
-  s.date = %q{2010-05-10}
+  s.date = %q{2010-08-31}
   s.description = %q{Ruby client for memcached supporting advanced protocol features and pluggable architecture.}
   s.email = %q{code@justinbalthrop.com}
   s.extensions = ["ext/extconf.rb"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
      "test/memcache_pg_server_test.rb",
      "test/memcache_segmented_native_server_test.rb",
      "test/memcache_segmented_server_test.rb",
+     "test/memcache_segmented_test_helper.rb",
      "test/memcache_server_test.rb",
      "test/memcache_server_test_helper.rb",
      "test/memcache_test.rb",
@@ -51,7 +52,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/ninjudd/memcache}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Advanced ruby memcache client}
   s.test_files = [
     "test/memcache_local_server_test.rb",
@@ -60,6 +61,7 @@ Gem::Specification.new do |s|
      "test/memcache_pg_server_test.rb",
      "test/memcache_segmented_native_server_test.rb",
      "test/memcache_segmented_server_test.rb",
+     "test/memcache_segmented_test_helper.rb",
      "test/memcache_server_test.rb",
      "test/memcache_server_test_helper.rb",
      "test/memcache_test.rb",
@@ -70,7 +72,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/test/memcache_segmented_native_server_test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/memcache_server_test_helper'
+require File.dirname(__FILE__) + '/memcache_segmented_test_helper'
 
 $VERBOSE = nil
 Memcache::Segmented.const_set('MAX_SIZE', 3)
@@ -7,6 +8,7 @@ Memcache::Segmented.const_set('MAX_SIZE', 3)
 class MemcacheSegmentedNativeServerTest < Test::Unit::TestCase
   include MemcacheServerTestHelper
   include MemcacheServerTestHelper::AdvancedMethods
+  include MemcacheSegmentedTestHelper
   with_prefixes nil, "foo:", "bar:"
 
   PORTS = [11212, 11213, 11214]

data/test/memcache_segmented_server_test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
 require File.dirname(__FILE__) + '/memcache_server_test_helper'
+require File.dirname(__FILE__) + '/memcache_segmented_test_helper'
 
 $VERBOSE = nil
 Memcache::Segmented.const_set('MAX_SIZE', 3)
@@ -7,6 +8,8 @@ Memcache::Segmented.const_set('MAX_SIZE', 3)
 class MemcacheSegmentedServerTest < Test::Unit::TestCase
   include MemcacheServerTestHelper
   include MemcacheServerTestHelper::AdvancedMethods
+  include MemcacheSegmentedTestHelper
+
   with_prefixes nil, "foo:", "bar:"
 
   PORT = 11212

data/test/memcache_segmented_test_helper.rb

@@ -0,0 +1,19 @@
+module MemcacheSegmentedTestHelper
+  def test_segmented_delete
+    m.set('fav_numbers', '1,2,3,4,5,6,7,8,9,10')
+
+    master_key   = m.send(:super_get, 'fav_numbers')
+    segment_keys = m.send(:segment_keys, master_key)
+
+    assert_not_equal '1,2,3,4,5,6,7,8,9,10', master_key
+    assert_equal 7, segment_keys.size
+
+    assert_equal '1,2,3,4,5,6,7,8,9,10', m.get('fav_numbers')
+    assert_equal true, m.delete('fav_numbers')
+    assert_equal nil, m.get('fav_numbers')
+
+    segment_keys.each do |k|
+      assert_equal nil, m.get(k)
+    end
+  end
+end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: memcache
 version: !ruby/object:Gem::Version 
-  version: 1.2.12
+  hash: 5
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 13
+  version: 1.2.13
 platform: ruby
 authors: 
 - Justin Balthrop
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-10 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -48,6 +54,7 @@ files:
 - test/memcache_pg_server_test.rb
 - test/memcache_segmented_native_server_test.rb
 - test/memcache_segmented_server_test.rb
+- test/memcache_segmented_test_helper.rb
 - test/memcache_server_test.rb
 - test/memcache_server_test_helper.rb
 - test/memcache_test.rb
@@ -62,21 +69,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Advanced ruby memcache client
@@ -87,6 +100,7 @@ test_files:
 - test/memcache_pg_server_test.rb
 - test/memcache_segmented_native_server_test.rb
 - test/memcache_segmented_server_test.rb
+- test/memcache_segmented_test_helper.rb
 - test/memcache_server_test.rb
 - test/memcache_server_test_helper.rb
 - test/memcache_test.rb