redis 4.0.1 → 4.0.3

data/test/pipelining_commands_test.rb

@@ -128,6 +128,14 @@ class TestPipeliningCommands < Test::Unit::TestCase
     end
   end
 
+  def test_futures_raise_when_command_errors_and_needs_transformation
+    assert_raise(Redis::CommandError) do
+      r.pipelined do
+        @result = r.zrange("a", "b", 5, :with_scores => true)
+      end
+    end
+  end
+
   def test_futures_can_be_identified
     r.pipelined do
       @result = r.sadd("foo", 1)

data/test/support/cluster/orchestrator.rb

@@ -0,0 +1,199 @@
+# frozen_string_literal: true
+
+require_relative '../../../lib/redis'
+
+class ClusterOrchestrator
+  SLOT_SIZE = 16384
+
+  def initialize(node_addrs)
+    raise 'Redis Cluster requires at least 3 master nodes.' if node_addrs.size < 3
+    @clients = node_addrs.map { |addr| Redis.new(url: addr) }
+  end
+
+  def rebuild
+    flush_all_data(@clients)
+    reset_cluster(@clients)
+    assign_slots(@clients)
+    save_config_epoch(@clients)
+    meet_each_other(@clients)
+    wait_meeting(@clients)
+    replicate(@clients)
+    save_config(@clients)
+    wait_cluster_building(@clients)
+    sleep 3
+  end
+
+  def down
+    flush_all_data(@clients)
+    reset_cluster(@clients)
+  end
+
+  def failover
+    take_slaves(@clients).last.cluster(:failover, :takeover)
+    sleep 3
+  end
+
+  def start_resharding(slot, src_node_key, dest_node_key)
+    node_map = hashify_node_map(@clients.first)
+    src_node_id = node_map.fetch(src_node_key)
+    src_client = find_client(@clients, src_node_key)
+    dest_node_id = node_map.fetch(dest_node_key)
+    dest_client = find_client(@clients, dest_node_key)
+    dest_host, dest_port = dest_node_key.split(':')
+
+    dest_client.cluster(:setslot, slot, 'IMPORTING', src_node_id)
+    src_client.cluster(:setslot, slot, 'MIGRATING', dest_node_id)
+
+    loop do
+      keys = src_client.cluster(:getkeysinslot, slot, 100)
+      break if keys.empty?
+      keys.each { |k| src_client.migrate(k, host: dest_host, port: dest_port) }
+      sleep 0.1
+    end
+  end
+
+  def finish_resharding(slot, dest_node_key)
+    node_map = hashify_node_map(@clients.first)
+    @clients.first.cluster(:setslot, slot, 'NODE', node_map.fetch(dest_node_key))
+  end
+
+  def close
+    @clients.each(&:quit)
+  end
+
+  private
+
+  def flush_all_data(clients)
+    clients.each do |c|
+      begin
+        c.flushall
+      rescue Redis::CommandError
+        # READONLY You can't write against a read only slave.
+        nil
+      end
+    end
+  end
+
+  def reset_cluster(clients)
+    clients.each { |c| c.cluster(:reset) }
+  end
+
+  def assign_slots(clients)
+    masters = take_masters(clients)
+    slot_slice = SLOT_SIZE / masters.size
+    mod = SLOT_SIZE % masters.size
+    slot_sizes = Array.new(masters.size, slot_slice)
+    mod.downto(1) { |i| slot_sizes[i] += 1 }
+
+    slot_idx = 0
+    masters.zip(slot_sizes).each do |c, s|
+      slot_range = slot_idx..slot_idx + s - 1
+      c.cluster(:addslots, *slot_range.to_a)
+      slot_idx += s
+    end
+  end
+
+  def save_config_epoch(clients)
+    clients.each_with_index do |c, i|
+      begin
+        c.cluster('set-config-epoch', i + 1)
+      rescue Redis::CommandError
+        # ERR Node config epoch is already non-zero
+        nil
+      end
+    end
+  end
+
+  def meet_each_other(clients)
+    first_cliient = clients.first
+    target_info = first_cliient.connection
+    target_host = target_info.fetch(:host)
+    target_port = target_info.fetch(:port)
+
+    clients.each do |client|
+      next if first_cliient.id == client.id
+      client.cluster(:meet, target_host, target_port)
+    end
+  end
+
+  def wait_meeting(clients)
+    first_cliient = clients.first
+    size = clients.size
+
+    loop do
+      info = hashify_cluster_info(first_cliient)
+      break if info['cluster_known_nodes'].to_i == size
+      sleep 0.1
+    end
+  end
+
+  def replicate(clients)
+    node_map = hashify_node_map(clients.first)
+    masters = take_masters(clients)
+
+    take_slaves(clients).each_with_index do |slave, i|
+      master_info = masters[i].connection
+      master_host = master_info.fetch(:host)
+      master_port = master_info.fetch(:port)
+
+      loop do
+        begin
+          master_node_id = node_map.fetch("#{master_host}:#{master_port}")
+          slave.cluster(:replicate, master_node_id)
+        rescue Redis::CommandError
+          # ERR Unknown node [key]
+          sleep 0.1
+          node_map = hashify_node_map(clients.first)
+          next
+        end
+
+        break
+      end
+    end
+  end
+
+  def save_config(clients)
+    clients.each { |c| c.cluster(:saveconfig) }
+  end
+
+  def wait_cluster_building(clients)
+    first_cliient = clients.first
+
+    loop do
+      info = hashify_cluster_info(first_cliient)
+      break if info['cluster_state'] == 'ok'
+      sleep 0.1
+    end
+  end
+
+  def hashify_cluster_info(client)
+    client.cluster(:info).split("\r\n").map { |str| str.split(':') }.to_h
+  end
+
+  def hashify_node_map(client)
+    client.cluster(:nodes)
+          .split("\n")
+          .map { |str| str.split(' ') }
+          .map { |arr| [arr[1].split('@').first, arr[0]] }
+          .to_h
+  end
+
+  def take_masters(clients)
+    size = clients.size / 2
+    return clients if size < 3
+    clients.take(size)
+  end
+
+  def take_slaves(clients)
+    size = clients.size / 2
+    return [] if size < 3
+    clients[size..size * 2]
+  end
+
+  def find_client(clients, node_key)
+    clients.find do |cli|
+      con = cli.connection
+      node_key == "#{con.fetch(:host)}:#{con.fetch(:port)}"
+    end
+  end
+end

