redis 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ab43fd7b8221a41ea88facf6051b6c7b94e87bf
-  data.tar.gz: 333fb1bbd2de6cd74db7cfd40542c979d92a6fbd
+  metadata.gz: 4744291b8bc26230044fc12c456951a60c5802c7
+  data.tar.gz: 6eabe9bb60b74aa2408007a72f9a44e831b71a5e
 SHA512:
-  metadata.gz: 3f734315d527b2b92eeb1a6bff2089b583a06784f01fa411f68d4ad23cf9bdb5ae753d6da69a570014ac5d207cc765eb70107f8781c9e432457a7f81ef48fb98
-  data.tar.gz: 686e1a0b28c573d7342335a52fc14d5636f2e1e32e8dba0adab663283e9d6fcc6acfd5d8b100b365ee54905a77a7c3a555c3c87917ef3a77b2689c8ff5afe927
+  metadata.gz: 7fb460a3595ed430dbf4dab6f516dcbef029cf1c72350e4e50b7e425e8d94b8d47760d33f58db21bad95852ec97fa7fdba55cfb0858292c221c947516a291f97
+  data.tar.gz: 7cdf461c39d5eede9b295bf987391cd70461cd5adcee945ae243d509f67457ea14aa0ad08ca47efdab8bb8ca315d6bdff94460d6cecc6b981f459081cd93dfbd

data/.travis.yml

@@ -21,9 +21,12 @@ env:
     - VERBOSE=true
     - TIMEOUT=1
   matrix:
-    - conn=ruby      REDIS_BRANCH=2.8
-    - conn=hiredis   REDIS_BRANCH=2.8
-    - conn=synchrony REDIS_BRANCH=2.8
+    - conn=ruby      REDIS_BRANCH=3.0
+    - conn=ruby      REDIS_BRANCH=3.2
+    - conn=hiredis   REDIS_BRANCH=3.0
+    - conn=hiredis   REDIS_BRANCH=3.2
+    - conn=synchrony REDIS_BRANCH=3.0
+    - conn=synchrony REDIS_BRANCH=3.2
     - conn=ruby      REDIS_BRANCH=unstable
 
 branches:
@@ -35,27 +38,48 @@ matrix:
     # hiredis
     - rvm: jruby-18mode
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=2.8
+      env: conn=hiredis REDIS_BRANCH=3.0
+    - rvm: jruby-18mode
+      gemfile: .travis/Gemfile
+      env: conn=hiredis REDIS_BRANCH=3.2
+    - rvm: jruby-19mode
+      gemfile: .travis/Gemfile
+      env: conn=hiredis REDIS_BRANCH=3.0
     - rvm: jruby-19mode
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=2.8
+      env: conn=hiredis REDIS_BRANCH=3.2
     - rvm: jruby-9.0.5.0
       gemfile: .travis/Gemfile
-      env: conn=hiredis REDIS_BRANCH=2.8
+      env: conn=hiredis REDIS_BRANCH=3.0
+    - rvm: jruby-9.0.5.0
+      gemfile: .travis/Gemfile
+      env: conn=hiredis REDIS_BRANCH=3.2
 
     # synchrony
     - rvm: 1.8.7
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.8
+      env: conn=synchrony REDIS_BRANCH=3.0
+    - rvm: 1.8.7
+      gemfile: .travis/Gemfile
+      env: conn=synchrony REDIS_BRANCH=3.2
+    - rvm: jruby-18mode
+      gemfile: .travis/Gemfile
+      env: conn=synchrony REDIS_BRANCH=3.0
     - rvm: jruby-18mode
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.8
+      env: conn=synchrony REDIS_BRANCH=3.2
     - rvm: jruby-19mode
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.8
+      env: conn=synchrony REDIS_BRANCH=3.0
+    - rvm: jruby-19mode
+      gemfile: .travis/Gemfile
+      env: conn=synchrony REDIS_BRANCH=3.2
+    - rvm: jruby-9.0.5.0
+      gemfile: .travis/Gemfile
+      env: conn=synchrony REDIS_BRANCH=3.0
     - rvm: jruby-9.0.5.0
       gemfile: .travis/Gemfile
