redis-pool 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM4MDE2ODAzNjVmMDMxODJlNmFhYTgyZGI5OGQyYzhhM2U2NzRiOA==
+    ZGI4Mjc4YzE0OTcwYzNhNGIzMWNmYzI2MWQxOWIxYTllOGMzMTMzOA==
   data.tar.gz: !binary |-
-    YmU5ODY5MTAyMTI1MmQxOWRkMzIyNzg0MGIyOGNlOGEwNDdlOWUyZQ==
+    MTM0NjlmZWM0MjdmNGVmMTBjYWMxM2Y1NWQyOWFiOTRlMmRjODBkMw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWE1OWRiM2Y4NjU4Mzg2YjM4YTZkZjFkMGIyZWZlNjk1ZGI1ZmYwOGQ2YjA1
-    ZGFmYzBjODQ0NzJiZGMyY2Q3ZDVmNjIzYWZkN2E0ZGI2OGVmYmY2OWNlMWVj
-    ODgzMmMyMjZlNzc3OWU1ZGM5ZTg3MmU4YzZiZmQ5YjVhNGQ0NGQ=
+    ZGNmMTllOGE4YzA5MDQxN2QzNWNiZGYyNmU0MjRiMGM4MDZiOTQxOGQ2ZDI4
+    NWMxYzgyYjg1NTY1NTMzZWQ0ZmFlNWUyMWUzYzQ1Mzc2ZTdhZGJmMWY3YzVl
+    ODBkOTc2NThjYTA1MWUwMTA3MGQ2NDI1Zjg1YWNjODc4MzJmZjk=
   data.tar.gz: !binary |-
-    YmY0Y2I0YTE2NmE5ZjBmMjg4ZTE5MWU5ZDRhMTRkNDE0MjkwNWEyYTExOTE0
-    Zjc0NTExM2NiNmQwOGM4Y2EwZTRmOWE4MzljOWJkNTdjYjQ3ZDVmOWQ4ZDQ3
-    MDc4ZjU0YTQxNWU5OTUyMDZkODgwOGI4ZmVmNTJmNTM1ZjRmMGU=
+    YmFhNzY4YzhmMGM0ZGFhZDJkYThlMmRjZDA3OWE2ZWRjYTM5OGUyOTc1NTEz
+    MTRkNTE2OTNhYWY0MmMxOGIzZGQ3ZTI2YjMzYWFiODE1ZGQ3NzE2YmU2ZTY4
+    MTExMTU3Njc0NmJhYmY4NGFjZjNkZjNmZGE1NTJjMzE0Yzg4ZjY=

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+0.1.1 - 2013-08-19
+==================
+
+* Fixed pipelining and WATCH/MULTI. Thanks @Asmod4n for testing and reporting
+  the issue.
+
+0.1.0 - 2013-08-15
+==================
+
+* First release.

data/lib/redis/pool.rb

@@ -2,7 +2,7 @@ require "connection_pool"
 require "redis"
 
 class Redis::Pool < Redis
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 
   attr :pool
 
@@ -14,8 +14,12 @@ class Redis::Pool < Redis
   end
 
   def synchronize
-    @pool.with do |client|
-      _with_client(client) { yield(client) }
+    if current = Thread.current[@id]
+      yield(current)
+    else
+      @pool.with do |client|
+        _with_client(client) { yield(client) }
+      end
     end
   end
 
@@ -33,24 +37,15 @@ class Redis::Pool < Redis
 
   def multi
     raise ArgumentError, "Redis::Pool#multi can only be called with a block" unless block_given?
-
-    pipeline = Pipeline::Multi.new
-
-    _with_client(pipeline) do |client|
-      yield(client)
-    end
-
-    synchronize do |client|
-      client.call_pipeline(pipeline)
-    end
+    super
   end
 
 protected
 
   def _with_client(client)
-    Thread.current[@id] = client
+    old, Thread.current[@id] = Thread.current[@id], client
     yield(client)
   ensure
-    Thread.current[@id] = nil
+    Thread.current[@id] = old
   end
 end

data/test/pool_test.rb

@@ -38,7 +38,52 @@ test "Pool" do |r|
   teardown(r)
 end
 
+test "MULTI return value with WATCH" do |r|
+  r.del("foo")
+
+  r.pool.with do
+    r.watch("foo", "bar")
+
+    assert r.multi { r.set("foo", "bar") }
+  end
+
+  assert_equal r.get("foo"), "bar"
+
+  teardown(r)
+end
+
 test "Pipelining" do |r|
+  r.del("foo")
+
+  catch(:out) do
+    r.pipelined do
+      r.set("foo", "bar")
+      throw(:out)
+    end
+  end
+
+  assert_equal r.get("foo"), nil
+
+  teardown(r)
+end
+
+test "Pipelining with nesting" do |r|
+  r.del("foo")
+
+  r.pipelined do
+    r.del("foo")
+
+    r.pipelined do
+      r.set("foo", "bar")
+    end
+  end
+
+  assert_equal r.get("foo"), "bar"
+
+  teardown(r)
+end
+
+test "Pipelining contention" do |r|
   threads = Array.new(100) do
     Thread.new do
       10.times do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-pool
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Damian Janowski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-15 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: connection_pool
@@ -60,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - README.md
 - UNLICENSE
 - lib/redis/pool.rb