redis 4.8.1 → 5.0.0.beta3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +20 -10
- data/README.md +77 -161
- data/lib/redis/client.rb +78 -606
- data/lib/redis/commands/bitmaps.rb +4 -1
- data/lib/redis/commands/cluster.rb +1 -18
- data/lib/redis/commands/connection.rb +5 -10
- data/lib/redis/commands/hashes.rb +6 -3
- data/lib/redis/commands/hyper_log_log.rb +1 -1
- data/lib/redis/commands/keys.rb +0 -18
- data/lib/redis/commands/lists.rb +11 -16
- data/lib/redis/commands/pubsub.rb +7 -9
- data/lib/redis/commands/server.rb +14 -14
- data/lib/redis/commands/sets.rb +30 -39
- data/lib/redis/commands/sorted_sets.rb +4 -2
- data/lib/redis/commands/streams.rb +12 -10
- data/lib/redis/commands/strings.rb +1 -0
- data/lib/redis/commands/transactions.rb +7 -31
- data/lib/redis/commands.rb +1 -6
- data/lib/redis/distributed.rb +85 -63
- data/lib/redis/errors.rb +10 -52
- data/lib/redis/hash_ring.rb +26 -26
- data/lib/redis/pipeline.rb +43 -222
- data/lib/redis/subscribe.rb +15 -9
- data/lib/redis/version.rb +1 -1
- data/lib/redis.rb +68 -181
- metadata +13 -57
- data/lib/redis/cluster/command.rb +0 -79
- data/lib/redis/cluster/command_loader.rb +0 -33
- data/lib/redis/cluster/key_slot_converter.rb +0 -72
- data/lib/redis/cluster/node.rb +0 -120
- data/lib/redis/cluster/node_key.rb +0 -31
- data/lib/redis/cluster/node_loader.rb +0 -34
- data/lib/redis/cluster/option.rb +0 -100
- data/lib/redis/cluster/slot.rb +0 -86
- data/lib/redis/cluster/slot_loader.rb +0 -46
- data/lib/redis/cluster.rb +0 -315
- data/lib/redis/connection/command_helper.rb +0 -41
- data/lib/redis/connection/hiredis.rb +0 -68
- data/lib/redis/connection/registry.rb +0 -13
- data/lib/redis/connection/ruby.rb +0 -437
- data/lib/redis/connection/synchrony.rb +0 -148
- data/lib/redis/connection.rb +0 -11
@@ -39,7 +39,10 @@ class Redis
|
|
39
39
|
# @param [String, Array<String>] keys one or more source keys to perform `operation`
|
40
40
|
# @return [Integer] the length of the string stored in `destkey`
|
41
41
|
def bitop(operation, destkey, *keys)
|
42
|
-
|
42
|
+
keys.flatten!(1)
|
43
|
+
command = [:bitop, operation, destkey]
|
44
|
+
command.concat(keys)
|
45
|
+
send_command(command)
|
43
46
|
end
|
44
47
|
|
45
48
|
# Return the position of the first bit set to 1 or 0 in a string.
|
@@ -12,24 +12,7 @@ class Redis
|
|
12
12
|
#
|
13
13
|
# @return [Object] depends on the subcommand
|
14
14
|
def cluster(subcommand, *args)
|
15
|
-
subcommand
|
16
|
-
block = case subcommand
|
17
|
-
when 'slots'
|
18
|
-
HashifyClusterSlots
|
19
|
-
when 'nodes'
|
20
|
-
HashifyClusterNodes
|
21
|
-
when 'slaves'
|
22
|
-
HashifyClusterSlaves
|
23
|
-
when 'info'
|
24
|
-
HashifyInfo
|
25
|
-
else
|
26
|
-
Noop
|
27
|
-
end
|
28
|
-
|
29
|
-
# @see https://github.com/antirez/redis/blob/unstable/src/redis-trib.rb#L127 raw reply expected
|
30
|
-
block = Noop unless @cluster_mode
|
31
|
-
|
32
|
-
send_command([:cluster, subcommand] + args, &block)
|
15
|
+
send_command([:cluster, subcommand] + args)
|
33
16
|
end
|
34
17
|
|
35
18
|
# Sends `ASKING` command to random node and returns its reply.
|
@@ -34,10 +34,7 @@ class Redis
|
|
34
34
|
# @param [Integer] db zero-based index of the DB to use (0 to 15)
|
35
35
|
# @return [String] `OK`
|
36
36
|
def select(db)
|
37
|
-
|
38
|
-
client.db = db
|
39
|
-
client.call([:select, db])
|
40
|
-
end
|
37
|
+
send_command([:select, db])
|
41
38
|
end
|
42
39
|
|
43
40
|
# Close the connection.
|
@@ -45,12 +42,10 @@ class Redis
|
|
45
42
|
# @return [String] `OK`
|
46
43
|
def quit
|
47
44
|
synchronize do |client|
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
client.disconnect
|
53
|
-
end
|
45
|
+
client.call_v([:quit])
|
46
|
+
rescue ConnectionError
|
47
|
+
ensure
|
48
|
+
client.close
|
54
49
|
end
|
55
50
|
end
|
56
51
|
end
|
@@ -87,7 +87,8 @@ class Redis
|
|
87
87
|
#
|
88
88
|
# @see #mapped_hmget
|
89
89
|
def hmget(key, *fields, &blk)
|
90
|
-
|
90
|
+
fields.flatten!(1)
|
91
|
+
send_command([:hmget, key].concat(fields), &blk)
|
91
92
|
end
|
92
93
|
|
93
94
|
# Get the values of all the given hash fields.
|
@@ -102,7 +103,8 @@ class Redis
|
|
102
103
|
#
|
103
104
|
# @see #hmget
|
104
105
|
def mapped_hmget(key, *fields)
|
105
|
-
|
106
|
+
fields.flatten!(1)
|
107
|
+
hmget(key, fields) do |reply|
|
106
108
|
if reply.is_a?(Array)
|
107
109
|
Hash[fields.zip(reply)]
|
108
110
|
else
|
@@ -152,7 +154,8 @@ class Redis
|
|
152
154
|
# @param [String, Array<String>] field
|
153
155
|
# @return [Integer] the number of fields that were removed from the hash
|
154
156
|
def hdel(key, *fields)
|
155
|
-
|
157
|
+
fields.flatten!(1)
|
158
|
+
send_command([:hdel, key].concat(fields))
|
156
159
|
end
|
157
160
|
|
158
161
|
# Determine if a hash field exists.
|
@@ -20,7 +20,7 @@ class Redis
|
|
20
20
|
# @param [String, Array<String>] keys
|
21
21
|
# @return [Integer]
|
22
22
|
def pfcount(*keys)
|
23
|
-
send_command([:pfcount] + keys)
|
23
|
+
send_command([:pfcount] + keys.flatten(1))
|
24
24
|
end
|
25
25
|
|
26
26
|
# Merge multiple HyperLogLog values into an unique value that will approximate the cardinality of the union of
|
data/lib/redis/commands/keys.rb
CHANGED
@@ -249,24 +249,6 @@ class Redis
|
|
249
249
|
# @param [String, Array<String>] keys
|
250
250
|
# @return [Integer]
|
251
251
|
def exists(*keys)
|
252
|
-
if !Redis.exists_returns_integer && keys.size == 1
|
253
|
-
if Redis.exists_returns_integer.nil?
|
254
|
-
message = "`Redis#exists(key)` will return an Integer in redis-rb 4.3. `exists?` returns a boolean, you " \
|
255
|
-
"should use it instead. To opt-in to the new behavior now you can set Redis.exists_returns_integer = " \
|
256
|
-
"true. To disable this message and keep the current (boolean) behaviour of 'exists' you can set " \
|
257
|
-
"`Redis.exists_returns_integer = false`, but this option will be removed in 5.0.0. " \
|
258
|
-
"(#{::Kernel.caller(1, 1).first})\n"
|
259
|
-
|
260
|
-
::Redis.deprecate!(message)
|
261
|
-
end
|
262
|
-
|
263
|
-
exists?(*keys)
|
264
|
-
else
|
265
|
-
_exists(*keys)
|
266
|
-
end
|
267
|
-
end
|
268
|
-
|
269
|
-
def _exists(*keys)
|
270
252
|
send_command([:exists, *keys])
|
271
253
|
end
|
272
254
|
|
data/lib/redis/commands/lists.rb
CHANGED
@@ -48,7 +48,7 @@ class Redis
|
|
48
48
|
# @param [String, Symbol] where_destination where to push the element to the source list
|
49
49
|
# e.g. 'LEFT' - to head, 'RIGHT' - to tail
|
50
50
|
# @param [Hash] options
|
51
|
-
# - `:timeout =>
|
51
|
+
# - `:timeout => [Float, Integer]`: timeout in seconds, defaults to no timeout
|
52
52
|
#
|
53
53
|
# @return [nil, String] the element, or nil when the source key does not exist or the timeout expired
|
54
54
|
#
|
@@ -142,7 +142,7 @@ class Redis
|
|
142
142
|
# @param [String, Array<String>] keys one or more keys to perform the
|
143
143
|
# blocking pop on
|
144
144
|
# @param [Hash] options
|
145
|
-
# - `:timeout => Integer`: timeout in seconds, defaults to no timeout
|
145
|
+
# - `:timeout => [Float, Integer]`: timeout in seconds, defaults to no timeout
|
146
146
|
#
|
147
147
|
# @return [nil, [String, String]]
|
148
148
|
# - `nil` when the operation timed out
|
@@ -156,7 +156,7 @@ class Redis
|
|
156
156
|
# @param [String, Array<String>] keys one or more keys to perform the
|
157
157
|
# blocking pop on
|
158
158
|
# @param [Hash] options
|
159
|
-
# - `:timeout => Integer`: timeout in seconds, defaults to no timeout
|
159
|
+
# - `:timeout => [Float, Integer]`: timeout in seconds, defaults to no timeout
|
160
160
|
#
|
161
161
|
# @return [nil, [String, String]]
|
162
162
|
# - `nil` when the operation timed out
|
@@ -173,12 +173,12 @@ class Redis
|
|
173
173
|
# @param [String] source source key
|
174
174
|
# @param [String] destination destination key
|
175
175
|
# @param [Hash] options
|
176
|
-
# - `:timeout => Integer`: timeout in seconds, defaults to no timeout
|
176
|
+
# - `:timeout => [Float, Integer]`: timeout in seconds, defaults to no timeout
|
177
177
|
#
|
178
178
|
# @return [nil, String]
|
179
179
|
# - `nil` when the operation timed out
|
180
180
|
# - the element was popped and pushed otherwise
|
181
|
-
def brpoplpush(source, destination,
|
181
|
+
def brpoplpush(source, destination, timeout: 0)
|
182
182
|
command = [:brpoplpush, source, destination, timeout]
|
183
183
|
send_blocking_command(command, timeout)
|
184
184
|
end
|
@@ -253,21 +253,16 @@ class Redis
|
|
253
253
|
timeout = if args.last.is_a?(Hash)
|
254
254
|
options = args.pop
|
255
255
|
options[:timeout]
|
256
|
-
elsif args.last.respond_to?(:to_int)
|
257
|
-
last_arg = args.pop
|
258
|
-
::Redis.deprecate!(
|
259
|
-
"Passing the timeout as a positional argument is deprecated, it should be passed as a keyword argument:\n" \
|
260
|
-
" redis.#{cmd}(#{args.map(&:inspect).join(', ')}, timeout: #{last_arg.to_int})" \
|
261
|
-
"(called from: #{caller(2, 1).first})"
|
262
|
-
)
|
263
|
-
last_arg.to_int
|
264
256
|
end
|
265
257
|
|
266
258
|
timeout ||= 0
|
259
|
+
unless timeout.is_a?(Integer) || timeout.is_a?(Float)
|
260
|
+
raise ArgumentError, "timeout must be an Integer or Float, got: #{timeout.class}"
|
261
|
+
end
|
267
262
|
|
268
|
-
|
269
|
-
|
270
|
-
command
|
263
|
+
args.flatten!(1)
|
264
|
+
command = [cmd].concat(args)
|
265
|
+
command << timeout
|
271
266
|
send_blocking_command(command, timeout, &blk)
|
272
267
|
end
|
273
268
|
|
@@ -9,9 +9,7 @@ class Redis
|
|
9
9
|
end
|
10
10
|
|
11
11
|
def subscribed?
|
12
|
-
|
13
|
-
client.is_a? SubscribedClient
|
14
|
-
end
|
12
|
+
!@subscription_client.nil?
|
15
13
|
end
|
16
14
|
|
17
15
|
# Listen for messages published to the given channels.
|
@@ -31,10 +29,10 @@ class Redis
|
|
31
29
|
|
32
30
|
# Stop listening for messages posted to the given channels.
|
33
31
|
def unsubscribe(*channels)
|
34
|
-
|
35
|
-
raise "Can't unsubscribe if not subscribed." unless subscribed?
|
32
|
+
raise "Can't unsubscribe if not subscribed." unless subscribed?
|
36
33
|
|
37
|
-
|
34
|
+
synchronize do |_client|
|
35
|
+
_subscription(:unsubscribe, 0, channels, nil)
|
38
36
|
end
|
39
37
|
end
|
40
38
|
|
@@ -55,10 +53,10 @@ class Redis
|
|
55
53
|
|
56
54
|
# Stop listening for messages posted to channels matching the given patterns.
|
57
55
|
def punsubscribe(*channels)
|
58
|
-
|
59
|
-
raise "Can't unsubscribe if not subscribed." unless subscribed?
|
56
|
+
raise "Can't unsubscribe if not subscribed." unless subscribed?
|
60
57
|
|
61
|
-
|
58
|
+
synchronize do |_client|
|
59
|
+
_subscription(:punsubscribe, 0, channels, nil)
|
62
60
|
end
|
63
61
|
end
|
64
62
|
|
@@ -117,9 +117,13 @@ class Redis
|
|
117
117
|
#
|
118
118
|
# @yield a block to be called for every line of output
|
119
119
|
# @yieldparam [String] line timestamp and command that was executed
|
120
|
-
def monitor
|
120
|
+
def monitor
|
121
121
|
synchronize do |client|
|
122
|
-
client.
|
122
|
+
client = client.pubsub
|
123
|
+
client.call_v([:monitor])
|
124
|
+
loop do
|
125
|
+
yield client.next_event
|
126
|
+
end
|
123
127
|
end
|
124
128
|
end
|
125
129
|
|
@@ -133,13 +137,11 @@ class Redis
|
|
133
137
|
# Synchronously save the dataset to disk and then shut down the server.
|
134
138
|
def shutdown
|
135
139
|
synchronize do |client|
|
136
|
-
client.
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
nil
|
142
|
-
end
|
140
|
+
client.disable_reconnection do
|
141
|
+
client.call_v([:shutdown])
|
142
|
+
rescue ConnectionError
|
143
|
+
# This means Redis has probably exited.
|
144
|
+
nil
|
143
145
|
end
|
144
146
|
end
|
145
147
|
end
|
@@ -155,11 +157,9 @@ class Redis
|
|
155
157
|
# @param [Integer] length maximum number of entries to return
|
156
158
|
# @return [Array<String>, Integer, String] depends on subcommand
|
157
159
|
def slowlog(subcommand, length = nil)
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
client.call args
|
162
|
-
end
|
160
|
+
args = [:slowlog, subcommand]
|
161
|
+
args << length if length
|
162
|
+
send_command(args)
|
163
163
|
end
|
164
164
|
|
165
165
|
# Internal command used for replication.
|
data/lib/redis/commands/sets.rb
CHANGED
@@ -15,56 +15,40 @@ class Redis
|
|
15
15
|
#
|
16
16
|
# @param [String] key
|
17
17
|
# @param [String, Array<String>] member one member, or array of members
|
18
|
-
# @return [
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
def sadd(key, member)
|
23
|
-
block = if Redis.sadd_returns_boolean && !member.is_a?(Array)
|
24
|
-
::Redis.deprecate!(
|
25
|
-
"Redis#sadd will always return an Integer in Redis 5.0.0. Use Redis#sadd? instead." \
|
26
|
-
"(called from: #{caller(1, 1).first})"
|
27
|
-
)
|
28
|
-
Boolify
|
29
|
-
end
|
30
|
-
send_command([:sadd, key, member], &block)
|
18
|
+
# @return [Integer] The number of members that were successfully added
|
19
|
+
def sadd(key, *members)
|
20
|
+
members.flatten!(1)
|
21
|
+
send_command([:sadd, key].concat(members))
|
31
22
|
end
|
32
23
|
|
33
24
|
# Add one or more members to a set.
|
34
25
|
#
|
35
26
|
# @param [String] key
|
36
27
|
# @param [String, Array<String>] member one member, or array of members
|
37
|
-
# @return [Boolean]
|
38
|
-
def sadd?(key,
|
39
|
-
|
28
|
+
# @return [Boolean] Wether at least one member was successfully added.
|
29
|
+
def sadd?(key, *members)
|
30
|
+
members.flatten!(1)
|
31
|
+
send_command([:sadd, key].concat(members), &Boolify)
|
40
32
|
end
|
41
33
|
|
42
34
|
# Remove one or more members from a set.
|
43
35
|
#
|
44
36
|
# @param [String] key
|
45
37
|
# @param [String, Array<String>] member one member, or array of members
|
46
|
-
# @return [
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
def srem(key, member)
|
51
|
-
block = if Redis.sadd_returns_boolean && !member.is_a?(Array)
|
52
|
-
::Redis.deprecate!(
|
53
|
-
"Redis#srem will always return an Integer in Redis 5.0.0. Use Redis#srem? instead." \
|
54
|
-
"(called from: #{caller(1, 1).first})"
|
55
|
-
)
|
56
|
-
Boolify
|
57
|
-
end
|
58
|
-
send_command([:srem, key, member], &block)
|
38
|
+
# @return [Integer] The number of members that were successfully removed
|
39
|
+
def srem(key, *members)
|
40
|
+
members.flatten!(1)
|
41
|
+
send_command([:srem, key].concat(members))
|
59
42
|
end
|
60
43
|
|
61
44
|
# Remove one or more members from a set.
|
62
45
|
#
|
63
46
|
# @param [String] key
|
64
47
|
# @param [String, Array<String>] member one member, or array of members
|
65
|
-
# @return [Boolean]
|
66
|
-
def srem?(key,
|
67
|
-
|
48
|
+
# @return [Boolean] Wether at least one member was successfully removed.
|
49
|
+
def srem?(key, *members)
|
50
|
+
members.flatten!(1)
|
51
|
+
send_command([:srem, key].concat(members), &Boolify)
|
68
52
|
end
|
69
53
|
|
70
54
|
# Remove and return one or more random member from a set.
|
@@ -118,7 +102,8 @@ class Redis
|
|
118
102
|
# @param [String, Array<String>] members
|
119
103
|
# @return [Array<Boolean>]
|
120
104
|
def smismember(key, *members)
|
121
|
-
|
105
|
+
members.flatten!(1)
|
106
|
+
send_command([:smismember, key].concat(members)) do |reply|
|
122
107
|
reply.map(&Boolify)
|
123
108
|
end
|
124
109
|
end
|
@@ -136,7 +121,8 @@ class Redis
|
|
136
121
|
# @param [String, Array<String>] keys keys pointing to sets to subtract
|
137
122
|
# @return [Array<String>] members in the difference
|
138
123
|
def sdiff(*keys)
|
139
|
-
|
124
|
+
keys.flatten!(1)
|
125
|
+
send_command([:sdiff].concat(keys))
|
140
126
|
end
|
141
127
|
|
142
128
|
# Subtract multiple sets and store the resulting set in a key.
|
@@ -145,7 +131,8 @@ class Redis
|
|
145
131
|
# @param [String, Array<String>] keys keys pointing to sets to subtract
|
146
132
|
# @return [Integer] number of elements in the resulting set
|
147
133
|
def sdiffstore(destination, *keys)
|
148
|
-
|
134
|
+
keys.flatten!(1)
|
135
|
+
send_command([:sdiffstore, destination].concat(keys))
|
149
136
|
end
|
150
137
|
|
151
138
|
# Intersect multiple sets.
|
@@ -153,7 +140,8 @@ class Redis
|
|
153
140
|
# @param [String, Array<String>] keys keys pointing to sets to intersect
|
154
141
|
# @return [Array<String>] members in the intersection
|
155
142
|
def sinter(*keys)
|
156
|
-
|
143
|
+
keys.flatten!(1)
|
144
|
+
send_command([:sinter].concat(keys))
|
157
145
|
end
|
158
146
|
|
159
147
|
# Intersect multiple sets and store the resulting set in a key.
|
@@ -162,7 +150,8 @@ class Redis
|
|
162
150
|
# @param [String, Array<String>] keys keys pointing to sets to intersect
|
163
151
|
# @return [Integer] number of elements in the resulting set
|
164
152
|
def sinterstore(destination, *keys)
|
165
|
-
|
153
|
+
keys.flatten!(1)
|
154
|
+
send_command([:sinterstore, destination].concat(keys))
|
166
155
|
end
|
167
156
|
|
168
157
|
# Add multiple sets.
|
@@ -170,7 +159,8 @@ class Redis
|
|
170
159
|
# @param [String, Array<String>] keys keys pointing to sets to unify
|
171
160
|
# @return [Array<String>] members in the union
|
172
161
|
def sunion(*keys)
|
173
|
-
|
162
|
+
keys.flatten!(1)
|
163
|
+
send_command([:sunion].concat(keys))
|
174
164
|
end
|
175
165
|
|
176
166
|
# Add multiple sets and store the resulting set in a key.
|
@@ -179,7 +169,8 @@ class Redis
|
|
179
169
|
# @param [String, Array<String>] keys keys pointing to sets to unify
|
180
170
|
# @return [Integer] number of elements in the resulting set
|
181
171
|
def sunionstore(destination, *keys)
|
182
|
-
|
172
|
+
keys.flatten!(1)
|
173
|
+
send_command([:sunionstore, destination].concat(keys))
|
183
174
|
end
|
184
175
|
|
185
176
|
# Scan a set
|
@@ -778,7 +778,8 @@ class Redis
|
|
778
778
|
private
|
779
779
|
|
780
780
|
def _zsets_operation(cmd, *keys, weights: nil, aggregate: nil, with_scores: false)
|
781
|
-
|
781
|
+
keys.flatten!(1)
|
782
|
+
command = [cmd, keys.size].concat(keys)
|
782
783
|
|
783
784
|
if weights
|
784
785
|
command << "WEIGHTS"
|
@@ -796,7 +797,8 @@ class Redis
|
|
796
797
|
end
|
797
798
|
|
798
799
|
def _zsets_operation_store(cmd, destination, keys, weights: nil, aggregate: nil)
|
799
|
-
|
800
|
+
keys.flatten!(1)
|
801
|
+
command = [cmd, destination, keys.size].concat(keys)
|
800
802
|
|
801
803
|
if weights
|
802
804
|
command << "WEIGHTS"
|
@@ -21,15 +21,12 @@ class Redis
|
|
21
21
|
# @return [Array<Hash>] information of the consumers if subcommand is `consumers`
|
22
22
|
def xinfo(subcommand, key, group = nil)
|
23
23
|
args = [:xinfo, subcommand, key, group].compact
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
when 'stream' then Hashify.call(reply)
|
28
|
-
when 'groups', 'consumers' then reply.map { |arr| Hashify.call(arr) }
|
29
|
-
else reply
|
30
|
-
end
|
31
|
-
end
|
24
|
+
block = case subcommand.to_s.downcase
|
25
|
+
when 'stream' then Hashify
|
26
|
+
when 'groups', 'consumers' then proc { |r| r.map(&Hashify) }
|
32
27
|
end
|
28
|
+
|
29
|
+
send_command(args, &block)
|
33
30
|
end
|
34
31
|
|
35
32
|
# Add new entry to the stream.
|
@@ -113,7 +110,7 @@ class Redis
|
|
113
110
|
def xrange(key, start = '-', range_end = '+', count: nil)
|
114
111
|
args = [:xrange, key, start, range_end]
|
115
112
|
args.concat(['COUNT', count]) if count
|
116
|
-
|
113
|
+
send_command(args, &HashifyStreamEntries)
|
117
114
|
end
|
118
115
|
|
119
116
|
# Fetches entries of the stream in descending order.
|
@@ -334,6 +331,8 @@ class Redis
|
|
334
331
|
# redis.xpending('mystream', 'mygroup')
|
335
332
|
# @example With range options
|
336
333
|
# redis.xpending('mystream', 'mygroup', '-', '+', 10)
|
334
|
+
# @example With range and idle time options
|
335
|
+
# redis.xpending('mystream', 'mygroup', '-', '+', 10, idle: 9000)
|
337
336
|
# @example With range and consumer options
|
338
337
|
# redis.xpending('mystream', 'mygroup', '-', '+', 10, 'consumer1')
|
339
338
|
#
|
@@ -344,10 +343,13 @@ class Redis
|
|
344
343
|
# @param count [Integer] count the number of entries as limit
|
345
344
|
# @param consumer [String] the consumer name
|
346
345
|
#
|
346
|
+
# @option opts [Integer] :idle pending message minimum idle time in milliseconds
|
347
|
+
#
|
347
348
|
# @return [Hash] the summary of pending entries
|
348
349
|
# @return [Array<Hash>] the pending entries details if options were specified
|
349
|
-
def xpending(key, group, *args)
|
350
|
+
def xpending(key, group, *args, idle: nil)
|
350
351
|
command_args = [:xpending, key, group]
|
352
|
+
command_args << 'IDLE' << Integer(idle) if idle
|
351
353
|
case args.size
|
352
354
|
when 0, 3, 4
|
353
355
|
command_args.concat(args)
|
@@ -5,48 +5,26 @@ class Redis
|
|
5
5
|
module Transactions
|
6
6
|
# Mark the start of a transaction block.
|
7
7
|
#
|
8
|
-
# Passing a block is optional.
|
9
|
-
#
|
10
8
|
# @example With a block
|
11
9
|
# redis.multi do |multi|
|
12
10
|
# multi.set("key", "value")
|
13
11
|
# multi.incr("counter")
|
14
12
|
# end # => ["OK", 6]
|
15
13
|
#
|
16
|
-
# @example Without a block
|
17
|
-
# redis.multi
|
18
|
-
# # => "OK"
|
19
|
-
# redis.set("key", "value")
|
20
|
-
# # => "QUEUED"
|
21
|
-
# redis.incr("counter")
|
22
|
-
# # => "QUEUED"
|
23
|
-
# redis.exec
|
24
|
-
# # => ["OK", 6]
|
25
|
-
#
|
26
14
|
# @yield [multi] the commands that are called inside this block are cached
|
27
15
|
# and written to the server upon returning from it
|
28
16
|
# @yieldparam [Redis] multi `self`
|
29
17
|
#
|
30
|
-
# @return [
|
31
|
-
# -
|
32
|
-
# - when a block is given, an array with replies
|
18
|
+
# @return [Array<...>]
|
19
|
+
# - an array with replies
|
33
20
|
#
|
34
21
|
# @see #watch
|
35
22
|
# @see #unwatch
|
36
|
-
def multi
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
end
|
41
|
-
|
42
|
-
synchronize do |prior_client|
|
43
|
-
pipeline = Pipeline::Multi.new(prior_client)
|
44
|
-
pipelined_connection = PipelinedConnection.new(pipeline)
|
45
|
-
yield pipelined_connection
|
46
|
-
prior_client.call_pipeline(pipeline)
|
23
|
+
def multi
|
24
|
+
synchronize do |client|
|
25
|
+
client.multi do |raw_transaction|
|
26
|
+
yield MultiConnection.new(raw_transaction)
|
47
27
|
end
|
48
|
-
else
|
49
|
-
send_command([:multi])
|
50
28
|
end
|
51
29
|
end
|
52
30
|
|
@@ -82,7 +60,7 @@ class Redis
|
|
82
60
|
# @see #multi
|
83
61
|
def watch(*keys)
|
84
62
|
synchronize do |client|
|
85
|
-
res = client.
|
63
|
+
res = client.call_v([:watch] + keys)
|
86
64
|
|
87
65
|
if block_given?
|
88
66
|
begin
|
@@ -125,8 +103,6 @@ class Redis
|
|
125
103
|
|
126
104
|
# Discard all commands issued after MULTI.
|
127
105
|
#
|
128
|
-
# Only call this method when `#multi` was called **without** a block.
|
129
|
-
#
|
130
106
|
# @return [String] `"OK"`
|
131
107
|
#
|
132
108
|
# @see #multi
|
data/lib/redis/commands.rb
CHANGED
@@ -40,12 +40,7 @@ class Redis
|
|
40
40
|
# where the method call will return nil. Propagate the nil instead of falsely
|
41
41
|
# returning false.
|
42
42
|
Boolify = lambda { |value|
|
43
|
-
|
44
|
-
when Integer
|
45
|
-
value > 0
|
46
|
-
else
|
47
|
-
value
|
48
|
-
end
|
43
|
+
value != 0 unless value.nil?
|
49
44
|
}
|
50
45
|
|
51
46
|
BoolifySet = lambda { |value|
|