data/test/support/redis_mock.rb

@@ -42,7 +42,7 @@ module RedisMock
           end
         end
       rescue => ex
-        $stderr.puts "Error running mock server: #{ex.message}"
+        $stderr.puts "Error running mock server: #{ex.class}: #{ex.message}"
         $stderr.puts ex.backtrace
         retry
       ensure

data/test/transactions_test.rb

@@ -114,6 +114,16 @@ class TestTransactions < Test::Unit::TestCase
     assert_equal "s1", r.get("foo")
   end
 
+  def test_empty_multi_exec
+    result = nil
+
+    redis_mock(:exec => lambda { |*_| "-ERROR" }) do |redis|
+      result = redis.multi {}
+    end
+
+    assert_equal [], result
+  end
+
   def test_raise_command_errors_when_accessing_futures_after_multi_exec
     begin
       r.multi do |m|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Ezra Zygmuntowicz
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2018-10-31 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
@@ -82,6 +96,7 @@ files:
 - benchmarking/speed.rb
 - benchmarking/suite.rb
 - benchmarking/worker.rb
+- bin/build
 - bors.toml
 - examples/basic.rb
 - examples/consistency.rb
@@ -97,6 +112,16 @@ files:
 - examples/unicorn/unicorn.rb
 - lib/redis.rb
 - lib/redis/client.rb
+- lib/redis/cluster.rb
+- lib/redis/cluster/command.rb
+- lib/redis/cluster/command_loader.rb
+- lib/redis/cluster/key_slot_converter.rb
+- lib/redis/cluster/node.rb
+- lib/redis/cluster/node_key.rb
+- lib/redis/cluster/node_loader.rb
+- lib/redis/cluster/option.rb
+- lib/redis/cluster/slot.rb
+- lib/redis/cluster/slot_loader.rb
 - lib/redis/connection.rb
 - lib/redis/connection/command_helper.rb
 - lib/redis/connection/hiredis.rb
@@ -114,7 +139,33 @@ 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
@@ -168,6 +219,7 @@ files:
 - 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
@@ -217,7 +269,33 @@ 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
@@ -271,6 +349,7 @@ test_files:
 - 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