redis 3.3.5 → 4.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (130) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +84 -2
  3. data/README.md +131 -76
  4. data/lib/redis.rb +912 -200
  5. data/lib/redis/client.rb +71 -29
  6. data/lib/redis/cluster.rb +291 -0
  7. data/lib/redis/cluster/command.rb +81 -0
  8. data/lib/redis/cluster/command_loader.rb +34 -0
  9. data/lib/redis/cluster/key_slot_converter.rb +72 -0
  10. data/lib/redis/cluster/node.rb +104 -0
  11. data/lib/redis/cluster/node_key.rb +31 -0
  12. data/lib/redis/cluster/node_loader.rb +37 -0
  13. data/lib/redis/cluster/option.rb +87 -0
  14. data/lib/redis/cluster/slot.rb +72 -0
  15. data/lib/redis/cluster/slot_loader.rb +50 -0
  16. data/lib/redis/connection.rb +3 -2
  17. data/lib/redis/connection/command_helper.rb +3 -8
  18. data/lib/redis/connection/hiredis.rb +3 -2
  19. data/lib/redis/connection/registry.rb +1 -0
  20. data/lib/redis/connection/ruby.rb +48 -32
  21. data/lib/redis/connection/synchrony.rb +13 -4
  22. data/lib/redis/distributed.rb +39 -15
  23. data/lib/redis/errors.rb +47 -0
  24. data/lib/redis/hash_ring.rb +21 -64
  25. data/lib/redis/pipeline.rb +54 -12
  26. data/lib/redis/subscribe.rb +1 -0
  27. data/lib/redis/version.rb +2 -1
  28. metadata +40 -198
  29. data/.gitignore +0 -16
  30. data/.travis.yml +0 -89
  31. data/.travis/Gemfile +0 -11
  32. data/.yardopts +0 -3
  33. data/Gemfile +0 -4
  34. data/Rakefile +0 -87
  35. data/benchmarking/logging.rb +0 -71
  36. data/benchmarking/pipeline.rb +0 -51
  37. data/benchmarking/speed.rb +0 -21
  38. data/benchmarking/suite.rb +0 -24
  39. data/benchmarking/worker.rb +0 -71
  40. data/examples/basic.rb +0 -15
  41. data/examples/consistency.rb +0 -114
  42. data/examples/dist_redis.rb +0 -43
  43. data/examples/incr-decr.rb +0 -17
  44. data/examples/list.rb +0 -26
  45. data/examples/pubsub.rb +0 -37
  46. data/examples/sentinel.rb +0 -41
  47. data/examples/sentinel/sentinel.conf +0 -9
  48. data/examples/sentinel/start +0 -49
  49. data/examples/sets.rb +0 -36
  50. data/examples/unicorn/config.ru +0 -3
  51. data/examples/unicorn/unicorn.rb +0 -20
  52. data/redis.gemspec +0 -44
  53. data/test/bitpos_test.rb +0 -69
  54. data/test/blocking_commands_test.rb +0 -42
  55. data/test/client_test.rb +0 -59
  56. data/test/command_map_test.rb +0 -30
  57. data/test/commands_on_hashes_test.rb +0 -21
  58. data/test/commands_on_hyper_log_log_test.rb +0 -21
  59. data/test/commands_on_lists_test.rb +0 -20
  60. data/test/commands_on_sets_test.rb +0 -77
  61. data/test/commands_on_sorted_sets_test.rb +0 -137
  62. data/test/commands_on_strings_test.rb +0 -101
  63. data/test/commands_on_value_types_test.rb +0 -133
  64. data/test/connection_handling_test.rb +0 -277
  65. data/test/connection_test.rb +0 -57
  66. data/test/db/.gitkeep +0 -0
  67. data/test/distributed_blocking_commands_test.rb +0 -46
  68. data/test/distributed_commands_on_hashes_test.rb +0 -10
  69. data/test/distributed_commands_on_hyper_log_log_test.rb +0 -33
  70. data/test/distributed_commands_on_lists_test.rb +0 -22
  71. data/test/distributed_commands_on_sets_test.rb +0 -83
  72. data/test/distributed_commands_on_sorted_sets_test.rb +0 -18
  73. data/test/distributed_commands_on_strings_test.rb +0 -59
  74. data/test/distributed_commands_on_value_types_test.rb +0 -95
  75. data/test/distributed_commands_requiring_clustering_test.rb +0 -164
  76. data/test/distributed_connection_handling_test.rb +0 -23
  77. data/test/distributed_internals_test.rb +0 -79
  78. data/test/distributed_key_tags_test.rb +0 -52
  79. data/test/distributed_persistence_control_commands_test.rb +0 -26
  80. data/test/distributed_publish_subscribe_test.rb +0 -92
  81. data/test/distributed_remote_server_control_commands_test.rb +0 -66
  82. data/test/distributed_scripting_test.rb +0 -102
  83. data/test/distributed_sorting_test.rb +0 -20
  84. data/test/distributed_test.rb +0 -58
  85. data/test/distributed_transactions_test.rb +0 -32
  86. data/test/encoding_test.rb +0 -18
  87. data/test/error_replies_test.rb +0 -59
  88. data/test/fork_safety_test.rb +0 -65
  89. data/test/helper.rb +0 -232
  90. data/test/helper_test.rb +0 -24
  91. data/test/internals_test.rb +0 -417
  92. data/test/lint/blocking_commands.rb +0 -150
  93. data/test/lint/hashes.rb +0 -162
  94. data/test/lint/hyper_log_log.rb +0 -60
  95. data/test/lint/lists.rb +0 -143
  96. data/test/lint/sets.rb +0 -140
  97. data/test/lint/sorted_sets.rb +0 -316
  98. data/test/lint/strings.rb +0 -260
  99. data/test/lint/value_types.rb +0 -122
  100. data/test/persistence_control_commands_test.rb +0 -26
  101. data/test/pipelining_commands_test.rb +0 -242
  102. data/test/publish_subscribe_test.rb +0 -282
  103. data/test/remote_server_control_commands_test.rb +0 -118
  104. data/test/scanning_test.rb +0 -413
  105. data/test/scripting_test.rb +0 -78
  106. data/test/sentinel_command_test.rb +0 -80
  107. data/test/sentinel_test.rb +0 -255
  108. data/test/sorting_test.rb +0 -59
  109. data/test/ssl_test.rb +0 -73
  110. data/test/support/connection/hiredis.rb +0 -1
  111. data/test/support/connection/ruby.rb +0 -1
  112. data/test/support/connection/synchrony.rb +0 -17
  113. data/test/support/redis_mock.rb +0 -130
  114. data/test/support/ssl/gen_certs.sh +0 -31
  115. data/test/support/ssl/trusted-ca.crt +0 -25
  116. data/test/support/ssl/trusted-ca.key +0 -27
  117. data/test/support/ssl/trusted-cert.crt +0 -81
  118. data/test/support/ssl/trusted-cert.key +0 -28
  119. data/test/support/ssl/untrusted-ca.crt +0 -26
  120. data/test/support/ssl/untrusted-ca.key +0 -27
  121. data/test/support/ssl/untrusted-cert.crt +0 -82
  122. data/test/support/ssl/untrusted-cert.key +0 -28
  123. data/test/support/wire/synchrony.rb +0 -24
  124. data/test/support/wire/thread.rb +0 -5
  125. data/test/synchrony_driver.rb +0 -88
  126. data/test/test.conf.erb +0 -9
  127. data/test/thread_safety_test.rb +0 -62
  128. data/test/transactions_test.rb +0 -264
  129. data/test/unknown_commands_test.rb +0 -14
  130. data/test/url_param_test.rb +0 -138
