redis 4.1.0.beta1 → 4.1.0

data/lib/redis/client.rb

@@ -18,6 +18,8 @@ class Redis
       :id => nil,
       :tcp_keepalive => 0,
       :reconnect_attempts => 1,
+      :reconnect_delay => 0,
+      :reconnect_delay_max => 0.5,
       :inherit_socket => false
     }
 
@@ -189,13 +191,10 @@ class Redis
         exception = nil
 
         process(commands) do
-          result[0] = read
-
-          @reconnect = false
-
-          (commands.size - 1).times do |i|
+          commands.size.times do |i|
             reply = read
-            result[i + 1] = reply
+            result[i] = reply
+            @reconnect = false
             exception = reply if exception.nil? && reply.is_a?(CommandError)
           end
         end
@@ -278,12 +277,15 @@ class Redis
 
     def with_socket_timeout(timeout)
       connect unless connected?
+      original = @options[:read_timeout]
 
       begin
         connection.timeout = timeout
+        @options[:read_timeout] = timeout # for reconnection
         yield
       ensure
         connection.timeout = self.timeout if connected?
+        @options[:read_timeout] = original
       end
     end
 
@@ -375,6 +377,10 @@ class Redis
         disconnect
 
         if attempts <= @options[:reconnect_attempts] && @reconnect
+          sleep_t = [(@options[:reconnect_delay] * 2**(attempts-1)),
+                     @options[:reconnect_delay_max]].min
+
+          Kernel.sleep(sleep_t)
           retry
         else
           raise
@@ -452,6 +458,8 @@ class Redis
       options[:write_timeout]   = Float(options[:write_timeout])
 
       options[:reconnect_attempts] = options[:reconnect_attempts].to_i
+      options[:reconnect_delay] = options[:reconnect_delay].to_f
+      options[:reconnect_delay_max] = options[:reconnect_delay_max].to_f
 
       options[:db] = options[:db].to_i
       options[:driver] = _parse_driver(options[:driver]) || Connection.drivers.last

data/lib/redis/cluster.rb

@@ -132,6 +132,7 @@ class Redis
         @node.call_all(command, &block).first
       when 'flushall', 'flushdb'
         @node.call_master(command, &block).first
+      when 'wait'     then @node.call_master(command, &block).reduce(:+)
       when 'keys'     then @node.call_slave(command, &block).flatten.sort
       when 'dbsize'   then @node.call_slave(command, &block).reduce(:+)
       when 'lastsave' then @node.call_all(command, &block).sort

data/lib/redis/cluster/command_loader.rb

@@ -27,6 +27,8 @@ class Redis
       rescue CannotConnectError, ConnectionError, CommandError
         {} # can retry on another node
       end
+
+      private_class_method :fetch_command_details
     end
   end
 end

data/lib/redis/cluster/node_loader.rb

@@ -30,6 +30,8 @@ class Redis
       rescue CannotConnectError, ConnectionError, CommandError
         {} # can retry on another node
       end
+
+      private_class_method :fetch_node_info
     end
   end
 end

data/lib/redis/cluster/option.rb

@@ -2,6 +2,7 @@
 
 require_relative '../errors'
 require_relative 'node_key'
+require 'uri'
 
 class Redis
   class Cluster

data/lib/redis/cluster/slot_loader.rb

@@ -42,6 +42,8 @@ class Redis
         ip = default_ip if ip.empty? # When cluster is down
         NodeKey.build_from_host_port(ip, port)
       end
+
+      private_class_method :fetch_slot_info, :parse_slot_info, :stringify_node_key
     end
   end
 end

data/lib/redis/distributed.rb

@@ -403,12 +403,11 @@ class Redis
     def _bpop(cmd, args)
       options = {}
 
-      case args.last
-      when Hash
+      if args.last.is_a?(Hash)
         options = args.pop
-      when Integer
+      elsif args.last.respond_to?(:to_int)
         # Issue deprecation notice in obnoxious mode...
-        options[:timeout] = args.pop
+        options[:timeout] = args.pop.to_int
       end
 
       if args.size > 1

data/lib/redis/version.rb

@@ -1,3 +1,3 @@
 class Redis
-  VERSION = "4.1.0.beta1"
+  VERSION = '4.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta1
+  version: 4.1.0
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -32,6 +32,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.5
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -65,38 +79,13 @@ description: |2
       providing an idiomatic interface.
 email:
 - redis-db@googlegroups.com
-executables:
-- build
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- ".travis/Gemfile"
-- ".yardopts"
 - CHANGELOG.md
-- Gemfile
 - LICENSE
 - README.md
-- benchmarking/logging.rb
-- benchmarking/pipeline.rb
-- benchmarking/speed.rb
-- benchmarking/suite.rb
-- benchmarking/worker.rb
-- bin/build
-- bors.toml
-- examples/basic.rb
-- examples/consistency.rb
-- examples/dist_redis.rb
-- examples/incr-decr.rb
-- examples/list.rb
-- examples/pubsub.rb
-- examples/sentinel.rb
-- examples/sentinel/sentinel.conf
-- examples/sentinel/start
-- examples/sets.rb
-- examples/unicorn/config.ru
-- examples/unicorn/unicorn.rb
 - lib/redis.rb
 - lib/redis/client.rb
 - lib/redis/cluster.rb
@@ -121,113 +110,6 @@ files:
 - lib/redis/pipeline.rb
 - lib/redis/subscribe.rb
 - lib/redis/version.rb
