Unverified Commit d375595d authored by Oran Agra's avatar Oran Agra Committed by GitHub
Browse files

Merge pull request #10652 from oranagra/redis-7.0.0

Redis 7.0.0
parents fb4e0d40 c1f30206
...@@ -1223,11 +1223,20 @@ start_server {tags {"zset"}} { ...@@ -1223,11 +1223,20 @@ start_server {tags {"zset"}} {
} {} {needs:repl} } {} {needs:repl}
foreach resp {3 2} { foreach resp {3 2} {
set rd [redis_deferring_client]
if {[lsearch $::denytags "resp3"] >= 0} {
if {$resp == 3} {continue}
} else {
r hello $resp
$rd hello $resp
$rd read
}
test "ZPOPMIN/ZPOPMAX readraw in RESP$resp" { test "ZPOPMIN/ZPOPMAX readraw in RESP$resp" {
r del zset{t} r del zset{t}
create_zset zset2{t} {1 a 2 b 3 c 4 d 5 e} create_zset zset2{t} {1 a 2 b 3 c 4 d 5 e}
r hello $resp
r readraw 1 r readraw 1
# ZPOP against non existing key. # ZPOP against non existing key.
...@@ -1260,9 +1269,6 @@ start_server {tags {"zset"}} { ...@@ -1260,9 +1269,6 @@ start_server {tags {"zset"}} {
r del zset{t} r del zset{t}
create_zset zset2{t} {1 a 2 b 3 c 4 d 5 e} create_zset zset2{t} {1 a 2 b 3 c 4 d 5 e}
set rd [redis_deferring_client]
$rd hello $resp
$rd read
$rd readraw 1 $rd readraw 1
# BZPOP released on timeout. # BZPOP released on timeout.
...@@ -1291,7 +1297,7 @@ start_server {tags {"zset"}} { ...@@ -1291,7 +1297,7 @@ start_server {tags {"zset"}} {
assert_equal [$rd read] {a} assert_equal [$rd read] {a}
verify_score_response $rd $resp 1 verify_score_response $rd $resp 1
$rd close $rd readraw 0
} }
test "ZMPOP readraw in RESP$resp" { test "ZMPOP readraw in RESP$resp" {
...@@ -1299,7 +1305,6 @@ start_server {tags {"zset"}} { ...@@ -1299,7 +1305,6 @@ start_server {tags {"zset"}} {
create_zset zset3{t} {1 a} create_zset zset3{t} {1 a}
create_zset zset4{t} {1 a 2 b 3 c 4 d 5 e} create_zset zset4{t} {1 a 2 b 3 c 4 d 5 e}
r hello $resp
r readraw 1 r readraw 1
# ZMPOP against non existing key. # ZMPOP against non existing key.
...@@ -1339,9 +1344,6 @@ start_server {tags {"zset"}} { ...@@ -1339,9 +1344,6 @@ start_server {tags {"zset"}} {
r del zset{t} zset2{t} r del zset{t} zset2{t}
create_zset zset3{t} {1 a 2 b 3 c 4 d 5 e} create_zset zset3{t} {1 a 2 b 3 c 4 d 5 e}
set rd [redis_deferring_client]
$rd hello $resp
$rd read
$rd readraw 1 $rd readraw 1
# BZMPOP released on timeout. # BZMPOP released on timeout.
...@@ -1380,8 +1382,9 @@ start_server {tags {"zset"}} { ...@@ -1380,8 +1382,9 @@ start_server {tags {"zset"}} {
assert_equal [$rd read] {b} assert_equal [$rd read] {b}
verify_score_response $rd $resp 2 verify_score_response $rd $resp 2
$rd close
} }
$rd close
} }
test {ZINTERSTORE regression with two sets, intset+hashtable} { test {ZINTERSTORE regression with two sets, intset+hashtable} {
......
# One XADD with one huge 5GB field # One XADD with one huge 5GB field
# Expected to fail resulting in an empty stream # Expected to fail resulting in an empty stream
run_solo {violations} {
start_server [list overrides [list save ""] ] { start_server [list overrides [list save ""] ] {
test {XADD one huge field} { test {XADD one huge field} {
r config set proto-max-bulk-len 10000000000 ;#10gb r config set proto-max-bulk-len 10000000000 ;#10gb
...@@ -85,7 +86,7 @@ start_server [list overrides [list save ""] ] { ...@@ -85,7 +86,7 @@ start_server [list overrides [list save ""] ] {
r object encoding H1 r object encoding H1
} {hashtable} {large-memory} } {hashtable} {large-memory}
} }
} ;# run_solo
# SORT which stores an integer encoded element into a list. # SORT which stores an integer encoded element into a list.
# Just for coverage, no news here. # Just for coverage, no news here.
......
...@@ -175,6 +175,8 @@ class Argument(object): ...@@ -175,6 +175,8 @@ class Argument(object):
get_optional_desc_string(self.desc, "since"), get_optional_desc_string(self.desc, "since"),
_flags_code(), _flags_code(),
) )
if "deprecated_since" in self.desc:
s += ",.deprecated_since=\"%s\"" % self.desc["deprecated_since"]
if self.subargs: if self.subargs:
s += ",.subargs=%s" % self.subarg_table_name() s += ",.subargs=%s" % self.subarg_table_name()
......
#!/usr/bin/env ruby #!/usr/bin/env ruby -w
# Usage: generate-command-help.r [path/to/commands.json]
# or: generate-commands-json.py | generate-command-help.rb -
#
# Defaults to downloading commands.json from the redis-doc repo if not provided
# or STDINed.
GROUPS = [ GROUPS = [
"generic", "generic",
...@@ -66,16 +71,27 @@ def commands ...@@ -66,16 +71,27 @@ def commands
require "net/https" require "net/https"
require "json" require "json"
require "uri" require "uri"
if ARGV.length > 0
if ARGV[0] == '-'
data = STDIN.read
elsif FileTest.exist? ARGV[0]
data = File.read(ARGV[0])
else
raise Exception.new "File not found: #{ARGV[0]}"
end
else
url = URI.parse "https://raw.githubusercontent.com/redis/redis-doc/master/commands.json" url = URI.parse "https://raw.githubusercontent.com/redis/redis-doc/master/commands.json"
client = Net::HTTP.new url.host, url.port client = Net::HTTP.new url.host, url.port
client.use_ssl = true client.use_ssl = true
response = client.get url.path response = client.get url.path
if response.is_a?(Net::HTTPSuccess) if !response.is_a?(Net::HTTPSuccess)
@commands = JSON.parse(response.body)
else
response.error! response.error!
return
else
data = response.body
end
end end
@commands = JSON.parse(data)
end end
def generate_groups def generate_groups
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment