Merge pull request #1120 from casperisfine/redis-rb-5.0

Start redis-rb 5.0

Author: byroot

.github/workflows/test.yaml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
+          ruby-version: "2.5"
       - name: Set up Gems
         run: |
           gem update --system --no-document
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: ["3.1", "3.0", "2.7", "2.6", "2.5", "2.4", "jruby-9.3.6.0"]
+        ruby: ["3.1", "3.0", "2.7", "2.6", "2.5", "jruby-9.3.6.0"]
     runs-on: ubuntu-latest
     env:
       VERBOSE: "true"
@@ -73,7 +73,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        driver: ["hiredis", "synchrony"]
+        driver: ["hiredis"]
     runs-on: ubuntu-latest
     env:
       VERBOSE: "true"
@@ -93,7 +93,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
+          ruby-version: "2.5"
           bundler-cache: true
       - name: Cache local temporary directory
         uses: actions/cache@v3
@@ -133,7 +133,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
+          ruby-version: "2.5"
           bundler-cache: true
       - name: Cache local temporary directory
         uses: actions/cache@v3
@@ -171,15 +171,15 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
+          ruby-version: "2.5"
           bundler-cache: true
       - name: Cache local temporary directory
         uses: actions/cache@v3
         with:
           path: tmp
           key: "local-tmp-redis-7.0-on-ubuntu-latest"
       - name: Booting up Redis
-        run: make start_all
+        run: make start_sentinel wait_for_sentinel
       - name: Test
         run: bundle exec rake test:sentinel
       - name: Shutting down Redis
@@ -197,6 +197,7 @@ jobs:
       LOW_TIMEOUT: "0.14"
       DRIVER: ruby
       REDIS_BRANCH: "7.0"
+      REDIS_CLUSTER: "true"
     steps:
       - name: Check out code
         uses: actions/checkout@v3
@@ -209,15 +210,15 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "2.4"
+          ruby-version: "2.7"
           bundler-cache: true
       - name: Cache local temporary directory
         uses: actions/cache@v3
         with:
           path: tmp
           key: "local-tmp-redis-7.0-on-ubuntu-latest"
       - name: Booting up Redis
-        run: make start_all
+        run: make start start_cluster create_cluster
       - name: Test
         run: bundle exec rake test:cluster
       - name: Shutting down Redis

.rubocop.yml

@@ -1,7 +1,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
 
 Layout/LineLength:
   Max: 120
@@ -139,6 +139,12 @@ Metrics/BlockNesting:
 Style/HashTransformValues:
   Enabled: false
 
+Style/TrailingCommaInHashLiteral:
+  Enabled: false
+
 Style/SymbolProc:
   Exclude:
-    - 'test/**/*'
+    - 'test/**/*'
+
+Bundler/OrderedGems:
+  Enabled: false

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Unreleased
 
+# Unreleased 5.0.0
+
+- `select` no longer record the current database. If the client has to reconnect after `select` was used, it will reconnect to the original database.
+- Removed `logger` option.
+- Removed `reconnect_delay_max` and `reconnect_delay`, you can pass precise sleep durations to `reconnect_attempts` instead.
+- Require Ruby 2.5+.
+- Removed the deprecated `queue` and `commit` methods. Use `pipelined` instead.
+- Removed the deprecated `Redis::Future#==`.
+- Removed the deprecated `pipelined` and `multi` signature. Commands now MUST be called on the block argument, not the original redis instance.
+- Removed `Redis.current`. You shouldn't assume there is a single global Redis connection, use a connection pool instead,
+  and libaries using Redis should accept a Redis instance (or connection pool) as a config. E.g. `MyLibrary.redis = Redis.new(...)`.
+- Removed the `synchrony` driver.
+- Removed `Redis.exists_returns_integer`, it's now always enabled.
+
 # 4.7.1
 
 * Gracefully handle OpenSSL 3.0 EOF Errors (`OpenSSL::SSL::SSLError: SSL_read: unexpected eof while reading`). See #1106

Gemfile

@@ -6,4 +6,9 @@ gemspec
 
 gem 'minitest'
 gem 'rake'
-gem 'rubocop', '~> 1.0', '< 1.12'
+gem 'rubocop', '~> 1.25.1'
+gem 'mocha'
+
+gem 'redis-client', github: 'redis-rb/redis-client'
+gem 'hiredis-client'
+gem 'redis-cluster-client', github: 'redis-rb/redis-cluster-client' if ENV['REDIS_CLUSTER']

README.md

@@ -111,7 +111,7 @@ If you want to [authenticate](https://redis.io/topics/sentinel#configuring-senti
 SENTINELS = [{ host: '127.0.0.1', port: 26380, password: 'mysecret' },
              { host: '127.0.0.1', port: 26381, password: 'mysecret' }]
 
-redis = Redis.new(host: 'mymaster', sentinels: SENTINELS, role: :master)
+redis = Redis.new(name: 'mymaster', sentinels: SENTINELS, role: :master)
 ```
 
 ## Cluster support
@@ -434,30 +434,6 @@ When instantiating the client object, specify hiredis:
 redis = Redis.new(:driver => :hiredis)
 ```
 
-### synchrony
-
-The synchrony driver adds support for [em-synchrony][em-synchrony].
-This makes redis-rb work with EventMachine's asynchronous I/O, while not
-changing the exposed API. The hiredis gem needs to be available as
-well, because the synchrony driver uses hiredis for parsing the Redis
-protocol.
-
-[em-synchrony]: https://github.com/igrigorik/em-synchrony
-
-In your Gemfile, include em-synchrony and hiredis:
-
-```ruby
-gem "redis", "~> 3.0.1"
-gem "hiredis", "~> 0.4.5"
-gem "em-synchrony"
-```
-
-When instantiating the client object, specify synchrony:
-
-```ruby
-redis = Redis.new(:driver => :synchrony)
-```
-
 ## Testing
 
 This library is tested against recent Ruby and Redis versions.

benchmarking/cluster_slot.rb

@@ -1,11 +1,13 @@
 #!/usr/bin/env ruby
-
 # frozen_string_literal: true
 
+puts ARGV.join(" ")
+require 'bundler/setup'
+
 $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require_relative '../test/support/cluster/orchestrator'
 
 urls = ARGV.map { |host_port| "redis://#{host_port}" }
-orchestrator = ClusterOrchestrator.new(urls, timeout: 30.0)
+orchestrator = ClusterOrchestrator.new(urls, timeout: 3.0)
 orchestrator.rebuild
 orchestrator.close

benchmarking/logging.rb

@@ -13,10 +13,8 @@ pids = []
 
 at_exit do
   pids.each do |pid|
-    begin
-      Process.kill(:INT, pid)
-    rescue Errno::ESRCH
-    end
+    Process.kill(:INT, pid)
+  rescue Errno::ESRCH
   end
 
   Process.waitall

bin/cluster_creator

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 run lambda { |_env|
-  [200, { "Content-Type" => "text/plain" }, [Redis.current.randomkey]]
+  [200, { "Content-Type" => "text/plain" }, [MyApp.redis.randomkey]]
 }