-- makefile
-- redis.gemspec
-- test/bitpos_test.rb
-- test/blocking_commands_test.rb
-- test/client_test.rb
-- test/cluster_abnormal_state_test.rb
-- test/cluster_blocking_commands_test.rb
-- test/cluster_client_internals_test.rb
-- test/cluster_client_key_hash_tags_test.rb
-- test/cluster_client_options_test.rb
-- test/cluster_client_pipelining_test.rb
-- test/cluster_client_replicas_test.rb
-- test/cluster_client_slots_test.rb
-- test/cluster_client_transactions_test.rb
-- test/cluster_commands_on_cluster_test.rb
-- test/cluster_commands_on_connection_test.rb
-- test/cluster_commands_on_geo_test.rb
-- test/cluster_commands_on_hashes_test.rb
-- test/cluster_commands_on_hyper_log_log_test.rb
-- test/cluster_commands_on_keys_test.rb
-- test/cluster_commands_on_lists_test.rb
-- test/cluster_commands_on_pub_sub_test.rb
-- test/cluster_commands_on_scripting_test.rb
-- test/cluster_commands_on_server_test.rb
-- test/cluster_commands_on_sets_test.rb
-- test/cluster_commands_on_sorted_sets_test.rb
-- test/cluster_commands_on_streams_test.rb
-- test/cluster_commands_on_strings_test.rb
-- test/cluster_commands_on_transactions_test.rb
-- test/cluster_commands_on_value_types_test.rb
-- test/command_map_test.rb
-- test/commands_on_geo_test.rb
-- test/commands_on_hashes_test.rb
-- test/commands_on_hyper_log_log_test.rb
-- test/commands_on_lists_test.rb
-- test/commands_on_sets_test.rb
-- test/commands_on_sorted_sets_test.rb
-- test/commands_on_strings_test.rb
-- test/commands_on_value_types_test.rb
-- test/connection_handling_test.rb
-- test/connection_test.rb
-- test/db/.gitkeep
-- test/distributed_blocking_commands_test.rb
-- test/distributed_commands_on_hashes_test.rb
-- test/distributed_commands_on_hyper_log_log_test.rb
-- test/distributed_commands_on_lists_test.rb
-- test/distributed_commands_on_sets_test.rb
-- test/distributed_commands_on_sorted_sets_test.rb
-- test/distributed_commands_on_strings_test.rb
-- test/distributed_commands_on_value_types_test.rb
-- test/distributed_commands_requiring_clustering_test.rb
-- test/distributed_connection_handling_test.rb
-- test/distributed_internals_test.rb
-- test/distributed_key_tags_test.rb
-- test/distributed_persistence_control_commands_test.rb
-- test/distributed_publish_subscribe_test.rb
-- test/distributed_remote_server_control_commands_test.rb
-- test/distributed_scripting_test.rb
-- test/distributed_sorting_test.rb
-- test/distributed_test.rb
-- test/distributed_transactions_test.rb
-- test/encoding_test.rb
-- test/error_replies_test.rb
-- test/fork_safety_test.rb
-- test/helper.rb
-- test/helper_test.rb
-- test/internals_test.rb
-- test/lint/blocking_commands.rb
-- test/lint/hashes.rb
-- test/lint/hyper_log_log.rb
-- test/lint/lists.rb
-- test/lint/sets.rb
-- test/lint/sorted_sets.rb
-- test/lint/strings.rb
-- test/lint/value_types.rb
-- test/persistence_control_commands_test.rb
-- test/pipelining_commands_test.rb
-- test/publish_subscribe_test.rb
-- test/remote_server_control_commands_test.rb
-- test/scanning_test.rb
-- test/scripting_test.rb
-- test/sentinel_command_test.rb
-- test/sentinel_test.rb
-- test/sorting_test.rb
-- test/ssl_test.rb
-- test/support/cluster/orchestrator.rb
-- test/support/connection/hiredis.rb
-- test/support/connection/ruby.rb
-- test/support/connection/synchrony.rb
-- test/support/redis_mock.rb
-- test/support/ssl/gen_certs.sh
-- test/support/ssl/trusted-ca.crt
-- test/support/ssl/trusted-ca.key
-- test/support/ssl/trusted-cert.crt
-- test/support/ssl/trusted-cert.key
-- test/support/ssl/untrusted-ca.crt
-- test/support/ssl/untrusted-ca.key
-- test/support/ssl/untrusted-cert.crt
-- test/support/ssl/untrusted-cert.key
-- test/support/wire/synchrony.rb
-- test/support/wire/thread.rb
-- test/synchrony_driver.rb
-- test/test.conf.erb
-- test/thread_safety_test.rb
-- test/transactions_test.rb
-- test/unknown_commands_test.rb
-- test/url_param_test.rb
 homepage: https://github.com/redis/redis-rb
 licenses:
 - MIT