-      env: conn=synchrony REDIS_BRANCH=2.8
+      env: conn=synchrony REDIS_BRANCH=3.2
   allow_failures:
     - rvm: rbx-2
 

data/CHANGELOG.md

@@ -12,6 +12,11 @@
   security updates in June of 2013; continuing to support it would prevent
   the use of newer features of Ruby.
 
+# 3.3.1
+
+* Remove usage of Timeout::timeout, refactor into using low level non-blocking writes.
+  This fixes a memory leak due to Timeout creating threads on each invocation.
+
 # 3.3.0
 
 * Added support for SSL/TLS. Redis doesn't support SSL natively, so you still

data/lib/redis/connection/ruby.rb

@@ -10,6 +10,16 @@ rescue LoadError
   # Not all systems have OpenSSL support
 end
 
+if RUBY_VERSION < "1.9.3"
+  class String
+    # Ruby 1.8.7 does not have byteslice, but it handles encodings differently anyway.
+    # We can simply slice the string, which is a byte array there.
+    def byteslice(*args)
+      slice(*args)
+    end
+  end
+end
+
 class Redis
   module Connection
     module SocketMixin
@@ -80,9 +90,34 @@ class Redis
         raise Errno::ECONNRESET
       end
 
-      # UNIXSocket and TCPSocket don't support write timeouts
-      def write(*args)
-        Timeout.timeout(@write_timeout, TimeoutError) { super }
+      def _write_to_socket(data)
+        begin
+          write_nonblock(data)
+
+        rescue *NBIO_EXCEPTIONS
+          if IO.select(nil, [self], nil, @write_timeout)
+            retry
+          else
+            raise Redis::TimeoutError
+          end
+        end
+
+      rescue EOFError
+        raise Errno::ECONNRESET
+      end
+
+      def write(data)
+        return super(data) unless @write_timeout
+
+        length = data.bytesize
+        total_count = 0
+        loop do
+          count = _write_to_socket(data)
+
+          total_count += count
+          return total_count if total_count >= length
+          data = data.byteslice(count..-1)
+        end
       end
     end
 

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.3.0"
+  VERSION = "3.3.1"
 end

data/test/internals_test.rb

@@ -5,6 +5,7 @@ require File.expand_path("helper", File.dirname(__FILE__))
 class TestInternals < Test::Unit::TestCase
 
   include Helper::Client
+  include Helper::Skipable
 
   def test_logger
     r.ping
@@ -160,6 +161,25 @@ class TestInternals < Test::Unit::TestCase
     assert (Time.now - start_time) <= opts[:timeout]
   end
 
+  driver(:ruby) do
+    def test_write_timeout
+      return skip("Relies on buffer sizes, might be unreliable")
+
+      server = TCPServer.new("127.0.0.1", 0)
+      port   = server.addr[1]
+
+      # Hacky, but we need the buffer size
+      val = TCPSocket.new("127.0.0.1", port).getsockopt(Socket::SOL_SOCKET, Socket::SO_SNDBUF).unpack("i")[0]
+
+      assert_raise(Redis::TimeoutError) do
+        Timeout.timeout(1) do
+          redis = Redis.new(:port => port, :timeout => 5, :write_timeout => 0.1)
+          redis.set("foo", "1" * val*2)
+        end
+      end
+    end
+  end
+
   def close_on_ping(seq, options = {})
     $request = 0
 

data/test/sentinel_command_test.rb

@@ -2,7 +2,7 @@
 
 require File.expand_path("helper", File.dirname(__FILE__))
 
-class SentinalCommandsTest < Test::Unit::TestCase
+class SentinelCommandsTest < Test::Unit::TestCase
 
   include Helper::Client
 

data/test/sentinel_test.rb

@@ -2,7 +2,7 @@
 
 require File.expand_path("helper", File.dirname(__FILE__))
 
-class SentinalTest < Test::Unit::TestCase
+class SentinelTest < Test::Unit::TestCase
 
   include Helper::Client
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,20 +16,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 11.0.0
 - !ruby/object:Gem::Dependency
@@ -56,10 +56,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .travis/Gemfile
-- .yardopts
+- ".gitignore"
+- ".travis.yml"
+- ".travis/Gemfile"
+- ".yardopts"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -184,17 +184,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby client library for Redis