redis 3.3.5 → 4.0.0

data/lib/redis/client.rb

@@ -1,4 +1,4 @@
-require "redis/errors"
+require_relative "errors"
 require "socket"
 require "cgi"
 
@@ -21,9 +21,7 @@ class Redis
       :inherit_socket => false
     }
 
-    def options
-      Marshal.load(Marshal.dump(@options))
-    end
+    attr_reader :options
 
     def scheme
       @options[:scheme]
@@ -340,6 +338,7 @@ class Redis
            Errno::EHOSTDOWN,
            Errno::EHOSTUNREACH,
            Errno::ENETUNREACH,
+           Errno::ENOENT,
            Errno::ETIMEDOUT
 
       raise CannotConnectError, "Error connecting to Redis on #{location} (#{$!.class})"
@@ -478,11 +477,16 @@ class Redis
 
       if driver.kind_of?(String)
         begin
-          require "redis/connection/#{driver}"
-          driver = Connection.const_get(driver.capitalize)
-        rescue LoadError, NameError
-          raise RuntimeError, "Cannot load driver #{driver.inspect}"
+          require_relative "connection/#{driver}"
+        rescue LoadError, NameError => e
+          begin
+            require "connection/#{driver}"
+          rescue LoadError, NameError => e
+            raise RuntimeError, "Cannot load driver #{driver.inspect}: #{e.message}"
+          end
         end
+
+        driver = Connection.const_get(driver.capitalize)
       end
 
       driver

data/lib/redis/connection.rb

@@ -1,4 +1,4 @@
-require "redis/connection/registry"
+require_relative "connection/registry"
 
 # If a connection driver was required before this file, the array
 # Redis::Connection.drivers will contain one or more classes. The last driver
@@ -6,4 +6,4 @@ require "redis/connection/registry"
 # the plain Ruby driver as our default. Another driver can be required at a
 # later point in time, causing it to be the last element of the #drivers array
 # and therefore be chosen by default.
-require "redis/connection/ruby" if Redis::Connection.drivers.empty?
+require_relative "connection/ruby" if Redis::Connection.drivers.empty?

data/lib/redis/connection/command_helper.rb

@@ -30,14 +30,8 @@ class Redis
 
     protected
 
-      if defined?(Encoding::default_external)
-        def encode(string)
-          string.force_encoding(Encoding::default_external)
-        end
-      else
-        def encode(string)
-          string
-        end
+      def encode(string)
+        string.force_encoding(Encoding.default_external)
       end
     end
   end

data/lib/redis/connection/hiredis.rb

@@ -1,5 +1,5 @@
-require "redis/connection/registry"
-require "redis/errors"
+require_relative "registry"
+require_relative "../errors"
 require "hiredis/connection"
 require "timeout"
 

data/lib/redis/connection/ruby.rb

@@ -1,6 +1,6 @@
-require "redis/connection/registry"
-require "redis/connection/command_helper"
-require "redis/errors"
+require_relative "registry"
+require_relative "command_helper"
+require_relative "../errors"
 require "socket"
 require "timeout"
 
@@ -10,36 +10,17 @@ 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
 
       CRLF = "\r\n".freeze
 
-      # Exceptions raised during non-blocking I/O ops that require retrying the op
-      if RUBY_VERSION >= "1.9.3"
-        NBIO_READ_EXCEPTIONS = [IO::WaitReadable]
-        NBIO_WRITE_EXCEPTIONS = [IO::WaitWritable]
-      else
-        NBIO_READ_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
-        NBIO_WRITE_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
-      end
-
       def initialize(*args)
         super(*args)
 
         @timeout = @write_timeout = nil
-        @buffer = ""
+        @buffer = "".dup
       end
 
       def timeout=(timeout)
@@ -83,13 +64,13 @@ class Redis
         begin
           read_nonblock(nbytes)
 