@@ -243,118 +125,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Ruby client library for Redis
-test_files:
-- test/bitpos_test.rb
-- test/blocking_commands_test.rb
-- test/client_test.rb
-- test/cluster_abnormal_state_test.rb
-- test/cluster_blocking_commands_test.rb
-- test/cluster_client_internals_test.rb
-- test/cluster_client_key_hash_tags_test.rb
-- test/cluster_client_options_test.rb
-- test/cluster_client_pipelining_test.rb
-- test/cluster_client_replicas_test.rb
-- test/cluster_client_slots_test.rb
-- test/cluster_client_transactions_test.rb
-- test/cluster_commands_on_cluster_test.rb
-- test/cluster_commands_on_connection_test.rb
-- test/cluster_commands_on_geo_test.rb
-- test/cluster_commands_on_hashes_test.rb
-- test/cluster_commands_on_hyper_log_log_test.rb
-- test/cluster_commands_on_keys_test.rb
-- test/cluster_commands_on_lists_test.rb
-- test/cluster_commands_on_pub_sub_test.rb
-- test/cluster_commands_on_scripting_test.rb
-- test/cluster_commands_on_server_test.rb
-- test/cluster_commands_on_sets_test.rb
-- test/cluster_commands_on_sorted_sets_test.rb
-- test/cluster_commands_on_streams_test.rb
-- test/cluster_commands_on_strings_test.rb
-- test/cluster_commands_on_transactions_test.rb
-- test/cluster_commands_on_value_types_test.rb
-- test/command_map_test.rb
-- test/commands_on_geo_test.rb
-- test/commands_on_hashes_test.rb
-- test/commands_on_hyper_log_log_test.rb
-- test/commands_on_lists_test.rb
-- test/commands_on_sets_test.rb
-- test/commands_on_sorted_sets_test.rb
-- test/commands_on_strings_test.rb
-- test/commands_on_value_types_test.rb
-- test/connection_handling_test.rb
-- test/connection_test.rb
-- test/db/.gitkeep
-- test/distributed_blocking_commands_test.rb
-- test/distributed_commands_on_hashes_test.rb
-- test/distributed_commands_on_hyper_log_log_test.rb
-- test/distributed_commands_on_lists_test.rb
-- test/distributed_commands_on_sets_test.rb
-- test/distributed_commands_on_sorted_sets_test.rb
-- test/distributed_commands_on_strings_test.rb
-- test/distributed_commands_on_value_types_test.rb
-- test/distributed_commands_requiring_clustering_test.rb
-- test/distributed_connection_handling_test.rb
-- test/distributed_internals_test.rb
-- test/distributed_key_tags_test.rb
-- test/distributed_persistence_control_commands_test.rb
-- test/distributed_publish_subscribe_test.rb
-- test/distributed_remote_server_control_commands_test.rb
-- test/distributed_scripting_test.rb
-- test/distributed_sorting_test.rb
-- test/distributed_test.rb
-- test/distributed_transactions_test.rb
-- test/encoding_test.rb
-- test/error_replies_test.rb
-- test/fork_safety_test.rb
-- test/helper.rb
-- test/helper_test.rb
-- test/internals_test.rb
-- test/lint/blocking_commands.rb
-- test/lint/hashes.rb
-- test/lint/hyper_log_log.rb
-- test/lint/lists.rb
-- test/lint/sets.rb
-- test/lint/sorted_sets.rb
-- test/lint/strings.rb
-- test/lint/value_types.rb
-- test/persistence_control_commands_test.rb
-- test/pipelining_commands_test.rb
-- test/publish_subscribe_test.rb
-- test/remote_server_control_commands_test.rb
-- test/scanning_test.rb
-- test/scripting_test.rb
-- test/sentinel_command_test.rb
-- test/sentinel_test.rb
-- test/sorting_test.rb
-- test/ssl_test.rb
-- test/support/cluster/orchestrator.rb
-- test/support/connection/hiredis.rb
-- test/support/connection/ruby.rb
-- test/support/connection/synchrony.rb
-- test/support/redis_mock.rb
-- test/support/ssl/gen_certs.sh
-- test/support/ssl/trusted-ca.crt
-- test/support/ssl/trusted-ca.key
-- test/support/ssl/trusted-cert.crt
-- test/support/ssl/trusted-cert.key
-- test/support/ssl/untrusted-ca.crt
-- test/support/ssl/untrusted-ca.key
-- test/support/ssl/untrusted-cert.crt
-- test/support/ssl/untrusted-cert.key
-- test/support/wire/synchrony.rb
-- test/support/wire/thread.rb
-- test/synchrony_driver.rb
-- test/test.conf.erb
-- test/thread_safety_test.rb
-- test/transactions_test.rb
-- test/unknown_commands_test.rb
-- test/url_param_test.rb
+test_files: []

data/.gitignore

@@ -1,19 +0,0 @@
-*.rdb
-*.swp
-Gemfile.lock
-*.gem
-/tmp/
-/.idea
-/.yardoc
-/.bundle
-/coverage/*
-/doc/
-/examples/sentinel/sentinel.conf
-/nohup.out
-/pkg/*
-/rdsrv
-/redis/*
-/test/db
-/test/test.conf
-appendonly.aof
-temp-rewriteaof-*.aof