summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBinbin <binloveplay1314@qq.com>2022-01-30 14:45:12 +0800
committerGitHub <noreply@github.com>2022-01-30 08:45:12 +0200
commit21135471a6bb25c4c895c26ae1afddad53e83f29 (patch)
tree6a948fac664370db9d10dc05d10eb7ebd3a5d995
parent79f089bdd92348d5fa3965258f539752f2eb8e78 (diff)
downloadredis-21135471a6bb25c4c895c26ae1afddad53e83f29.tar.gz
Fix some wrong commands arguments since (#10208)
ZADD NX and XX was introduced in 3.0.2, not 6.2.0 ZADD GT and LT was introduced in 6.2.0, not 3.0.2 Add missing `COUNT ANY` history in georadius_ro Add missing `SHUTDOWN [NOW] [FORCE] [ABORT]` since in shutdown.json
-rw-r--r--src/commands.c20
-rw-r--r--src/commands/georadius_ro.json9
-rw-r--r--src/commands/shutdown.json15
-rw-r--r--src/commands/zadd.json4
4 files changed, 31 insertions, 17 deletions
diff --git a/src/commands.c b/src/commands.c
index 976c75494..439f289a1 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -2023,7 +2023,10 @@ struct redisCommandArg GEORADIUSBYMEMBER_RO_Args[] = {
/********** GEORADIUS_RO ********************/
/* GEORADIUS_RO history */
-#define GEORADIUS_RO_History NULL
+commandHistory GEORADIUS_RO_History[] = {
+{"6.2.0","Added the `ANY` option for `COUNT`."},
+{0}
+};
/* GEORADIUS_RO tips */
#define GEORADIUS_RO_tips NULL
@@ -2040,7 +2043,7 @@ struct redisCommandArg GEORADIUS_RO_unit_Subargs[] = {
/* GEORADIUS_RO count argument table */
struct redisCommandArg GEORADIUS_RO_count_Subargs[] = {
{"count",ARG_TYPE_INTEGER,-1,"COUNT",NULL,NULL,CMD_ARG_NONE},
-{"any",ARG_TYPE_PURE_TOKEN,-1,"ANY",NULL,NULL,CMD_ARG_OPTIONAL},
+{"any",ARG_TYPE_PURE_TOKEN,-1,"ANY",NULL,"6.2.0",CMD_ARG_OPTIONAL},
{0}
};
@@ -3847,6 +3850,7 @@ struct redisCommandArg ACL_GENPASS_Args[] = {
/* ACL GETUSER history */
commandHistory ACL_GETUSER_History[] = {
{"6.2.0","Added Pub/Sub channel patterns."},
+{"7.0.0","Added selectors and changed the format of key and channel patterns from a list to their rule representation."},
{0}
};
@@ -4660,7 +4664,7 @@ struct redisCommandArg REPLICAOF_Args[] = {
/* SHUTDOWN history */
commandHistory SHUTDOWN_History[] = {
-{"7.0","Added the `NOW`, `FORCE` and `ABORT` modifiers. Introduced waiting for lagging replicas before exiting."},
+{"7.0.0","Added the `NOW`, `FORCE` and `ABORT` modifiers. Introduced waiting for lagging replicas before exiting."},
{0}
};
@@ -4677,9 +4681,9 @@ struct redisCommandArg SHUTDOWN_nosave_save_Subargs[] = {
/* SHUTDOWN argument table */
struct redisCommandArg SHUTDOWN_Args[] = {
{"nosave_save",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_OPTIONAL,.subargs=SHUTDOWN_nosave_save_Subargs},
-{"now",ARG_TYPE_PURE_TOKEN,-1,"NOW",NULL,NULL,CMD_ARG_OPTIONAL},
-{"force",ARG_TYPE_PURE_TOKEN,-1,"FORCE",NULL,NULL,CMD_ARG_OPTIONAL},
-{"abort",ARG_TYPE_PURE_TOKEN,-1,"ABORT",NULL,NULL,CMD_ARG_OPTIONAL},
+{"now",ARG_TYPE_PURE_TOKEN,-1,"NOW",NULL,"7.0.0",CMD_ARG_OPTIONAL},
+{"force",ARG_TYPE_PURE_TOKEN,-1,"FORCE",NULL,"7.0.0",CMD_ARG_OPTIONAL},
+{"abort",ARG_TYPE_PURE_TOKEN,-1,"ABORT",NULL,"7.0.0",CMD_ARG_OPTIONAL},
{0}
};
@@ -5188,8 +5192,8 @@ struct redisCommandArg ZADD_score_member_Subargs[] = {
/* ZADD argument table */
struct redisCommandArg ZADD_Args[] = {
{"key",ARG_TYPE_KEY,0,NULL,NULL,NULL,CMD_ARG_NONE},
-{"condition",ARG_TYPE_ONEOF,-1,NULL,NULL,"6.2.0",CMD_ARG_OPTIONAL,.subargs=ZADD_condition_Subargs},
-{"comparison",ARG_TYPE_ONEOF,-1,NULL,NULL,"3.0.2",CMD_ARG_OPTIONAL,.subargs=ZADD_comparison_Subargs},
+{"condition",ARG_TYPE_ONEOF,-1,NULL,NULL,"3.0.2",CMD_ARG_OPTIONAL,.subargs=ZADD_condition_Subargs},
+{"comparison",ARG_TYPE_ONEOF,-1,NULL,NULL,"6.2.0",CMD_ARG_OPTIONAL,.subargs=ZADD_comparison_Subargs},
{"change",ARG_TYPE_PURE_TOKEN,-1,"CH",NULL,"3.0.2",CMD_ARG_OPTIONAL},
{"increment",ARG_TYPE_PURE_TOKEN,-1,"INCR",NULL,"3.0.2",CMD_ARG_OPTIONAL},
{"score_member",ARG_TYPE_BLOCK,-1,NULL,NULL,NULL,CMD_ARG_MULTIPLE,.subargs=ZADD_score_member_Subargs},
diff --git a/src/commands/georadius_ro.json b/src/commands/georadius_ro.json
index 6bf7da237..9859d3067 100644
--- a/src/commands/georadius_ro.json
+++ b/src/commands/georadius_ro.json
@@ -6,6 +6,12 @@
"since": "3.2.10",
"arity": -6,
"function": "georadiusroCommand",
+ "history": [
+ [
+ "6.2.0",
+ "Added the `ANY` option for `COUNT`."
+ ]
+ ],
"deprecated_since": "6.2.0",
"replaced_by": "`GEOSEARCH` with the `BYRADIUS` argument",
"doc_flags": [
@@ -113,7 +119,8 @@
"name": "any",
"token": "ANY",
"type": "pure-token",
- "optional": true
+ "optional": true,
+ "since": "6.2.0"
}
]
},
diff --git a/src/commands/shutdown.json b/src/commands/shutdown.json
index 94b2cf588..605cc2b16 100644
--- a/src/commands/shutdown.json
+++ b/src/commands/shutdown.json
@@ -8,7 +8,7 @@
"function": "shutdownCommand",
"history": [
[
- "7.0",
+ "7.0.0",
"Added the `NOW`, `FORCE` and `ABORT` modifiers. Introduced waiting for lagging replicas before exiting."
]
],
@@ -17,9 +17,9 @@
"NOSCRIPT",
"LOADING",
"STALE",
- "NO_MULTI",
+ "NO_MULTI",
"SENTINEL",
- "ALLOW_BUSY"
+ "ALLOW_BUSY"
],
"arguments": [
{
@@ -43,19 +43,22 @@
"name": "now",
"type": "pure-token",
"token": "NOW",
- "optional": true
+ "optional": true,
+ "since": "7.0.0"
},
{
"name": "force",
"type": "pure-token",
"token": "FORCE",
- "optional": true
+ "optional": true,
+ "since": "7.0.0"
},
{
"name": "abort",
"type": "pure-token",
"token": "ABORT",
- "optional": true
+ "optional": true,
+ "since": "7.0.0"
}
]
}
diff --git a/src/commands/zadd.json b/src/commands/zadd.json
index 53c4a46fd..300db1180 100644
--- a/src/commands/zadd.json
+++ b/src/commands/zadd.json
@@ -58,7 +58,7 @@
"name": "condition",
"type": "oneof",
"optional": true,
- "since": "6.2.0",
+ "since": "3.0.2",
"arguments": [
{
"name": "nx",
@@ -76,7 +76,7 @@
"name": "comparison",
"type": "oneof",
"optional": true,
- "since": "3.0.2",
+ "since": "6.2.0",
"arguments": [
{
"name": "gt",