-        rescue *NBIO_READ_EXCEPTIONS
+        rescue IO::WaitReadable
           if IO.select([self], nil, nil, @timeout)
             retry
           else
             raise Redis::TimeoutError
           end
-        rescue *NBIO_WRITE_EXCEPTIONS
+        rescue IO::WaitWritable
           if IO.select(nil, [self], nil, @timeout)
             retry
           else
@@ -105,13 +86,13 @@ class Redis
         begin
           write_nonblock(data)
 
-        rescue *NBIO_WRITE_EXCEPTIONS
+        rescue IO::WaitWritable
           if IO.select(nil, [self], nil, @write_timeout)
             retry
           else
             raise Redis::TimeoutError
           end
-        rescue *NBIO_READ_EXCEPTIONS
+        rescue IO::WaitReadable
           if IO.select([self], nil, nil, @write_timeout)
             retry
           else
@@ -307,7 +288,6 @@ class Redis
           raise ArgumentError, "SSL incompatible with unix sockets" if config[:ssl]
           sock = UNIXSocket.connect(config[:path], config[:connect_timeout])
         elsif config[:scheme] == "rediss" || config[:ssl]
-          raise ArgumentError, "This library does not support SSL on Ruby < 1.9" if RUBY_VERSION < "1.9.3"
           sock = SSLSocket.connect(config[:host], config[:port], config[:connect_timeout], config[:ssl_params])
         else
           sock = TCPSocket.connect(config[:host], config[:port], config[:connect_timeout])

data/lib/redis/connection/synchrony.rb

@@ -1,6 +1,6 @@
-require "redis/connection/command_helper"
-require "redis/connection/registry"
-require "redis/errors"
+require_relative "command_helper"
+require_relative "registry"
+require_relative "../errors"
 require "em-synchrony"
 require "hiredis/reader"
 
@@ -72,7 +72,15 @@ class Redis
 
       def self.connect(config)
         if config[:scheme] == "unix"
-          conn = EventMachine.connect_unix_domain(config[:path], RedisClient)
+          begin
+            conn = EventMachine.connect_unix_domain(config[:path], RedisClient)
+          rescue RuntimeError => e
+            if e.message == "no connection"
+              raise Errno::ECONNREFUSED
+            else
+              raise e
+            end
+          end
         elsif config[:scheme] == "rediss" || config[:ssl]
           raise NotImplementedError, "SSL not supported by synchrony driver"
         else

data/lib/redis/distributed.rb

@@ -1,4 +1,4 @@
-require "redis/hash_ring"
+require_relative "hash_ring"
 
 class Redis
   class Distributed
@@ -144,8 +144,8 @@ class Redis
     end
 
     # Create a key using the serialized value, previously obtained using DUMP.
-    def restore(key, ttl, serialized_value)
-      node_for(key).restore(key, ttl, serialized_value)
+    def restore(key, ttl, serialized_value, options = {})
+      node_for(key).restore(key, ttl, serialized_value, options)
     end
 
     # Transfer a key from the connected instance to another instance.

data/lib/redis/hash_ring.rb

@@ -25,7 +25,6 @@ class Redis
       @nodes << node
       @replicas.times do |i|
         key = Zlib.crc32("#{node.id}:#{i}")
-        raise "Node ID collision" if @ring.has_key?(key)
         @ring[key] = node
         @sorted_keys << key
       end
@@ -61,72 +60,29 @@ class Redis
       end
     end
 
