memcached 0.19.10 → 0.20.0

data/memcached.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{memcached}
-  s.version = "0.19.10"
+  s.version = "0.20.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
   s.cert_chain = ["/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-public_cert.pem"]
-  s.date = %q{2010-07-14}
+  s.date = %q{2010-08-03}
   s.description = %q{An interface to the libmemcached C client.}
   s.email = %q{}
   s.extensions = ["ext/extconf.rb"]
-  s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
-  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
+  s.extra_rdoc_files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "README", "TODO", "lib/memcached.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental_memcached.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb"]
+  s.files = ["BENCHMARKS", "CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "ext/extconf.rb", "ext/libmemcached-0.32.tar.gz", "ext/libmemcached-2.patch", "ext/libmemcached-3.patch", "ext/libmemcached-4.patch", "ext/libmemcached-5.patch", "ext/libmemcached.patch", "ext/rlibmemcached.i", "ext/rlibmemcached_wrap.c", "ext/sasl.patch", "lib/memcached.rb", "lib/memcached/auth.rb", "lib/memcached/behaviors.rb", "lib/memcached/exceptions.rb", "lib/memcached/experimental_memcached.rb", "lib/memcached/integer.rb", "lib/memcached/memcached.rb", "lib/memcached/rails.rb", "test/profile/benchmark.rb", "test/profile/profile.rb", "test/profile/valgrind.rb", "test/setup.rb", "test/teardown.rb", "test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb", "memcached.gemspec"]
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/memcached/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Memcached", "--main", "README"]
   s.require_paths = ["lib", "ext"]
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.signing_key = %q{/Users/eweaver/p/configuration/gem_certificates/evan_weaver-original-private_key.pem}
   s.summary = %q{An interface to the libmemcached C client.}
-  s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
+  s.test_files = ["test/test_helper.rb", "test/unit/binding_test.rb", "test/unit/memcached_experimental_test.rb", "test/unit/memcached_test.rb", "test/unit/rails_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/unit/memcached_experimental_test.rb

@@ -0,0 +1,230 @@
+
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+require 'socket'
+require 'mocha'
+require 'benchmark'
+
+class MemcachedExperimentalTest < Test::Unit::TestCase
+
+  def setup
+    @servers = ['localhost:43042', 'localhost:43043', "#{UNIX_SOCKET_NAME}0"]
+
+    # Maximum allowed prefix key size for :hash_with_prefix_key_key => false
+    @prefix_key = 'prefix_key_'
+
+    @options = {
+      :prefix_key => @prefix_key,
+      :hash => :default,
+      :distribution => :modula}
+    @cache = Memcached.new(@servers, @options)
+
+    @experimental_options = {
+      :prefix_key => @prefix_key,
+      :hash => :default,
+      :distribution => :modula,
+      :experimental_features => true}
+    @experimental_cache = Memcached.new(@servers, @experimental_options)
+
+    @experimental_cas_options = {
+      :prefix_key => @prefix_key,
+      :support_cas => true,
+      :experimental_features => true}
+    @experimental_cas_cache = Memcached.new(@servers, @experimental_cas_options)
+
+    @experimental_binary_protocol_options = {
+      :prefix_key => @prefix_key,
+      :hash => :default,
+      :distribution => :modula,
+      :experimental_features => true,
+      # binary_protocol does not work -- test_get, test_get, test_append, and test_missing_append will fail when it is set to true.
+      :binary_protocol => true}
+    @experimental_binary_protocol_cache = Memcached.new(@servers, @experimental_binary_protocol_options)
+
+    @value = OpenStruct.new(:a => 1, :b => 2, :c => GenericClass)
+  end
+
+  def server_get_len_capable
+    begin
+      value = "foobar"
+      @experimental_cache.set key, value, 0, false
+      @experimental_cache.get_len 1, key
+      yield
+    rescue Memcached::ProtocolError
+      # Skip tests when the server does not support the experimental get_len command.
+    end
+  end
+
+  def test_get_len
+    server_get_len_capable {
+      value = "foobar"
+      @experimental_cache.set key, value, 0, false
+      result = @experimental_cache.get_len 1, key
+      assert_equal result.size, 1
+      assert_equal result, value[0..0]
+
+      result = @experimental_cache.get_len 2, key
+      assert_equal result.size, 2
+      assert_equal result, value[0..1]
+
+      result = @experimental_cache.get_len 5, key
+      assert_equal result.size, 5
+      assert_equal result, value[0..4]
+
+      result = @experimental_cache.get_len 6, key
+      assert_equal result.size, 6
+      assert_equal result, value
+
+      result = @experimental_cache.get_len 32, key
+      assert_equal result.size, 6
+      assert_equal result, value
+    }
+  end
+
+  def test_get_len_0_failure
+    server_get_len_capable {
+      value = "Test that we cannot get 0 bytes with a get_len call."
+      @experimental_cache.set key, value, 0, false
+      assert_raises(Memcached::Failure) do
+        result = @experimental_cache.get_len 0, key
+      end
+    }
+  end
+
+  def test_get_len_large
+    server_get_len_capable {
+      value = "Test that we can get the first 20 bytes of a string"
+      @experimental_cache.set key, value, 0, false
+      result = @experimental_cache.get_len 20, key
+      assert_equal result.size, 20
+      assert_equal result, value[0..19]
+    }
+  end
+
+  def test_get_len_packed
+    server_get_len_capable {
+      value = [1, 2, 3, 4].pack("Q*")
+      @experimental_cache.set key, value, 0, false
+      result = @experimental_cache.get_len 8, key
+      assert_equal [1], result.unpack("Q*")
+    }
+  end
+
+  # get_len is not supported when using the binary protocol.
+  # Make sure the single get variant fails appropriately.
+  def test_get_len_binary
+    server_get_len_capable {
+      @experimental_binary_protocol_cache.set key, @value
+      assert_raises(Memcached::ActionNotSupported) do
+        result = @experimental_binary_protocol_cache.get_len 2, key
+      end
+    }
+  end
+
+  # Retrieve the first 64 bits of the values for multiple keys.
+  def test_get_len_multi_packed
+    server_get_len_capable {
+      key_1 = "get_len_1"
+      value_1 = [1, 2, 3].pack("Q*")
+      key_2 = "get_len_missing"
+      key_3 = "get_len_2"
+      value_3 = [5, 6, 4].pack("Q*")
+      keys = [key_1, key_2, key_3]
+      @experimental_cache.set key_1, value_1, 0, false
+      @experimental_cache.set key_3, value_3, 0, false
+      assert_equal(
+        {key_1=>value_1[0..7], key_3=>value_3[0..7]},
+        @experimental_cache.get_len(8, keys)
+      )
+    }
+  end
+
+  # Test that the entire value is passed back when the length specified
+  # is larger than any of the values (e.g., 32 in the case below).
+  def test_get_len_multi_packed_full
+    server_get_len_capable {
+      key_1 = "get_len_1"
+      value_1 = [1, 2, 3].pack("Q*")
+      key_2 = "get_len_missing"
+      key_3 = "get_len_2"
+      value_3 = [5, 6, 4].pack("Q*")
+      keys = [key_1, key_2, key_3]
+      @experimental_cache.set key_1, value_1, 0, false
+      @experimental_cache.set key_3, value_3, 0, false
+      assert_equal(
+        {key_1=>value_1, key_3=>value_3},
+        @experimental_cache.get_len(32, keys)
+      )
+    }
+  end
+
+  # get_len is not supported when using the binary protocol.
+  # Test that the multi get variant fails appropriately.
+  def test_get_len_multi_packed_binary
+    server_get_len_capable {
+      key_1 = "get_len_1"
+      value_1 = [1, 2, 3].pack("Q*")
+      key_2 = "get_len_2"
+      value_2 = [5, 6, 4].pack("Q*")
+      keys = [key_1, key_2]
+      @experimental_binary_protocol_cache.set key_1, value_1, 0, false
+      @experimental_binary_protocol_cache.set key_2, value_2, 0, false
+      assert_raises(Memcached::ActionNotSupported) do
+        result = @experimental_binary_protocol_cache.get_len 2, keys
+      end
+    }
+  end
+
+  def test_get_len_multi_completely_missing
+    server_get_len_capable {
+      @experimental_cache.delete "#{key}_1" rescue nil
+      @experimental_cache.delete "#{key}_2" rescue nil
+      assert_equal(
+        {},
+        @experimental_cache.get_len(1, ["#{key}_1", "#{key}_2"])
+       )
+    }
+  end
+
+  def test_get_len_failure
+    server_get_len_capable {
+      value = "Test that we cannot use get_len without setting the :experimental_features config."
+      assert_raises(NoMethodError) do
+        result = @cache.get_len 10, key
+      end
+    }
+  end
+
+  def test_cas
+    server_get_len_capable {
+      # Get the first three chars of the value back.
+      @experimental_cas_cache.set(key, "foo_bar", 0, false)
+      assert_equal "foo", @experimental_cas_cache.get_len(3, key)
+      assert_equal "foo_bar", @experimental_cas_cache.get_len(7, key)
+    }
+  end
+
+  # Memory cleanup
+
+  def test_reset
+    original_struct = @cache.instance_variable_get("@struct")
+    assert_nothing_raised do
+      @cache.reset
+    end
+    assert_not_equal original_struct,
+      @cache.instance_variable_get("@struct")
+  end
+
+  private
+
+  def key
+    caller.first[/.*[` ](.*)'/, 1] # '
+  end
+
+  def stub_server(port)
+    socket = TCPServer.new('127.0.0.1', port)
+    Thread.new { socket.accept }
+    socket
+  end
+
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 19
-  - 10
-  version: 0.19.10
+  - 20
+  - 0
+  version: 0.20.0
 platform: ruby
 authors: 
 - Evan Weaver
@@ -35,7 +35,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2010-07-14 00:00:00 -07:00
+date: 2010-08-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,7 @@ extra_rdoc_files:
 - lib/memcached.rb
 - lib/memcached/behaviors.rb
 - lib/memcached/exceptions.rb
+- lib/memcached/experimental_memcached.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
 files: 
@@ -69,6 +70,7 @@ files:
 - ext/libmemcached-2.patch
 - ext/libmemcached-3.patch
 - ext/libmemcached-4.patch
+- ext/libmemcached-5.patch
 - ext/libmemcached.patch
 - ext/rlibmemcached.i
 - ext/rlibmemcached_wrap.c
@@ -77,6 +79,7 @@ files:
 - lib/memcached/auth.rb
 - lib/memcached/behaviors.rb
 - lib/memcached/exceptions.rb
+- lib/memcached/experimental_memcached.rb
 - lib/memcached/integer.rb
 - lib/memcached/memcached.rb
 - lib/memcached/rails.rb
@@ -87,6 +90,7 @@ files:
 - test/teardown.rb
 - test/test_helper.rb
 - test/unit/binding_test.rb
+- test/unit/memcached_experimental_test.rb
 - test/unit/memcached_test.rb
 - test/unit/rails_test.rb
 - memcached.gemspec
@@ -130,5 +134,6 @@ summary: An interface to the libmemcached C client.
 test_files: 
 - test/test_helper.rb
 - test/unit/binding_test.rb
+- test/unit/memcached_experimental_test.rb
 - test/unit/memcached_test.rb
 - test/unit/rails_test.rb