redis-slave-read 0.1 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 32c1f6b501f4d1f2e013277b17194a45f555e0cf
+  data.tar.gz: d608989faa6527ac97a0ecc88788928dcecb0509
+SHA512:
+  metadata.gz: e1be26d56b3b8a03279ce70954d5a166c916f3751b8b0d01c247470bf2f4232f32ce2c4a81f70e7dde8619b7c9b56f75e8eda1c3f7c5b02e102e55d582ac1948
+  data.tar.gz: fb782d7638f89f69daa000135a04cb841d3b9049baae79962644bb20fc34249edc7a0e83ca49ef36575c804d77b4328a1f7667b22f3cd04f3d748f2c77c7e465

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 gem "rspec"
+gem "rake"

data/README.md

@@ -23,7 +23,7 @@ Rather than using a Redis instance, create a wrapper that wraps multiple Redis c
     master = Redis.new "localhost:6379"
     slave1 = Redis.new "localhost:6389"
     slave2 = Redis.new "localhost:6399"
-    $redis = Redis::SlaveRead::Interface::HiRedis.new(master: master, slaves: [slave1, slave2])
+    $redis = Redis::SlaveRead::Interface::Hiredis.new(master: master, slaves: [slave1, slave2])
 
 Make sure that your slaves are set to be slaved to the master, like `slaveof localhost 6379`
 

data/lib/{activesupport/lib/active_support/cache/redis_slave_read_cache.rb → active_support/cache/redis_store_slave_read.rb}

@@ -1,29 +1,12 @@
+require 'connection_pool'
+
 module ActiveSupport
   module Cache
-    class RedisStore < Store
-      # Instantiate the store.
-      #
-      # Example:
-      #   RedisStore.new
-      #     # => host: localhost,   port: 6379,  db: 0
-      #
-      #   RedisStore.new "example.com"
-      #     # => host: example.com, port: 6379,  db: 0
-      #
-      #   RedisStore.new "example.com:23682"
-      #     # => host: example.com, port: 23682, db: 0
-      #
-      #   RedisStore.new "example.com:23682/1"
-      #     # => host: example.com, port: 23682, db: 1
-      #
-      #   RedisStore.new "example.com:23682/1/theplaylist"
-      #     # => host: example.com, port: 23682, db: 1, namespace: theplaylist
-      #
-      #   RedisStore.new "localhost:6379/0", "localhost:6380/0"
-      #     # => instantiate a cluster
-      def initialize(*addresses)
-        @data = ::Redis::Factory.create(addresses)
-        super(addresses.extract_options!)
+    class RedisStoreSlaveRead < Store
+      def initialize(options = {})
+        @pool_options = options
+        init_pool @pool_options
+        @options = {}
       end
 
       def write(name, value, options = nil)
@@ -43,7 +26,7 @@ module ActiveSupport
         instrument(:delete_matched, matcher.inspect) do
           matcher = key_matcher(matcher, options)
           begin
-            !(keys = @data.keys(matcher)).empty? && @data.del(*keys)
+            @pool.with {|s| !(keys = s.keys(matcher)).empty? && s.del(*keys) }
           rescue Errno::ECONNREFUSED => e
             false
           end
@@ -57,7 +40,7 @@ module ActiveSupport
       #   cache.read_multi "rabbit", "white-rabbit"
       #   cache.read_multi "rabbit", "white-rabbit", :raw => true
       def read_multi(*names)
-        values = @data.mget(*names)
+        values = @pool.with {|s| s.mget(*names) }
 
         # Remove the options hash before mapping keys to values
         names.extract_options!
@@ -90,7 +73,7 @@ module ActiveSupport
       #   cache.read "rabbit", :raw => true       # => "1"
       def increment(key, amount = 1)
         instrument(:increment, key, :amount => amount) do
-          @data.incrby key, amount
+          @pool.with {|s| s.incrby key, amount }
         end
       end
 
@@ -117,36 +100,53 @@ module ActiveSupport
       #   cache.read "rabbit", :raw => true       # => "-1"
       def decrement(key, amount = 1)
         instrument(:decrement, key, :amount => amount) do
-          @data.decrby key, amount
+          @pool.with {|s| s.decrby key, amount }
         end
       end
 
       # Clear all the data from the store.
       def clear
         instrument(:clear, nil, nil) do
-          @data.flushdb
+          @pool.with {|s| s.flushdb }
         end
       end
 
       def stats
-        @data.info
+        @pool.with {|s| s.info }
       end
 
-      # Force client reconnection, useful Unicorn deployed apps.
+      # Force client reconnection, useful for apps deployed on forking servers.
       def reconnect
-        @data.reconnect
+        init_pool @pool_options
+      end
+
+      def expire(key, expiry)
+        @pool.with {|s| s.expire key, expiry }
       end
 
       protected
+
+        def init_pool(options)
+          interface = options.fetch(:interface, ::Redis::SlaveRead::Interface::Hiredis)
+          @pool.shutdown {|node| node.disconnect } if @pool
+          @pool = ConnectionPool.new(:size => options.fetch(:pool_size, 1), :timeout => options.fetch(:pool_timeout, 3)) do
+            interface.new(
+              master: ::Redis::Store::Factory.create(options[:master]),
+              slaves: options[:slaves].map {|s| ::Redis::Store::Factory.create(s) },
+              read_master: false
+            )
+          end
+        end
+
         def write_entry(key, entry, options)
           method = options && options[:unless_exist] ? :setnx : :set