-    class << self
-
-      # gem install RubyInline to use this code
-      # Native extension to perform the binary search within the hashring.
-      # There's a pure ruby version below so this is purely optional
-      # for performance.  In testing 20k gets and sets, the native
-      # binary search shaved about 12% off the runtime (9sec -> 8sec).
-      begin
-        require 'inline'
-        inline do |builder|
-          builder.c <<-EOM
-          int binary_search(VALUE ary, unsigned int r) {
-              int upper = RARRAY_LEN(ary) - 1;
-              int lower = 0;
-              int idx = 0;
-
-              while (lower <= upper) {
-                  idx = (lower + upper) / 2;
-
-                  VALUE continuumValue = RARRAY_PTR(ary)[idx];
-                  unsigned int l = NUM2UINT(continuumValue);
-                  if (l == r) {
-                      return idx;
-                  }
-                  else if (l > r) {
-                      upper = idx - 1;
-                  }
-                  else {
-                      lower = idx + 1;
-                  }
-              }
-              if (upper < 0) {
-                upper = RARRAY_LEN(ary) - 1;
-              }
-              return upper;
-          }
-          EOM
-        end
-      rescue Exception
-        # Find the closest index in HashRing with value <= the given value
-        def binary_search(ary, value, &block)
-          upper = ary.size - 1
-          lower = 0
-          idx = 0
-
-          while(lower <= upper) do
-            idx = (lower + upper) / 2
-            comp = ary[idx] <=> value
-
-            if comp == 0
-              return idx
-            elsif comp > 0
-              upper = idx - 1
-            else
-              lower = idx + 1
-            end
-          end
-
-          if upper < 0
-            upper = ary.size - 1
-          end
-          return upper
+    # Find the closest index in HashRing with value <= the given value
+    def self.binary_search(ary, value, &block)
+      upper = ary.size - 1
+      lower = 0
+      idx = 0
+
+      while(lower <= upper) do
+        idx = (lower + upper) / 2
+        comp = ary[idx] <=> value
+
+        if comp == 0
+          return idx
+        elsif comp > 0
+          upper = idx - 1
+        else
+          lower = idx + 1
         end
+      end
 
+      if upper < 0
+        upper = ary.size - 1
       end
+      return upper
     end
-
   end
 end

data/lib/redis/pipeline.rb

@@ -1,10 +1,4 @@
 class Redis
-  unless defined?(::BasicObject)
-    class BasicObject
-      instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A(__|instance_eval)/ }
-    end
-  end
-
   class Pipeline
     attr_accessor :db
 

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "3.3.5"
+  VERSION = "4.0.0"
 end

data/makefile

@@ -0,0 +1,42 @@
+TEST_FILES   := $(shell find test -name *_test.rb -type f)
+REDIS_BRANCH := unstable
+TMP          := tmp
+BUILD_DIR    := ${TMP}/redis-${REDIS_BRANCH}
+TARBALL      := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
+BINARY       := ${BUILD_DIR}/src/redis-server
+PID_PATH     := ${BUILD_DIR}/redis.pid
+SOCKET_PATH  := ${BUILD_DIR}/redis.sock
+PORT         := 6381
+
+test: ${TEST_FILES}
+	make start
+	env SOCKET_PATH=${SOCKET_PATH} \
+		ruby -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e ''
+	make stop
+
+${TMP}:
+	mkdir $@
+
+${TARBALL}: ${TMP}
+	wget https://github.com/antirez/redis/archive/${REDIS_BRANCH}.tar.gz -O $@
+
+${BINARY}: ${TARBALL} ${TMP}
+	rm -rf ${BUILD_DIR}
+	mkdir -p ${BUILD_DIR}
+	tar xf ${TARBALL} -C ${TMP}
+	cd ${BUILD_DIR} && make
+
+stop:
+	(test -f ${PID_PATH} && (kill $$(cat ${PID_PATH}) || true) && rm -f ${PID_PATH}) || true
+
+start: ${BINARY}
+	${BINARY}                     \
+		--daemonize  yes            \
+		--pidfile    ${PID_PATH}    \
+		--port       ${PORT}        \
+		--unixsocket ${SOCKET_PATH}
+
+clean:
+	(test -d ${BUILD_DIR} && cd ${BUILD_DIR}/src && make clean distclean) || true
+
+.PHONY: test start stop

data/redis.gemspec