@@ -1,23 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedConnectionHandling < Test::Unit::TestCase
6
-
7
- include Helper::Distributed
8
-
9
- def test_ping
10
- assert_equal ["PONG"], r.ping
11
- end
12
-
13
- def test_select
14
- r.set "foo", "bar"
15
-
16
- r.select 14
17
- assert_equal nil, r.get("foo")
18
-
19
- r.select 15
20
-
21
- assert_equal "bar", r.get("foo")
22
- end
23
- end
@@ -1,79 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedInternals < Test::Unit::TestCase
6
-
7
- include Helper::Distributed
8
-
9
- def test_provides_a_meaningful_inspect
10
- nodes = ["redis://localhost:#{PORT}/15", *NODES]
11
- redis = Redis::Distributed.new nodes
12
-
13
- assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
14
- end
15
-
16
- def test_default_as_urls
17
- nodes = ["redis://localhost:#{PORT}/15", *NODES]
18
- redis = Redis::Distributed.new nodes
19
- assert_equal ["redis://localhost:#{PORT}/15", *NODES], redis.nodes.map { |node| node.client.id}
20
- end
21
-
22
- def test_default_as_config_hashes
23
- nodes = [OPTIONS.merge(:host => '127.0.0.1'), OPTIONS.merge(:host => 'somehost', :port => PORT.next)]
24
- redis = Redis::Distributed.new nodes
25
- assert_equal ["redis://127.0.0.1:#{PORT}/15","redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node.client.id }
26
- end
27
-
28
- def test_as_mix_and_match
29
- nodes = ["redis://127.0.0.1:7389/15", OPTIONS.merge(:host => 'somehost'), OPTIONS.merge(:host => 'somehost', :port => PORT.next)]
30
- redis = Redis::Distributed.new nodes
31
- assert_equal ["redis://127.0.0.1:7389/15", "redis://somehost:#{PORT}/15", "redis://somehost:#{PORT.next}/15"], redis.nodes.map { |node| node.client.id }
32
- end
33
-
34
- def test_override_id
35
- nodes = [OPTIONS.merge(:host => '127.0.0.1', :id => "test"), OPTIONS.merge( :host => 'somehost', :port => PORT.next, :id => "test1")]
36
- redis = Redis::Distributed.new nodes
37
- assert_equal redis.nodes.first.client.id, "test"
38
- assert_equal redis.nodes.last.client.id, "test1"
39
- assert_equal "#<Redis client v#{Redis::VERSION} for #{redis.nodes.map(&:id).join(', ')}>", redis.inspect
40
- end
41
-
42
- def test_can_be_duped_to_create_a_new_connection
43
- redis = Redis::Distributed.new(NODES)
44
-
45
- clients = redis.info[0]["connected_clients"].to_i
46
-
47
- r2 = redis.dup
48
- r2.ping
49
-
50
- assert_equal clients + 1, redis.info[0]["connected_clients"].to_i
51
- end
52
-
53
- def test_keeps_options_after_dup
54
- r1 = Redis::Distributed.new(NODES, :tag => /^(\w+):/)
55
-
56
- assert_raise(Redis::Distributed::CannotDistribute) do
57
- r1.sinter("foo", "bar")
58
- end
59
-
60
- assert_equal [], r1.sinter("baz:foo", "baz:bar")
61
-
62
- r2 = r1.dup
63
-
64
- assert_raise(Redis::Distributed::CannotDistribute) do
65
- r2.sinter("foo", "bar")
66
- end
67
-
68
- assert_equal [], r2.sinter("baz:foo", "baz:bar")
69
- end
70
-
71
- def test_colliding_node_ids
72
- nodes = ["redis://localhost:#{PORT}/15", "redis://localhost:#{PORT}/15", *NODES]
73
-
74
- assert_raise(RuntimeError) do
75
- Redis::Distributed.new nodes
76
- end
77
- end
78
-
79
- end
@@ -1,52 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedKeyTags < Test::Unit::TestCase
6
-
7
- include Helper
8
- include Helper::Distributed
9
-
10
- def test_hashes_consistently
11
- r1 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
12
- r2 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
13
- r3 = Redis::Distributed.new ["redis://localhost:#{PORT}/15", *NODES]
14
-
15
- assert_equal r1.node_for("foo").id, r2.node_for("foo").id
16
- assert_equal r1.node_for("foo").id, r3.node_for("foo").id
17
- end
18
-
19
- def test_allows_clustering_of_keys
20
- r = Redis::Distributed.new(NODES)
21
- r.add_node("redis://127.0.0.1:#{PORT}/14")
22
- r.flushdb
23
-
24
- 100.times do |i|
25
- r.set "{foo}users:#{i}", i
26
- end
27
-
28
- assert_equal [0, 100], r.nodes.map { |node| node.keys.size }
29
- end
30
-
31
- def test_distributes_keys_if_no_clustering_is_used
32
- r.add_node("redis://127.0.0.1:#{PORT}/14")
33
- r.flushdb
34
-
35
- r.set "users:1", 1
36
- r.set "users:4", 4
37
-
38
- assert_equal [1, 1], r.nodes.map { |node| node.keys.size }
39
- end
40
-
41
- def test_allows_passing_a_custom_tag_extractor
42
- r = Redis::Distributed.new(NODES, :tag => /^(.+?):/)
43
- r.add_node("redis://127.0.0.1:#{PORT}/14")
44
- r.flushdb
45
-
46
- 100.times do |i|
47
- r.set "foo:users:#{i}", i
48
- end
49
-
50
- assert_equal [0, 100], r.nodes.map { |node| node.keys.size }
51
- end
52
- end
@@ -1,26 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedPersistenceControlCommands < Test::Unit::TestCase
6
-
7
- include Helper::Distributed
8
-
9
- def test_save
10
- redis_mock(:save => lambda { "+SAVE" }) do |redis|
11
- assert_equal ["SAVE"], redis.save
12
- end
13
- end
14
-
15
- def test_bgsave
16
- redis_mock(:bgsave => lambda { "+BGSAVE" }) do |redis|
17
- assert_equal ["BGSAVE"], redis.bgsave
18
- end
19
- end
20
-
21
- def test_lastsave
22
- redis_mock(:lastsave => lambda { "+LASTSAVE" }) do |redis|
23
- assert_equal ["LASTSAVE"], redis.lastsave
24
- end
25
- end
26
- end
@@ -1,92 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedPublishSubscribe < Test::Unit::TestCase
6
-
7
- include Helper::Distributed
8
-
9
- def test_subscribe_and_unsubscribe
10
- assert_raise Redis::Distributed::CannotDistribute do
11
- r.subscribe("foo", "bar") { }
12
- end
13
-
14
- assert_raise Redis::Distributed::CannotDistribute do
15
- r.subscribe("{qux}foo", "bar") { }
16
- end
17
- end
18
-
19
- def test_subscribe_and_unsubscribe_with_tags
20
- @subscribed = false
21
- @unsubscribed = false
22
-
23
- wire = Wire.new do
24
- r.subscribe("foo") do |on|
25
- on.subscribe do |channel, total|
26
- @subscribed = true
27
- @t1 = total
28
- end
29
-
30
- on.message do |channel, message|
31
- if message == "s1"
32
- r.unsubscribe
33
- @message = message
34
- end
35
- end
36
-
37
- on.unsubscribe do |channel, total|
38
- @unsubscribed = true
39
- @t2 = total
40
- end
41
- end
42
- end
43
-
44
- # Wait until the subscription is active before publishing
45
- Wire.pass while !@subscribed
46
-
47
- Redis::Distributed.new(NODES).publish("foo", "s1")
48
-
49
- wire.join
50
-
51
- assert @subscribed
52
- assert_equal 1, @t1
53
- assert @unsubscribed
54
- assert_equal 0, @t2
55
- assert_equal "s1", @message
56
- end
57
-
58
- def test_subscribe_within_subscribe
59
- @channels = []
60
-
61
- wire = Wire.new do
62
- r.subscribe("foo") do |on|
63
- on.subscribe do |channel, total|
64
- @channels << channel
65
-
66
- r.subscribe("bar") if channel == "foo"
67
- r.unsubscribe if channel == "bar"
68
- end
69
- end
70
- end
71
-
72
- wire.join
73
-
74
- assert_equal ["foo", "bar"], @channels
75
- end
76
-
77
- def test_other_commands_within_a_subscribe
78
- assert_raise Redis::CommandError do
79
- r.subscribe("foo") do |on|
80
- on.subscribe do |channel, total|
81
- r.set("bar", "s2")
82
- end
83
- end
84
- end
85
- end
86
-
87
- def test_subscribe_without_a_block
88
- assert_raise LocalJumpError do
89
- r.subscribe("foo")
90
- end
91
- end
92
- end
@@ -1,66 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedRemoteServerControlCommands < Test::Unit::TestCase
6
-
7
- include Helper::Distributed
8
-
9
- def test_info
10
- keys = [
11
- "redis_version",
12
- "uptime_in_seconds",
13
- "uptime_in_days",
14
- "connected_clients",
15
- "used_memory",
16
- "total_connections_received",
17
- "total_commands_processed",
18
- ]
19
-
20
- infos = r.info
21
-
22
- infos.each do |info|
23
- keys.each do |k|
24
- msg = "expected #info to include #{k}"
25
- assert info.keys.include?(k), msg
26
- end
27
- end
28
- end
29
-
30
- def test_info_commandstats
31
- target_version "2.5.7" do
32
- r.nodes.each { |n| n.config(:resetstat) }
33
- r.ping # Executed on every node
34
-
35
- r.info(:commandstats).each do |info|
36
- assert_equal "1", info["ping"]["calls"]
37
- end
38
- end
39
- end
40
-
41
- def test_monitor
42
- begin
43
- r.monitor
44
- rescue Exception => ex
45
- ensure
46
- assert ex.kind_of?(NotImplementedError)
47
- end
48
- end
49
-
50
- def test_echo
51
- assert_equal ["foo bar baz\n"], r.echo("foo bar baz\n")
52
- end
53
-
54
- def test_time
55
- target_version "2.5.4" do
56
- # Test that the difference between the time that Ruby reports and the time
57
- # that Redis reports is minimal (prevents the test from being racy).
58
- r.time.each do |rv|
59
- redis_usec = rv[0] * 1_000_000 + rv[1]
60
- ruby_usec = Integer(Time.now.to_f * 1_000_000)
61
-
62
- assert 500_000 > (ruby_usec - redis_usec).abs
63
- end
64
- end
65
- end
66
- end
@@ -1,102 +0,0 @@
1
- # encoding: UTF-8
2
-
3
- require File.expand_path("helper", File.dirname(__FILE__))
4
-
5
- class TestDistributedScripting < Test::Unit::TestCase
6
-
7
- include Helper::Distributed
8
-
9
- def to_sha(script)
10
- r.script(:load, script).first
11
- end
12
-
13
- def test_script_exists
14
- target_version "2.5.9" do # 2.6-rc1
15
- a = to_sha("return 1")
16
- b = a.succ
17
-
18
- assert_equal [true], r.script(:exists, a)
19
- assert_equal [false], r.script(:exists, b)
20
- assert_equal [[true]], r.script(:exists, [a])
21
- assert_equal [[false]], r.script(:exists, [b])
22
- assert_equal [[true, false]], r.script(:exists, [a, b])
23
- end
24
- end
25
-
26
- def test_script_flush
27
- target_version "2.5.9" do # 2.6-rc1
28
- sha = to_sha("return 1")
29
- assert r.script(:exists, sha).first
30
- assert_equal ["OK"], r.script(:flush)
31
- assert !r.script(:exists, sha).first
32
- end
33
- end
34
-
35
- def test_script_kill
36
- target_version "2.5.9" do # 2.6-rc1
37
- redis_mock(:script => lambda { |arg| "+#{arg.upcase}" }) do |redis|
38
- assert_equal ["KILL"], redis.script(:kill)
39
- end
40
- end
41
- end
42
-
43
- def test_eval
44
- target_version "2.5.9" do # 2.6-rc1
45
- assert_raises(Redis::Distributed::CannotDistribute) do
46
- r.eval("return #KEYS")
47
- end
48
-
49
- assert_raises(Redis::Distributed::CannotDistribute) do
50
- r.eval("return KEYS", ["k1", "k2"])
51
- end
52
-
53
- assert_equal ["k1"], r.eval("return KEYS", ["k1"])
54
- assert_equal ["a1", "a2"], r.eval("return ARGV", ["k1"], ["a1", "a2"])
55
- end
56
- end
57
-
58
- def test_eval_with_options_hash
59
- target_version "2.5.9" do # 2.6-rc1
60
- assert_raises(Redis::Distributed::CannotDistribute) do
61
- r.eval("return #KEYS", {})
62
- end
63
-
64
- assert_raises(Redis::Distributed::CannotDistribute) do
65
- r.eval("return KEYS", { :keys => ["k1", "k2"] })
66
- end
67
-
68
- assert_equal ["k1"], r.eval("return KEYS", { :keys => ["k1"] })
69
- assert_equal ["a1", "a2"], r.eval("return ARGV", { :keys => ["k1"], :argv => ["a1", "a2"] })
70
- end
71
- end
72
-
73
- def test_evalsha
74
- target_version "2.5.9" do # 2.6-rc1
75
- assert_raises(Redis::Distributed::CannotDistribute) do
76
- r.evalsha(to_sha("return #KEYS"))
77
- end
78
-
79
- assert_raises(Redis::Distributed::CannotDistribute) do
80
- r.evalsha(to_sha("return KEYS"), ["k1", "k2"])
81
- end
82
-
83
- assert_equal ["k1"], r.evalsha(to_sha("return KEYS"), ["k1"])
84
- assert_equal ["a1", "a2"], r.evalsha(to_sha("return ARGV"), ["k1"], ["a1", "a2"])
85
- end
86
- end
87
-
88
- def test_evalsha_with_options_hash
89
- target_version "2.5.9" do # 2.6-rc1
90
- assert_raises(Redis::Distributed::CannotDistribute) do
91
- r.evalsha(to_sha("return #KEYS"), {})
92
- end
93
-
94
- assert_raises(Redis::Distributed::CannotDistribute) do
95
- r.evalsha(to_sha("return KEYS"), { :keys => ["k1", "k2"] })
96
- end
97
-
98
- assert_equal ["k1"], r.evalsha(to_sha("return KEYS"), { :keys => ["k1"] })
99
- assert_equal ["a1", "a2"], r.evalsha(to_sha("return ARGV"), { :keys => ["k1"], :argv => ["a1", "a2"] })
100
- end
101
- end
102
- end