redis 4.0.2 → 4.0.3

data/test/lint/strings.rb

@@ -1,6 +1,9 @@
 module Lint
 
   module Strings
+    def mock(*args, &block)
+      redis_mock(*args, &block)
+    end
 
     def test_set_and_get
       r.set("foo", "s1")
@@ -242,5 +245,104 @@ module Lint
 
       assert_equal 5, r.strlen("foo")
     end
+
+    def test_bitfield
+      target_version('3.2.0') do
+        mock(bitfield: ->(*_) { "*2\r\n:1\r\n:0\r\n" }) do |redis|
+          assert_equal [1, 0], redis.bitfield('foo', 'INCRBY', 'i5', 100, 1, 'GET', 'u4', 0)
+        end
+      end
+    end
+
+    def test_mget
+      r.set('{1}foo', 's1')
+      r.set('{1}bar', 's2')
+
+      assert_equal %w[s1 s2],         r.mget('{1}foo', '{1}bar')
+      assert_equal ['s1', 's2', nil], r.mget('{1}foo', '{1}bar', '{1}baz')
+    end
+
+    def test_mget_mapped
+      r.set('{1}foo', 's1')
+      r.set('{1}bar', 's2')
+
+      response = r.mapped_mget('{1}foo', '{1}bar')
+
+      assert_equal 's1', response['{1}foo']
+      assert_equal 's2', response['{1}bar']
+
+      response = r.mapped_mget('{1}foo', '{1}bar', '{1}baz')
+
+      assert_equal 's1', response['{1}foo']
+      assert_equal 's2', response['{1}bar']
+      assert_equal nil,  response['{1}baz']
+    end
+
+    def test_mapped_mget_in_a_pipeline_returns_hash
+      r.set('{1}foo', 's1')
+      r.set('{1}bar', 's2')
+
+      result = r.pipelined do
+        r.mapped_mget('{1}foo', '{1}bar')
+      end
+
+      assert_equal({ '{1}foo' => 's1', '{1}bar' => 's2' }, result[0])
+    end
+
+    def test_mset
+      r.mset('{1}foo', 's1', '{1}bar', 's2')
+
+      assert_equal 's1', r.get('{1}foo')
+      assert_equal 's2', r.get('{1}bar')
+    end
+
+    def test_mset_mapped
+      r.mapped_mset('{1}foo' => 's1', '{1}bar' => 's2')
+
+      assert_equal 's1', r.get('{1}foo')
+      assert_equal 's2', r.get('{1}bar')
+    end
+
+    def test_msetnx
+      r.set('{1}foo', 's1')
+      assert_equal false, r.msetnx('{1}foo', 's2', '{1}bar', 's3')
+      assert_equal 's1', r.get('{1}foo')
+      assert_equal nil, r.get('{1}bar')
+
+      r.del('{1}foo')
+      assert_equal true, r.msetnx('{1}foo', 's2', '{1}bar', 's3')
+      assert_equal 's2', r.get('{1}foo')
+      assert_equal 's3', r.get('{1}bar')
+    end
+
+    def test_msetnx_mapped
+      r.set('{1}foo', 's1')
+      assert_equal false, r.mapped_msetnx('{1}foo' => 's2', '{1}bar' => 's3')
+      assert_equal 's1', r.get('{1}foo')
+      assert_equal nil, r.get('{1}bar')
+
+      r.del('{1}foo')
+      assert_equal true, r.mapped_msetnx('{1}foo' => 's2', '{1}bar' => 's3')
+      assert_equal 's2', r.get('{1}foo')
+      assert_equal 's3', r.get('{1}bar')
+    end
+
+    def test_bitop
+      with_external_encoding('UTF-8') do
+        target_version '2.5.10' do
+          r.set('foo{1}', 'a')
+          r.set('bar{1}', 'b')
+
+          r.bitop(:and, 'foo&bar{1}', 'foo{1}', 'bar{1}')
+          assert_equal "\x60", r.get('foo&bar{1}')
+          r.bitop(:or, 'foo|bar{1}', 'foo{1}', 'bar{1}')
+          assert_equal "\x63", r.get('foo|bar{1}')
+          r.bitop(:xor, 'foo^bar{1}', 'foo{1}', 'bar{1}')
+          assert_equal "\x03", r.get('foo^bar{1}')
+          r.bitop(:not, '~foo{1}', 'foo{1}')
+          assert_equal "\x9E", r.get('~foo{1}')
+        end
+      end
+    end
   end
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.3
 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-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
@@ -65,8 +79,7 @@ description: |2
       providing an idiomatic interface.
 email:
 - redis-db@googlegroups.com
-executables:
-- build
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -99,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
@@ -116,6 +139,31 @@ 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
@@ -171,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
@@ -220,6 +269,31 @@ 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
@@ -275,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