redic 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5382b81b79200b8cfb791f454b9089b06ace3b
-  data.tar.gz: 7c893f68df454916127d6b8ef6ab079918745b28
+  metadata.gz: 9dc763e03ae47f86f5bfeef03c3e6b041a3cefd4
+  data.tar.gz: 5e0caf8544cd4501df91a4125375bd8ebebf08f3
 SHA512:
-  metadata.gz: f0dc33eb8a5874ceda6f206b880feefd7a1ee7c9614620f95adc0d382fdcd225b0223d95c8865aa738239aa5df73f7328bb5fdb70beb236c18a76c56641b7008
-  data.tar.gz: 5ae3b1abd97cee063cce9d4bdb29ffe2faae66562251533186a9b2016031a287802f3905cbfd6a1ff429278459300f73ec37fd0791d42e3c0d5635d6e421c066
+  metadata.gz: adc94f3aaf1b6ea29e735d26ece898d910419f87eb3edcb7998584aedb7a213342254e2e1be0b6dcac12fc6068c8507c84ed1c895c0d89c4f884998194edf143
+  data.tar.gz: 7a602b0fc1b8dc193b33f3f0d501f9e6eb7f0b550159ea77ec85d690b9599ce0dec279ca553f6d0779e3dc2d7ac461f6cd789c7475f79f434dcc55d19c880712

data/lib/redic.rb

@@ -7,7 +7,19 @@ class Redic
   def initialize(url = "redis://127.0.0.1:6379", timeout = 10_000_000)
     @url = url
     @client = Redic::Client.new(url, timeout)
-    @queue = []
+    @buffer = Hash.new { |h, k| h[k] = [] }
+  end
+
+  def buffer
+    @buffer[Thread.current.object_id]
+  end
+
+  def reset
+    @buffer.delete(Thread.current.object_id)
+  end
+
+  def clear
+    @buffer.clear
   end
 
   def configure(url, timeout = 10_000_000)
@@ -23,21 +35,21 @@ class Redic
   end
 
   def queue(*args)
-    @queue << args
+    buffer << args
   end
 
   def commit
     @client.connect do
-      @queue.each do |args|
+      buffer.each do |args|
         @client.write(args)
       end
 
-      @queue.map do
+      buffer.map do
         @client.read
       end
     end
   ensure
-    @queue.clear
+    reset
   end
 
   def timeout

data/redic.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "redic"
-  s.version           = "1.2.0"
+  s.version           = "1.3.0"
   s.summary           = "Lightweight Redis Client"
   s.description       = "Lightweight Redis Client"
   s.authors           = ["Michel Martens", "Cyril David"]

data/tests/multithreaded_test.rb

@@ -0,0 +1,46 @@
+require "cutest"
+require_relative "../lib/redic"
+
+REDIS_URL = "redis://localhost:6379/"
+
+prepare do
+  Redic.new(REDIS_URL).call("FLUSHDB")
+end
+
+test "multiple threads" do
+
+  cs = Array.new
+
+  c = Redic.new(REDIS_URL)
+
+  c.queue("SET", "foo", "1")
+
+  t1 = Thread.new do
+    c.queue("SET", "bar", "2")
+  end
+
+  t2 = Thread.new do
+    c.queue("SET", "baz", "3")
+    c.commit
+  end
+
+  t1.join
+  t2.join
+
+  assert_equal nil, c.call("GET", "foo")
+  assert_equal nil, c.call("GET", "bar")
+  assert_equal "3", c.call("GET", "baz")
+
+  c.commit
+
+  # The buffer for `c` still exists
+  assert_equal "1", c.call("GET", "foo")
+
+  # Buffer for the thread that didn't commit is the only one left
+  assert_equal 1, c.instance_variable_get("@buffer").keys.size
+
+  c.clear
+
+  # All buffers are cleared
+  assert_equal 0, c.instance_variable_get("@buffer").keys.size
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Michel Martens
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
@@ -43,6 +43,7 @@ files:
 - lib/redic/connection.rb
 - makefile
 - redic.gemspec
+- tests/multithreaded_test.rb
 - tests/redic_test.rb
 - tests/unix_test.rb
 homepage: https://github.com/amakawa/redic