memcached 0.6 → 0.7

data/test/unit/binding_test.rb

@@ -3,6 +3,6 @@ require "#{File.dirname(__FILE__)}/../test_helper"
 
 class BindingTest < Test::Unit::TestCase
   def test_libmemcached_loaded
-    assert_nothing_raised { Libmemcached }
+    assert_nothing_raised { Rlibmemcached }
   end
 end

data/test/unit/memcached_test.rb

@@ -5,7 +5,7 @@ class MemcachedTest < Test::Unit::TestCase
 
   def setup
     @servers = ['127.0.0.1:43042', '127.0.0.1:43043']
-    @namespace = 'class_test_namespace'
+    @namespace = 'memcached_test_namespace'
     @cache = Memcached.new(
       @servers, 
       :namespace => @namespace, 
@@ -33,11 +33,27 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal 43043, cache.send(:server_structs).last.port
   end
   
+  def test_destroy
+    cache = Memcached.new @servers, :namespace => 'test'
+    cache.destroy
+    assert_raise(Memcached::ClientError) do
+      cache.get key
+    end
+  end
+  
   def test_initialize_with_invalid_server_strings
     assert_raise(ArgumentError) { Memcached.new "localhost:43042" }
     assert_raise(ArgumentError) { Memcached.new "127.0.0.1:memcached" }
     assert_raise(ArgumentError) { Memcached.new "127.0.0.1:43043:1" }
   end
+  
+  def test_initialize_with_missing_server
+    # XXX Triggers abort trap with libmemcached --enable-debug.
+    @cache = Memcached.new "127.0.0.1:43044"
+    assert_raises Memcached::SystemError do
+      @cache.get key
+    end
+  end
 
   def test_initialize_without_namespace
     cache = Memcached.new @servers
@@ -74,7 +90,7 @@ class MemcachedTest < Test::Unit::TestCase
   def test_get_with_namespace
     @cache.set key, @value
     result = @cache.get key, false
-    direct_result = Libmemcached.memcached_get(
+    direct_result = Rlibmemcached.memcached_get(
       @cache.instance_variable_get("@struct"), 
       "#{@namespace}#{key}"
     ).first  
@@ -94,11 +110,11 @@ class MemcachedTest < Test::Unit::TestCase
     end
   end
 
-  def test_truncation_issue_is_covered
+  def test_values_with_null_characters_are_not_truncated
     value = OpenStruct.new(:a => Object.new) # Marshals with a null \000
     @cache.set key, value
     result = @cache.get key, false
-    non_wrapped_result = Libmemcached.memcached_get(
+    non_wrapped_result = Rlibmemcached.memcached_get(
       @cache.instance_variable_get("@struct"), 
       "#{@namespace}#{key}"
     ).first
@@ -107,21 +123,33 @@ class MemcachedTest < Test::Unit::TestCase
 
   def test_get_invalid_key
     assert_raise(Memcached::ClientError) { @cache.get(key * 100) }
-    assert_raise(Memcached::ClientError) { @cache.get "I'm so bad" }
+    # XXX Trying to get Krow to change this to ProtocolError
+    assert_raise(Memcached::NotFound) { @cache.get "I'm so bad" } 
+  end 
+
+  def test_get_multi_invalid_key
+    assert_raise(Memcached::ClientError) { @cache.get([key * 100]) }
+    # XXX Trying to get Krow to change this to ProtocolError
+    assert_equal({}, 
+     @cache.get(["I'm so bad"]))
   end
 
   def test_get_multi
     @cache.set "#{key}_1", 1
     @cache.set "#{key}_2", 2
-    assert_equal [1, 2], 
-      @cache.get(["#{key}_1", "#{key}_2"])
+    assert_equal({"#{key}_1" => 1, "#{key}_2" => 2},
+      @cache.get(["#{key}_1", "#{key}_2"]))
   end
   
   def test_get_multi_missing
     @cache.set "#{key}_1", 1
     @cache.delete "#{key}_2" rescue nil
-    ary = @cache.get(["#{key}_1", "#{key}_2"])
-    assert_instance_of Memcached::NotFound, ary.last      
+    @cache.set "#{key}_3", 3
+    @cache.delete "#{key}_4" rescue nil    
+    assert_equal(
+      {"test_get_multi_missing_3"=>3, "test_get_multi_missing_1"=>1}, 
+      @cache.get(["#{key}_1", "#{key}_2",  "#{key}_3",  "#{key}_4"])
+     )
   end
 
   def test_set_and_get_unmarshalled
@@ -129,6 +157,26 @@ class MemcachedTest < Test::Unit::TestCase
     result = @cache.get key, false
     assert_equal @marshalled_value, result
   end
+  
+  def test_get_multi_unmarshalled
+    @cache.set "#{key}_1", 1, 0, false
+    @cache.set "#{key}_2", 2, 0, false
+    assert_equal(
+      {"#{key}_1" => "1", "#{key}_2" => "2"},
+      @cache.get(["#{key}_1", "#{key}_2"], false)
+    )
+  end
+  
+  def test_get_multi_mixed_marshalling
+    @cache.set "#{key}_1", 1
+    @cache.set "#{key}_2", 2, 0, false
+    assert_nothing_raised do
+      @cache.get(["#{key}_1", "#{key}_2"], false)
+    end
+    assert_raise(ArgumentError) do
+      @cache.get(["#{key}_1", "#{key}_2"])
+    end
+  end  
 
   # Set
 
@@ -224,8 +272,7 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal 15, @cache.increment(key, 5)
   end
 
-  def test_missing_increment; return
-    # XXX Fails due to libmemcached bug
+  def test_missing_increment
     @cache.delete key rescue nil
     assert_raise(Memcached::NotFound) do
       @cache.increment key
@@ -242,8 +289,7 @@ class MemcachedTest < Test::Unit::TestCase
     assert_equal 5, @cache.decrement(key, 5)
   end  
 
-  def test_missing_decrement; return
-    # XXX Fails due to libmemcached bug
+  def test_missing_decrement
     @cache.delete key rescue nil
     assert_raise(Memcached::NotFound) do
       @cache.decrement key
@@ -331,6 +377,12 @@ class MemcachedTest < Test::Unit::TestCase
     cache = @cache.clone
     assert_equal cache.servers, @cache.servers
     assert_not_equal cache, @cache
+    
+    # Definitely check that the structs are unlinked
+    cache.destroy
+    assert_nothing_raised do
+      @cache.set key, @value
+    end
   end
   
   # Non-blocking IO
@@ -341,7 +393,7 @@ class MemcachedTest < Test::Unit::TestCase
     assert_nothing_raised do
       cache.set key, @value
     end
-    ret = Libmemcached.memcached_set(
+    ret = Rlibmemcached.memcached_set(
       cache.instance_variable_get("@struct"), 
       "#{@namespace}#{key}", 
       @marshalled_value, 
@@ -355,7 +407,7 @@ class MemcachedTest < Test::Unit::TestCase
     assert_nothing_raised do
       @nb_cache.set key, @value
     end
-    ret = Libmemcached.memcached_set(
+    ret = Rlibmemcached.memcached_set(
       @nb_cache.instance_variable_get("@struct"), 
       "#{@namespace}#{key}", 
       @marshalled_value, 

data/test/unit/rails_test.rb

@@ -0,0 +1,72 @@
+
+require "#{File.dirname(__FILE__)}/../test_helper"
+
+class RailsTest < Test::Unit::TestCase
+
+  def setup
+    @servers = ['127.0.0.1:43042', '127.0.0.1:43043']
+    @namespace = 'rails_test_namespace'
+    @cache = Memcached::Rails.new(@servers, :namespace => @namespace)
+    @value = OpenStruct.new(:a => 1, :b => 2, :c => GenericClass)
+    @marshalled_value = Marshal.dump(@value)
+  end
+
+  def test_get
+    @cache.set key, @value
+    result = @cache.get key
+    assert_equal @value, result
+  end
+  
+  def test_get_multi
+    @cache.set key, @value
+    result = @cache.get_multi key
+    assert_equal(
+      {key => @value}, 
+      result
+    )
+  end
+  
+  def test_delete
+    @cache.set key, @value
+    assert_nothing_raised do
+      @cache.delete key
+    end
+    assert_nil(@cache.get(key))
+  end
+  
+  def test_delete_missing
+    assert_nothing_raised do
+      @cache.delete key
+      assert_nil(@cache.delete(key))
+    end
+  end
+
+  def test_bracket_accessors
+    @cache[key] = @value
+    result = @cache[key]
+    assert_equal @value, result
+  end
+  
+  def test_get_missing
+    @cache.delete key rescue nil
+    result = @cache.get key
+    assert_equal nil, result
+  end    
+  
+  def test_get_nil
+    @cache.set key, nil, 0
+    result = @cache.get key
+    assert_equal nil, result
+  end  
+  
+  def test_namespace
+    assert_equal @namespace, @cache.namespace
+  end
+
+  private
+  
+  def key
+    caller.first[/`(.*)'/, 1]
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: memcached
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: "0.7"
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-01-21 00:00:00 -05:00
+date: 2008-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -43,26 +43,30 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- BENCHMARKS
 - CHANGELOG
+- COMPATIBILITY
 - ext/extconf.rb
-- ext/libmemcached.i
-- ext/libmemcached_wrap.c
+- ext/rlibmemcached.i
+- ext/rlibmemcached_wrap.c
 - lib/memcached/behaviors.rb
 - lib/memcached/exceptions.rb
 - lib/memcached/integer.rb
 - lib/memcached/memcached.rb
+- lib/memcached/rails.rb
 - lib/memcached.rb
 - LICENSE
 - Manifest
 - README
-- test/benchmark/benchmark.rb
-- test/benchmark/benchmark_set_get.rb
-- test/benchmark/profile.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
 - TODO
 - memcached.gemspec
 has_rdoc: true
@@ -96,3 +100,4 @@ test_files:
 - test/test_helper.rb
 - test/unit/binding_test.rb
 - test/unit/memcached_test.rb
+- test/unit/rails_test.rb

data/ext/libmemcached.i

@@ -1,107 +0,0 @@
-%module libmemcached
-%{
-#include <libmemcached/memcached.h>
-%}
-
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) memcached_st;
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) memcached_server_st;
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) memcached_stat_st;
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) memcached_string_st;
-%warnfilter(SWIGWARN_RUBY_WRONG_NAME) memcached_result_st;
-
-%include "typemaps.i"
-
-// Input maps
-%apply unsigned short { uint8_t };
-%apply unsigned int { uint16_t };
-%apply unsigned long { uint32_t flags, uint32_t offset };
-
-%typemap(in) (void *data) {
-  int value = FIX2INT($input);
-  if (value == 0 || value == 1) {
-    $1 = (void *) value;
-  } else {
-    // Only pass by reference for :distribution and :hash 
-    value = value - 2; 
-    $1 = &value;
-  }
-};
-
-%typemap(in) (char *str, size_t len) {
- $1 = STR2CSTR($input);
- $2 = (size_t) RSTRING($input)->len;
-};
-
-%apply (char *str, size_t len) {
-  (char *key, size_t key_length), 
-  (char *value, size_t value_length)
-};
-
-// Output maps
-%apply unsigned short *OUTPUT {memcached_return *error}
-%apply unsigned int *OUTPUT {uint32_t *flags}
-%apply size_t *OUTPUT {size_t *value_length}
-%apply unsigned long long *OUTPUT {uint64_t *value}
-
-%typemap(out) (char **) {
-  int i;  
-  VALUE ary = rb_ary_new();
-  $result = rb_ary_new();
-  
-  for(i=0; $1[i] != NULL; i++) {
-    rb_ary_store(ary, i, rb_str_new2($1[i]));
-  }
-  rb_ary_push($result, ary);
-  free($1);
-};
-
-%include "/opt/local/include/libmemcached/memcached.h"
-
-// Manual wrappers
-
-// SWIG likes to use SWIG_FromCharPtr instead of SWIG_FromCharPtrAndSize because of the
-// retval/argout split, so it truncates return values with \0 in them
-VALUE memcached_get_ruby_string(memcached_st *ptr, char *key, size_t key_length, uint32_t *flags, memcached_return *error);
-%{
-VALUE memcached_get_ruby_string(memcached_st *ptr, char *key, size_t key_length, uint32_t *flags, memcached_return *error) {
-  char *svalue;
-  size_t *value_length;
-  svalue = memcached_get(ptr, key, key_length, value_length, flags, error);
-  return rb_str_new(svalue, *value_length);
-};
-%}
-
-// Ruby isn't aware that the pointer is an array... there is probably a better way to do this
-memcached_server_st *memcached_select_server_at(memcached_st *in_ptr, int index);
-%{
-memcached_server_st *memcached_select_server_at(memcached_st *in_ptr, int index) {
-  return &(in_ptr->hosts[index]);
-};
-%}
-
-// Same, but for stats
-memcached_stat_st *memcached_select_stat_at(memcached_st *in_ptr, memcached_stat_st *stat_ptr, int index);
-%{
-memcached_stat_st *memcached_select_stat_at(memcached_st *in_ptr, memcached_stat_st *stat_ptr, int index) {
-  return &(stat_ptr[index]);
-};
-%}
-
-// Unbreak a libmemcached 0.13 deference issue
-void memcached_repair_server_st(memcached_st *in_ptr, memcached_server_st *host);
-%{
-void memcached_repair_server_st(memcached_st *in_ptr, memcached_server_st *host) {
-    host->write_ptr= 0;
-};
-%}
-
-// Stub some bogus methods left in the 0.13 memcached.h header
-%{
-memcached_return memcached_mdelete(memcached_st *ptr, char **key, size_t *key_length, unsigned int number_of_keys, time_t expiration) {
-  return;
-};
-memcached_return memcached_mdelete_by_key(memcached_st *ptr, char *master_key, size_t master_key_length,
- char **key, size_t *key_length, unsigned int number_of_keys, time_t expiration) {
-  return;
-};
-%}

data/test/benchmark/benchmark.rb

@@ -1,259 +0,0 @@
-
-HERE = File.dirname(__FILE__)
-$LOAD_PATH << "#{HERE}/../../lib/"
-
-require 'memcached'
-require 'benchmark'
-require 'rubygems'
-require 'memcache'
-
-# We'll use a simple @value to try to avoid spending time in Marshal, 
-# which is a constant penalty that both clients have to pay
-@value = []
-@marshalled = Marshal.dump(@value)
-
-@opts = [
-  ['127.0.0.1:43042', '127.0.0.1:43043'], 
-  {
-    :buffer_requests => false,
-    :no_block => false,
-    :namespace => "benchmark_namespace"
-  }
-]
-@key1 = "Short" 
-@key2 = "Sym1-2-3::45"*8
-@key3 = "Long"*40
-@key4 = "Medium"*8
-
-def restart_servers
-  system("ruby #{HERE}/../setup.rb")
-  sleep(1)
-end
-
-
-Benchmark.bm(31) do |x|
-  restart_servers
-
-  n = 1000  
-  
-  @m = Memcached.new(
-    @opts[0], 
-    @opts[1].merge(:no_block => true, :buffer_requests => true)
-  )
-  x.report("set:plain:noblock:memcached") do
-    n.times do
-      @m.set @key1, @marshalled, 0, false
-      @m.set @key2, @marshalled, 0, false
-      @m.set @key3, @marshalled, 0, false
-      @m.set @key1, @marshalled, 0, false
-      @m.set @key2, @marshalled, 0, false
-      @m.set @key3, @marshalled, 0, false
-    end
-  end
-  @m = Memcached.new(*@opts)
-  x.report("set:plain:memcached") do
-    n.times do
-      @m.set @key1, @marshalled, 0, false
-      @m.set @key2, @marshalled, 0, false
-      @m.set @key3, @marshalled, 0, false
-      @m.set @key1, @marshalled, 0, false
-      @m.set @key2, @marshalled, 0, false
-      @m.set @key3, @marshalled, 0, false
-    end
-  end
-  @m = MemCache.new(*@opts)
-  x.report("set:plain:memcache-client") do
-    n.times do
-      @m.set @key1, @marshalled, 0, true
-      @m.set @key2, @marshalled, 0, true
-      @m.set @key3, @marshalled, 0, true
-      @m.set @key1, @marshalled, 0, true
-      @m.set @key2, @marshalled, 0, true
-      @m.set @key3, @marshalled, 0, true
-    end
-  end
-  
-  restart_servers 
-
-  @m = Memcached.new(
-    @opts[0], 
-    @opts[1].merge(:no_block => true, :buffer_requests => true)
-  )
-  x.report("set:ruby:noblock:memcached") do
-    n.times do
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-    end
-  end
-  @m = Memcached.new(*@opts)
-  x.report("set:ruby:memcached") do
-    n.times do
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-    end
-  end
-  @m = MemCache.new(*@opts)
-  x.report("set:ruby:memcache-client") do
-    n.times do
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-    end
-  end
-
-  @m = Memcached.new(*@opts)
-  x.report("get:plain:memcached") do
-    n.times do
-      @m.get @key1, false
-      @m.get @key2, false
-      @m.get @key3, false
-      @m.get @key1, false
-      @m.get @key2, false
-      @m.get @key3, false
-    end
-  end
-  @m = MemCache.new(*@opts)
-  x.report("get:plain:memcache-client") do
-    n.times do
-      @m.get @key1, true
-      @m.get @key2, true
-      @m.get @key3, true
-      @m.get @key1, true
-      @m.get @key2, true
-      @m.get @key3, true
-    end
-  end
-
-  @m = Memcached.new(*@opts)
-  x.report("get:ruby:memcached") do
-    n.times do
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-    end
-  end
-  @m = MemCache.new(*@opts)
-  x.report("get:ruby:memcache-client") do
-    n.times do
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-    end
-  end
-
-  restart_servers
-
-  @m = Memcached.new(*@opts)
-  x.report("missing:ruby:memcached") do
-    n.times do
-      begin @m.delete @key1; rescue Memcached::NotFound; end
-      begin @m.get @key1; rescue Memcached::NotFound; end
-      begin @m.delete @key2; rescue Memcached::NotFound; end
-      begin @m.get @key2; rescue Memcached::NotFound; end
-      begin @m.delete @key3; rescue Memcached::NotFound; end
-      begin @m.get @key3; rescue Memcached::NotFound; end
-    end
-  end
-  @m = MemCache.new(*@opts)
-  x.report("missing:ruby:memcache-client") do
-    n.times do
-      begin @m.delete @key1; rescue; end
-      begin @m.get @key1; rescue; end
-      begin @m.delete @key2; rescue; end
-      begin @m.get @key2; rescue; end
-      begin @m.delete @key3; rescue; end
-      begin @m.get @key3; rescue; end
-    end
-  end
-
-  restart_servers
-  
-  @m = Memcached.new(
-    @opts[0], 
-    @opts[1].merge(:no_block => true, :buffer_requests => true)
-  )
-  x.report("mixed:ruby:noblock:memcached") do
-    n.times do
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-      @m.set @key1, @value
-      @m.get @key1
-      @m.set @key2, @value
-      @m.get @key2
-      @m.set @key3, @value
-      @m.get @key3
-    end
-  end  
-  @m = Memcached.new(*@opts)
-  x.report("mixed:ruby:memcached") do
-    n.times do
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-      @m.set @key1, @value
-      @m.get @key1
-      @m.set @key2, @value
-      @m.get @key2
-      @m.set @key3, @value
-      @m.get @key3
-    end
-  end
-  @m = MemCache.new(*@opts)
-  x.report("mixed:ruby:memcache-client") do
-    n.times do
-      @m.set @key1, @value
-      @m.set @key2, @value
-      @m.set @key3, @value
-      @m.get @key1
-      @m.get @key2
-      @m.get @key3
-      @m.set @key1, @value
-      @m.get @key1
-      @m.set @key2, @value
-      @m.get @key2
-      @m.set @key3, @value
-      @m.get @key3
-    end
-  end
-
-  restart_servers
-    
-  n = 10000
-  Memcached::HASH_VALUES.each do |mode,|
-    @m = Memcached.new(@opts[0], @opts[1].merge(:hash => mode))
-    x.report("hash:#{mode}:memcached") do
-      n.times do
-        @m.set @key1, @marshalled, 0, false
-        @m.get @key1, false
-        @m.set @key2, @marshalled, 0, false
-        @m.get @key2, false
-        @m.set @key3, @marshalled, 0, false
-        @m.get @key3, false
-      end
-    end
-  end
-end