@@ -1,8 +1,4 @@
-# -*- encoding: utf-8 -*-
-
-$:.unshift File.expand_path("../lib", __FILE__)
-
-require "redis/version"
+require "./lib/redis/version"
 
 Gem::Specification.new do |s|
   s.name = "redis"
@@ -15,8 +11,7 @@ Gem::Specification.new do |s|
 
   s.description = <<-EOS
     A Ruby client that tries to match Redis' API one-to-one, while still
-    providing an idiomatic interface. It features thread-safety,
-    client-side sharding, pipelining, and an obsession for performance.
+    providing an idiomatic interface.
   EOS
 
   s.license = "MIT"
@@ -39,6 +34,9 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
-  s.add_development_dependency("rake", "<11.0.0")
-  s.add_development_dependency("test-unit", "3.1.5")
+  s.required_ruby_version = '>= 2.2.2'
+
+  s.add_development_dependency("test-unit", ">= 3.1.5")
+  s.add_development_dependency("hiredis")
+  s.add_development_dependency("em-synchrony")
 end

data/test/bitpos_test.rb

@@ -1,10 +1,4 @@
-# encoding: UTF-8
-
-require File.expand_path("helper", File.dirname(__FILE__))
-
-unless defined?(Enumerator)
-  Enumerator = Enumerable::Enumerator
-end
+require_relative "helper"
 
 class TestBitpos < Test::Unit::TestCase
 
@@ -13,48 +7,48 @@ class TestBitpos < Test::Unit::TestCase
   def test_bitpos_empty_zero
     target_version "2.9.11" do
       r.del "foo"
-      assert_equal 0, r.bitpos("foo", 0)
+      assert_equal(0, r.bitpos("foo", 0))
     end
   end
 
   def test_bitpos_empty_one
     target_version "2.9.11" do
       r.del "foo"
-      assert_equal -1, r.bitpos("foo", 1)
+      assert_equal(-1, r.bitpos("foo", 1))
     end
   end
 
   def test_bitpos_zero
     target_version "2.9.11" do
       r.set "foo", "\xff\xf0\x00"
-      assert_equal 12, r.bitpos("foo", 0)
+      assert_equal(12, r.bitpos("foo", 0))
     end
   end
 
   def test_bitpos_one
     target_version "2.9.11" do
       r.set "foo", "\x00\x0f\x00"
-      assert_equal 12, r.bitpos("foo", 1)
+      assert_equal(12, r.bitpos("foo", 1))
     end
   end
 
   def test_bitpos_zero_end_is_given
     target_version "2.9.11" do
       r.set "foo", "\xff\xff\xff"
-      assert_equal 24, r.bitpos("foo", 0)
-      assert_equal 24, r.bitpos("foo", 0, 0)
-      assert_equal -1, r.bitpos("foo", 0, 0, -1)
+      assert_equal(24, r.bitpos("foo", 0))
+      assert_equal(24, r.bitpos("foo", 0, 0))
+      assert_equal(-1, r.bitpos("foo", 0, 0, -1))
     end
   end
 
   def test_bitpos_one_intervals
     target_version "2.9.11" do
       r.set "foo", "\x00\xff\x00"
-      assert_equal 8,  r.bitpos("foo", 1, 0, -1)
-      assert_equal 8,  r.bitpos("foo", 1, 1, -1)
-      assert_equal -1, r.bitpos("foo", 1, 2, -1)
-      assert_equal -1, r.bitpos("foo", 1, 2, 200)
-      assert_equal 8,  r.bitpos("foo", 1, 1, 1)
+      assert_equal(8,  r.bitpos("foo", 1, 0, -1))
+      assert_equal(8,  r.bitpos("foo", 1, 1, -1))
+      assert_equal(-1, r.bitpos("foo", 1, 2, -1))
+      assert_equal(-1, r.bitpos("foo", 1, 2, 200))
+      assert_equal(8,  r.bitpos("foo", 1, 1, 1))
     end
   end