-          @data.send method, key, entry, options
+          @pool.with {|s| s.send method, key, entry, options }
         rescue Errno::ECONNREFUSED => e
           false
         end
 
         def read_entry(key, options)
-          entry = @data.get key, options
+          entry = @pool.with {|s| s.get key, options }
           if entry
             entry.is_a?(ActiveSupport::Cache::Entry) ? entry : ActiveSupport::Cache::Entry.new(entry)
           end
@@ -160,7 +160,7 @@ module ActiveSupport
         # It's really needed and use
         #
         def delete_entry(key, options)
-          @data.del key
+          @pool.with {|s| s.del key }
         rescue Errno::ECONNREFUSED => e
           false
         end

data/lib/redis-slave-read/version.rb

@@ -1,5 +1,5 @@
 class Redis
   module SlaveRead
-    VERSION = "0.1"
+    VERSION = "0.2.1"
   end
 end

data/redis-slave-read.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "redis"
-  gem.add_development_dependency "redis"
+  gem.add_runtime_dependency 'redis', '>= 0', '>= 0'
+  gem.add_runtime_dependency 'connection_pool'
 end

data/spec/interface/hiredis_spec.rb

@@ -7,15 +7,15 @@ describe Redis::SlaveRead::Interface::Hiredis do
   subject { described_class.new master: master, slaves: slaves }
 
   it "should distribute reads between all available nodes" do
-    master.should_receive(:get).once
-    slaves[0].should_receive(:get).once
-    slaves[1].should_receive(:get).once
+    expect(master).to receive(:get).once
+    expect(slaves[0]).to receive(:get).once
+    expect(slaves[1]).to receive(:get).once
 
     3.times { subject.get "foo" }
   end
 
   it "should always send non-reads to the master" do
-    master.should_receive(:set).exactly(3).times
+    expect(master).to receive(:set).exactly(3).times
 
     3.times { subject.set "foo", "bar" }
   end
@@ -24,9 +24,9 @@ describe Redis::SlaveRead::Interface::Hiredis do
     subject { described_class.new master: master, slaves: slaves, read_master: false }
 
     it "should distribute reads between all available slaves" do
-      master.should_receive(:get).never
-      slaves[1].should_receive(:get).twice
-      slaves[0].should_receive(:get).once
+      expect(master).to receive(:get).never
+      expect(slaves[1]).to receive(:get).twice
+      expect(slaves[0]).to receive(:get).once
 
       3.times { subject.get "foo" }
     end
@@ -34,7 +34,7 @@ describe Redis::SlaveRead::Interface::Hiredis do
 
   context "when in a multi block" do
     it "sends all commands to the master" do
-      master.should_receive(:get).twice
+      expect(master).to receive(:get).twice
 
       subject.multi do
         2.times { subject.get "foo" }
@@ -44,7 +44,7 @@ describe Redis::SlaveRead::Interface::Hiredis do
 
   context "when in a pipelined block" do
     it "sends all commands to the master" do
-      master.should_receive(:get).twice
+      expect(master).to receive(:get).twice
 
       subject.pipelined do
         2.times { subject.get "foo" }
@@ -54,23 +54,28 @@ describe Redis::SlaveRead::Interface::Hiredis do
 
   context "commands that distribute to all nodes" do
     it "should distribute to each node" do
-      master.should_receive(:select).once
-      slaves.each {|slave| slave.should_receive(:select).once }
+      expect(master).to receive(:select).once
+      slaves.each {|slave| expect(slave).to receive(:select).once }
       subject.send(:select)
     end
 
     it "should set the DB on each node" do
       subject.select 4
-      master.client.db.should == 4
-      slaves[0].client.db.should == 4
-      slaves[1].client.db.should == 4
+      expect(master.client.db).to eq 4
+      expect(slaves[0].client.db).to eq 4
+      expect(slaves[1].client.db).to eq 4
     end
 
-    it "should disconnect each client" do
+    it "should connect and disconnect each client" do
+      subject.connect
+      expect(!!master.client.connected?).to be_truthy
+      expect(!!slaves[0].client.connected?).to be_truthy
+      expect(!!slaves[1].client.connected?).to be_truthy
+
       subject.disconnect
-      !!master.client.connected?.should == false
-      !!slaves[0].client.connected?.should == false
-      !!slaves[1].client.connected?.should == false
+      expect(!!master.client.connected?).to be_falsey
+      expect(!!slaves[0].client.connected?).to be_falsey
+      expect(!!slaves[1].client.connected?).to be_falsey
     end
   end
 end

metadata

@@ -1,48 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: redis-slave-read
 version: !ruby/object:Gem::Version
-  prerelease: 
-  version: '0.1'
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Heald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :runtime
+  name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: redis
 - !ruby/object:Gem::Dependency
-  type: :development
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: redis
 description: Provides load balancing of reads in a cluster of Redis replicas
 email:
 - cheald@gmail.com
@@ -50,12 +45,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- lib/activesupport/lib/active_support/cache/redis_slave_read_cache.rb
+- lib/active_support/cache/redis_store_slave_read.rb
 - lib/redis-slave-read.rb
 - lib/redis-slave-read/interface/base.rb
 - lib/redis-slave-read/interface/hiredis.rb
@@ -65,29 +60,27 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides load balancing of reads in a cluster of Redis replicas
 test_files:
 - spec/interface/hiredis_spec.rb
 - spec/spec_helper.rb
-has_rdoc: