timshadel-starling 0.9.8.01.20080924 → 0.9.8.01.200809241125

data/lib/starling.rb

@@ -31,14 +31,29 @@ class Starling < MemCache
   # Starling cluster.
 
   def delete(key, expiry = 0)
-    raise MemCacheError, "Update of readonly cache" if @readonly
-    cache_key = make_cache_key key
- 
-    @buckets.each do |server|
-      with_socket_management(server) do |socket|
-        socket.write "delete #{cache_key} #{expiry}\r\n"
-        socket.gets
+    with_servers do
+      _original_delete(key, expiry)
+    end
+  end
+
+  ##
+  # Provides a way to work with a specific list of servers by
+  # forcing all calls to #get_server_for_key to use a specific
+  # server, and changing that server each time that the call
+  # yields to the block provided.  This helps work around the
+  # normally random nature of the #get_server_for_key method.
+  #
+  # Acquires the mutex for the entire duration of the call
+  # since unrelated calls to #get_server_for_key might be
+  # adversely affected by the non_random result.
+  def with_servers(my_servers = @servers.dup)
+    return unless block_given?
+    with_lock do
+      my_servers.each do |server|
+        @force_server = server
+        yield
       end
+      @force_server = nil
     end
   end
   
@@ -117,6 +132,7 @@ class Starling < MemCache
     raise ArgumentError, "illegal character in key #{key.inspect}" if key =~ /\s/
     raise ArgumentError, "key too long #{key.inspect}" if key.length > 250
     raise MemCacheError, "No servers available" if @servers.empty?
+    return @force_server if @force_server
 
     bukkits = @buckets.dup
     bukkits.nitems.times do |try|
@@ -129,3 +145,24 @@ class Starling < MemCache
     raise MemCacheError, "No servers available (all dead)"
   end
 end
+
+
+class MemCache
+
+ protected
+
+  ##
+  # Ensure that everything within the given block is executed
+  # within the locked mutex if this client is multithreaded.
+  # If the client isn't multithreaded, the block is simply executed.
+  def with_lock
+    return unless block_given?
+    begin
+      @mutex.lock if @multithread
+      yield
+    ensure
+      @mutex.unlock if @multithread
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: timshadel-starling
 version: !ruby/object:Gem::Version 
-  version: 0.9.8.01.20080924
+  version: 0.9.8.01.200809241125
 platform: ruby
 authors: 
 - Blaine Cook