diff options
| author | guybe7 <guy.benoish@redislabs.com> | 2022-08-18 15:09:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-18 15:09:36 +0300 |
| commit | 223046ec9a25c1021f8d89a7edd1c4e4ff2c9ad9 (patch) | |
| tree | 9b426ce705ccdb166a46982cdd8d771f127a97e4 /src/commands | |
| parent | fc3956e8f4d35ea66967bb26f26175ad184f8978 (diff) | |
| download | redis-223046ec9a25c1021f8d89a7edd1c4e4ff2c9ad9.tar.gz | |
Repurpose redisCommandArg's name as the unique ID (#11051)
This PR makes sure that "name" is unique for all arguments in the same
level (i.e. all args of a command and all args within a block/oneof).
This means several argument with identical meaning can be referred to together,
but also if someone needs to refer to a specific one, they can use its full path.
In addition, the "display_text" field has been added, to be used by redis.io
in order to render the syntax of the command (for the vast majority it is
identical to "name" but sometimes we want to use a different string
that is not "name")
The "display" field is exposed via COMMAND DOCS and will be present
for every argument, except "oneof" and "block" (which are container
arguments)
Other changes:
1. Make sure we do not have any container arguments ("oneof" or "block")
that contain less than two sub-args (otherwise it doesn't make sense)
2. migrate.json: both AUTH and AUTH2 should not be "optional"
3. arg names cannot contain underscores, and force the usage of hyphens
(most of these were a result of the script that generated the initial json files
from redis.io commands.json).
Diffstat (limited to 'src/commands')
55 files changed, 130 insertions, 133 deletions
diff --git a/src/commands/bitcount.json b/src/commands/bitcount.json index c85260918..da34eec31 100644 --- a/src/commands/bitcount.json +++ b/src/commands/bitcount.json @@ -45,7 +45,7 @@ "key_spec_index": 0 }, { - "name": "index", + "name": "range", "type": "block", "optional": true, "arguments": [ @@ -58,7 +58,7 @@ "type": "integer" }, { - "name": "index_unit", + "name": "unit", "type": "oneof", "optional": true, "since": "7.0.0", diff --git a/src/commands/bitfield.json b/src/commands/bitfield.json index d1bec969e..ccee61fe6 100644 --- a/src/commands/bitfield.json +++ b/src/commands/bitfield.json @@ -50,7 +50,7 @@ "arguments": [ { "token": "GET", - "name": "encoding_offset", + "name": "get-block", "type": "block", "arguments": [ { @@ -69,7 +69,7 @@ "arguments": [ { "token": "OVERFLOW", - "name": "wrap_sat_fail", + "name": "overflow-block", "type": "oneof", "optional": true, "arguments": [ @@ -91,12 +91,12 @@ ] }, { - "name": "write_operation", + "name": "write-operation", "type": "oneof", "arguments": [ { "token": "SET", - "name": "encoding_offset_value", + "name": "set-block", "type": "block", "arguments": [ { @@ -115,7 +115,7 @@ }, { "token": "INCRBY", - "name": "encoding_offset_increment", + "name": "incrby-block", "type": "block", "arguments": [ { @@ -140,4 +140,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/src/commands/bitfield_ro.json b/src/commands/bitfield_ro.json index 99e3c9860..a6681c9e0 100644 --- a/src/commands/bitfield_ro.json +++ b/src/commands/bitfield_ro.json @@ -41,7 +41,7 @@ }, { "token": "GET", - "name": "encoding_offset", + "name": "get-block", "type": "block", "multiple": true, "multiple_token": true, diff --git a/src/commands/bitpos.json b/src/commands/bitpos.json index b8d2bf03b..24e357dcc 100644 --- a/src/commands/bitpos.json +++ b/src/commands/bitpos.json @@ -49,7 +49,7 @@ "type": "integer" }, { - "name": "index", + "name": "range", "type": "block", "optional": true, "arguments": [ @@ -58,7 +58,7 @@ "type": "integer" }, { - "name": "end_index", + "name": "end-unit-block", "type": "block", "optional": true, "arguments": [ @@ -67,7 +67,7 @@ "type": "integer" }, { - "name": "index_unit", + "name": "unit", "type": "oneof", "optional": true, "since": "7.0.0", diff --git a/src/commands/client-kill.json b/src/commands/client-kill.json index 6303c747f..155b811a1 100644 --- a/src/commands/client-kill.json +++ b/src/commands/client-kill.json @@ -45,7 +45,8 @@ "type": "oneof", "arguments": [ { - "name": "ip:port", + "name": "old-format", + "display": "ip:port", "type": "string", "deprecated_since": "2.8.12" }, @@ -63,7 +64,7 @@ }, { "token": "TYPE", - "name": "normal_master_slave_pubsub", + "name": "client-type", "type": "oneof", "optional": true, "since": "2.8.12", @@ -105,20 +106,23 @@ }, { "token": "ADDR", - "name": "ip:port", + "name": "addr", + "display": "ip:port", "type": "string", "optional": true }, { "token": "LADDR", - "name": "ip:port", + "name": "laddr", + "display": "ip:port", "type": "string", "optional": true, "since": "6.2.0" }, { "token": "SKIPME", - "name": "yes/no", + "name": "skipme", + "display": "yes/no", "type": "string", "optional": true } diff --git a/src/commands/client-list.json b/src/commands/client-list.json index 75605cfb1..6f1bb332f 100644 --- a/src/commands/client-list.json +++ b/src/commands/client-list.json @@ -37,7 +37,7 @@ "arguments": [ { "token": "TYPE", - "name": "normal_master_replica_pubsub", + "name": "client-type", "type": "oneof", "optional": true, "since": "5.0.0", @@ -65,18 +65,12 @@ ] }, { - "name": "id", + "name": "client-id", "token": "ID", - "type": "block", + "type": "integer", "optional": true, - "since": "6.2.0", - "arguments": [ - { - "name": "client-id", - "type": "integer", - "multiple": true - } - ] + "multiple": true, + "since": "6.2.0" } ] } diff --git a/src/commands/client-reply.json b/src/commands/client-reply.json index 25d2cef72..5aa919cca 100644 --- a/src/commands/client-reply.json +++ b/src/commands/client-reply.json @@ -18,7 +18,7 @@ ], "arguments": [ { - "name": "on_off_skip", + "name": "action", "type": "oneof", "arguments": [ { diff --git a/src/commands/client-unblock.json b/src/commands/client-unblock.json index 75bdddc29..4b37d2fbd 100644 --- a/src/commands/client-unblock.json +++ b/src/commands/client-unblock.json @@ -23,7 +23,7 @@ "type": "integer" }, { - "name": "timeout_error", + "name": "unblock-type", "type": "oneof", "optional": true, "arguments": [ diff --git a/src/commands/cluster-addslotsrange.json b/src/commands/cluster-addslotsrange.json index ee58776d3..3527f40cb 100644 --- a/src/commands/cluster-addslotsrange.json +++ b/src/commands/cluster-addslotsrange.json @@ -17,7 +17,7 @@ ], "arguments": [ { - "name": "start-slot_end-slot", + "name": "range", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/cluster-delslotsrange.json b/src/commands/cluster-delslotsrange.json index d13bf0ab8..116d4ff1c 100644 --- a/src/commands/cluster-delslotsrange.json +++ b/src/commands/cluster-delslotsrange.json @@ -17,7 +17,7 @@ ], "arguments": [ { - "name": "start-slot_end-slot", + "name": "range", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/cluster-meet.json b/src/commands/cluster-meet.json index 9a85be76d..c8d55f4e6 100644 --- a/src/commands/cluster-meet.json +++ b/src/commands/cluster-meet.json @@ -31,7 +31,7 @@ "type": "integer" }, { - "name": "cluster_bus_port", + "name": "cluster-bus-port", "type": "integer", "optional": true, "since": "4.0.0" diff --git a/src/commands/cluster-reset.json b/src/commands/cluster-reset.json index 630f458e7..b11607a0e 100644 --- a/src/commands/cluster-reset.json +++ b/src/commands/cluster-reset.json @@ -17,7 +17,7 @@ ], "arguments": [ { - "name": "hard_soft", + "name": "reset-type", "type": "oneof", "optional": true, "arguments": [ diff --git a/src/commands/cluster-setslot.json b/src/commands/cluster-setslot.json index 5d1aa45fc..6bdcae90c 100644 --- a/src/commands/cluster-setslot.json +++ b/src/commands/cluster-setslot.json @@ -25,17 +25,20 @@ "type": "oneof", "arguments": [ { - "name": "node-id", + "name": "importing", + "display": "node-id", "type": "string", "token": "IMPORTING" }, { - "name": "node-id", + "name": "migrating", + "display": "node-id", "type": "string", "token": "MIGRATING" }, { - "name": "node-id", + "name": "node", + "display": "node-id", "type": "string", "token": "NODE" }, diff --git a/src/commands/config-get.json b/src/commands/config-get.json index 26c060941..1ea387686 100644 --- a/src/commands/config-get.json +++ b/src/commands/config-get.json @@ -22,14 +22,8 @@ "arguments": [ { "name": "parameter", - "type": "block", - "multiple": true, - "arguments": [ - { - "name": "parameter", - "type": "string" - } - ] + "type": "string", + "multiple": true } ] } diff --git a/src/commands/config-set.json b/src/commands/config-set.json index 656e4bca3..3a337f5c6 100644 --- a/src/commands/config-set.json +++ b/src/commands/config-set.json @@ -25,7 +25,7 @@ ], "arguments": [ { - "name": "parameter_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/flushall.json b/src/commands/flushall.json index ef6a1f883..4add012ba 100644 --- a/src/commands/flushall.json +++ b/src/commands/flushall.json @@ -29,7 +29,7 @@ ], "arguments": [ { - "name": "async", + "name": "flush-type", "type": "oneof", "optional": true, "arguments": [ diff --git a/src/commands/flushdb.json b/src/commands/flushdb.json index 408ab326b..858939f07 100644 --- a/src/commands/flushdb.json +++ b/src/commands/flushdb.json @@ -29,7 +29,7 @@ ], "arguments": [ { - "name": "async", + "name": "flush-type", "type": "oneof", "optional": true, "arguments": [ diff --git a/src/commands/function-flush.json b/src/commands/function-flush.json index a5ab2db75..a2ab58e4f 100644 --- a/src/commands/function-flush.json +++ b/src/commands/function-flush.json @@ -20,7 +20,7 @@ ], "arguments": [ { - "name": "async", + "name": "flush-type", "type": "oneof", "optional": true, "arguments": [ diff --git a/src/commands/geoadd.json b/src/commands/geoadd.json index acdc575e4..d33836cf4 100644 --- a/src/commands/geoadd.json +++ b/src/commands/geoadd.json @@ -71,7 +71,7 @@ "since": "6.2.0" }, { - "name": "longitude_latitude_member", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/georadius.json b/src/commands/georadius.json index ba58db562..606ed43ed 100644 --- a/src/commands/georadius.json +++ b/src/commands/georadius.json @@ -146,7 +146,7 @@ "optional": true }, { - "name": "count", + "name": "count-block", "type": "block", "optional": true, "arguments": [ @@ -183,14 +183,16 @@ }, { "token": "STORE", - "name": "key", + "name": "storekey", + "display": "key", "type": "key", "key_spec_index": 1, "optional": true }, { "token": "STOREDIST", - "name": "key", + "name": "storedistkey", + "display": "key", "type": "key", "key_spec_index": 2, "optional": true diff --git a/src/commands/georadius_ro.json b/src/commands/georadius_ro.json index 9859d3067..4696f78b8 100644 --- a/src/commands/georadius_ro.json +++ b/src/commands/georadius_ro.json @@ -106,7 +106,7 @@ "optional": true }, { - "name": "count", + "name": "count-block", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/georadiusbymember.json b/src/commands/georadiusbymember.json index c7a399fc3..fbc7ea4ee 100644 --- a/src/commands/georadiusbymember.json +++ b/src/commands/georadiusbymember.json @@ -136,7 +136,7 @@ "optional": true }, { - "name": "count", + "name": "count-block", "type": "block", "optional": true, "arguments": [ @@ -172,14 +172,16 @@ }, { "token": "STORE", - "name": "key", + "name": "storekey", + "display": "key", "type": "key", "key_spec_index": 1, "optional": true }, { "token": "STOREDIST", - "name": "key", + "name": "storedistkey", + "display": "key", "type": "key", "key_spec_index": 2, "optional": true diff --git a/src/commands/georadiusbymember_ro.json b/src/commands/georadiusbymember_ro.json index 2a7683897..062a72ab2 100644 --- a/src/commands/georadiusbymember_ro.json +++ b/src/commands/georadiusbymember_ro.json @@ -96,7 +96,7 @@ "optional": true }, { - "name": "count", + "name": "count-block", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/geosearch.json b/src/commands/geosearch.json index a83dcaadb..e69094df4 100644 --- a/src/commands/geosearch.json +++ b/src/commands/geosearch.json @@ -49,7 +49,7 @@ }, { "token": "FROMLONLAT", - "name": "longitude_latitude", + "name": "fromlonlat", "type": "block", "arguments": [ { @@ -166,7 +166,7 @@ ] }, { - "name": "count", + "name": "count-block", "type": "block", "optional": true, "arguments": [ @@ -203,4 +203,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/src/commands/geosearchstore.json b/src/commands/geosearchstore.json index 16db5d37e..1be5cd409 100644 --- a/src/commands/geosearchstore.json +++ b/src/commands/geosearchstore.json @@ -73,7 +73,7 @@ }, { "token": "FROMLONLAT", - "name": "longitude_latitude", + "name": "fromlonlat", "type": "block", "arguments": [ { @@ -190,7 +190,7 @@ ] }, { - "name": "count", + "name": "count-block", "type": "block", "optional": true, "arguments": [ @@ -215,4 +215,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/src/commands/hello.json b/src/commands/hello.json index 8e80a81cf..675edff5b 100644 --- a/src/commands/hello.json +++ b/src/commands/hello.json @@ -36,7 +36,7 @@ }, { "token": "AUTH", - "name": "username_password", + "name": "auth", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/hmset.json b/src/commands/hmset.json index 2e962d946..1fda1b2b4 100644 --- a/src/commands/hmset.json +++ b/src/commands/hmset.json @@ -46,7 +46,7 @@ "key_spec_index": 0 }, { - "name": "field_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/hset.json b/src/commands/hset.json index ee5efa78b..1b665c369 100644 --- a/src/commands/hset.json +++ b/src/commands/hset.json @@ -47,7 +47,7 @@ "key_spec_index": 0 }, { - "name": "field_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/lcs.json b/src/commands/lcs.json index 193e6a877..8d53e425e 100644 --- a/src/commands/lcs.json +++ b/src/commands/lcs.json @@ -57,7 +57,7 @@ }, { "token": "MINMATCHLEN", - "name": "len", + "name": "min-match-len", "type": "integer", "optional": true }, diff --git a/src/commands/migrate.json b/src/commands/migrate.json index b9a52aa69..64bf78bba 100644 --- a/src/commands/migrate.json +++ b/src/commands/migrate.json @@ -87,7 +87,7 @@ "type": "integer" }, { - "name": "key_or_empty_string", + "name": "key-selector", "type": "oneof", "arguments": [ { @@ -96,7 +96,7 @@ "key_spec_index": 0 }, { - "name": "empty_string", + "name": "empty-string", "type": "pure-token", "token": "\"\"" } @@ -131,16 +131,15 @@ "arguments": [ { "token": "AUTH", - "name": "password", + "name": "auth", + "display": "password", "type": "string", - "optional": true, "since": "4.0.7" }, { "token": "AUTH2", - "name": "username_password", + "name": "auth2", "type": "block", - "optional": true, "since": "6.0.0", "arguments": [ { @@ -157,7 +156,8 @@ }, { "token": "KEYS", - "name": "key", + "name": "keys", + "display": "key", "type": "key", "key_spec_index": 1, "optional": true, @@ -166,4 +166,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/src/commands/module-loadex.json b/src/commands/module-loadex.json index 97e8f2b58..9419aa010 100644 --- a/src/commands/module-loadex.json +++ b/src/commands/module-loadex.json @@ -39,16 +39,10 @@ { "name": "args", "token": "ARGS", - "type": "block", + "type": "string", "multiple": true, - "optional": true, - "arguments": [ - { - "name": "arg", - "type": "string" - } - ] + "optional": true } ] } -}
\ No newline at end of file +} diff --git a/src/commands/mset.json b/src/commands/mset.json index 09b9d6d26..ebf3c5216 100644 --- a/src/commands/mset.json +++ b/src/commands/mset.json @@ -39,7 +39,7 @@ ], "arguments": [ { - "name": "key_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/msetnx.json b/src/commands/msetnx.json index 544ac6450..84ec00063 100644 --- a/src/commands/msetnx.json +++ b/src/commands/msetnx.json @@ -39,7 +39,7 @@ ], "arguments": [ { - "name": "key_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/psubscribe.json b/src/commands/psubscribe.json index 707fdf45c..8a1e66e08 100644 --- a/src/commands/psubscribe.json +++ b/src/commands/psubscribe.json @@ -16,14 +16,8 @@ "arguments": [ { "name": "pattern", - "type": "block", - "multiple": true, - "arguments": [ - { - "name": "pattern", - "type": "pattern" - } - ] + "type": "pattern", + "multiple": true } ] } diff --git a/src/commands/script-flush.json b/src/commands/script-flush.json index b246bdef5..f4d340833 100644 --- a/src/commands/script-flush.json +++ b/src/commands/script-flush.json @@ -25,7 +25,7 @@ ], "arguments": [ { - "name": "async", + "name": "flush-type", "type": "oneof", "optional": true, "since": "6.2.0", diff --git a/src/commands/sentinel-config.json b/src/commands/sentinel-config.json index 74bcdbd50..3c1898d5a 100644 --- a/src/commands/sentinel-config.json +++ b/src/commands/sentinel-config.json @@ -14,11 +14,11 @@ ], "arguments": [ { - "name":"set_or_get", + "name":"action", "type":"oneof", "arguments":[ { - "name":"set_param_value", + "name":"set", "token":"SET", "type":"block", "multiple":true, @@ -36,7 +36,8 @@ { "token":"GET", "multiple":true, - "name":"parameter", + "name":"get", + "display":"parameter", "type":"string" } ] diff --git a/src/commands/sentinel-debug.json b/src/commands/sentinel-debug.json index b3335409d..8328c45b8 100644 --- a/src/commands/sentinel-debug.json +++ b/src/commands/sentinel-debug.json @@ -14,7 +14,7 @@ ], "arguments": [ { - "name": "parameter_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/sentinel-set.json b/src/commands/sentinel-set.json index afe036065..49feefced 100644 --- a/src/commands/sentinel-set.json +++ b/src/commands/sentinel-set.json @@ -18,7 +18,7 @@ "type": "string" }, { - "name": "option_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/shutdown.json b/src/commands/shutdown.json index 63da3ca03..001cc2552 100644 --- a/src/commands/shutdown.json +++ b/src/commands/shutdown.json @@ -23,7 +23,7 @@ ], "arguments": [ { - "name": "nosave_save", + "name": "save-selector", "type": "oneof", "optional": true, "arguments": [ diff --git a/src/commands/sort.json b/src/commands/sort.json index 3f077e0e5..1c332461b 100644 --- a/src/commands/sort.json +++ b/src/commands/sort.json @@ -71,14 +71,15 @@ }, { "token": "BY", - "name": "pattern", + "name": "by-pattern", + "display": "pattern", "type": "pattern", "key_spec_index": 1, "optional": true }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ @@ -94,7 +95,8 @@ }, { "token": "GET", - "name": "pattern", + "name": "get-pattern", + "display": "pattern", "key_spec_index": 1, "type": "pattern", "optional": true, diff --git a/src/commands/sort_ro.json b/src/commands/sort_ro.json index 83b48d1b3..0b00ba8ad 100644 --- a/src/commands/sort_ro.json +++ b/src/commands/sort_ro.json @@ -57,14 +57,15 @@ }, { "token": "BY", - "name": "pattern", + "name": "by-pattern", + "display": "pattern", "type": "pattern", "key_spec_index": 1, "optional": true }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ @@ -80,7 +81,8 @@ }, { "token": "GET", - "name": "pattern", + "name": "get-pattern", + "display": "pattern", "key_spec_index": 1, "type": "pattern", "optional": true, diff --git a/src/commands/xadd.json b/src/commands/xadd.json index e8914ebb3..f3d99f841 100644 --- a/src/commands/xadd.json +++ b/src/commands/xadd.json @@ -114,22 +114,22 @@ ] }, { - "name": "id_or_auto", + "name": "id-selector", "type": "oneof", "arguments": [ { - "name": "auto_id", + "name": "auto-id", "type": "pure-token", "token": "*" }, { - "name": "ID", + "name": "id", "type": "string" } ] }, { - "name": "field_value", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/xclaim.json b/src/commands/xclaim.json index 045610900..132a60c2e 100644 --- a/src/commands/xclaim.json +++ b/src/commands/xclaim.json @@ -90,7 +90,7 @@ "optional": true }, { - "name": "id", + "name": "lastid", "token": "LASTID", "type": "string", "optional": true diff --git a/src/commands/xgroup-create.json b/src/commands/xgroup-create.json index 2b1ee03b4..54aceb8f5 100644 --- a/src/commands/xgroup-create.json +++ b/src/commands/xgroup-create.json @@ -51,15 +51,15 @@ "type": "string" }, { - "name": "id", + "name": "id-selector", "type": "oneof", "arguments": [ { - "name": "ID", + "name": "id", "type": "string" }, { - "name": "new_id", + "name": "new-id", "type": "pure-token", "token": "$" } @@ -73,7 +73,7 @@ }, { "token": "ENTRIESREAD", - "name": "entries_read", + "name": "entries-read", "type": "integer", "optional": true } diff --git a/src/commands/xgroup-setid.json b/src/commands/xgroup-setid.json index af4b83c19..a065f75fd 100644 --- a/src/commands/xgroup-setid.json +++ b/src/commands/xgroup-setid.json @@ -50,22 +50,23 @@ "type": "string" }, { - "name": "id", + "name": "id-selector", "type": "oneof", "arguments": [ { - "name": "ID", + "name": "id", "type": "string" }, { - "name": "new_id", + "name": "new-id", "type": "pure-token", "token": "$" } ] }, { - "name": "entries_read", + "name": "entriesread", + "display": "entries-read", "token": "ENTRIESREAD", "type": "integer", "optional": true diff --git a/src/commands/xinfo-stream.json b/src/commands/xinfo-stream.json index 36c427fbe..233afdde3 100644 --- a/src/commands/xinfo-stream.json +++ b/src/commands/xinfo-stream.json @@ -50,12 +50,16 @@ "key_spec_index": 0 }, { - "name": "full", - "token": "FULL", + "name": "full-block", "type": "block", "optional": true, "arguments": [ { + "name": "full", + "token": "FULL", + "type": "pure-token" + }, + { "token": "COUNT", "name": "count", "type": "integer", diff --git a/src/commands/xreadgroup.json b/src/commands/xreadgroup.json index a14814755..e160f3d00 100644 --- a/src/commands/xreadgroup.json +++ b/src/commands/xreadgroup.json @@ -38,7 +38,7 @@ "arguments": [ { "token": "GROUP", - "name": "group_consumer", + "name": "group-block", "type": "block", "arguments": [ { diff --git a/src/commands/xsetid.json b/src/commands/xsetid.json index 7654784e1..5fbc1c6f3 100644 --- a/src/commands/xsetid.json +++ b/src/commands/xsetid.json @@ -51,13 +51,13 @@ "type": "string" }, { - "name": "entries_added", + "name": "entries-added", "token": "ENTRIESADDED", "type": "integer", "optional": true }, { - "name": "max_deleted_entry_id", + "name": "max-deleted-id", "token": "MAXDELETEDID", "type": "string", "optional": true diff --git a/src/commands/zadd.json b/src/commands/zadd.json index 300db1180..43791deb4 100644 --- a/src/commands/zadd.json +++ b/src/commands/zadd.json @@ -105,7 +105,7 @@ "since": "3.0.2" }, { - "name": "score_member", + "name": "data", "type": "block", "multiple": true, "arguments": [ diff --git a/src/commands/zrange.json b/src/commands/zrange.json index 63fb01a09..628be8bfe 100644 --- a/src/commands/zrange.json +++ b/src/commands/zrange.json @@ -79,7 +79,7 @@ }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "since": "6.2.0", diff --git a/src/commands/zrangebylex.json b/src/commands/zrangebylex.json index 75e82bce6..1f2c755c9 100644 --- a/src/commands/zrangebylex.json +++ b/src/commands/zrangebylex.json @@ -53,7 +53,7 @@ }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/zrangebyscore.json b/src/commands/zrangebyscore.json index d0678776e..44650d32f 100644 --- a/src/commands/zrangebyscore.json +++ b/src/commands/zrangebyscore.json @@ -66,7 +66,7 @@ }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/zrangestore.json b/src/commands/zrangestore.json index 25d9dd76e..2e4c85583 100644 --- a/src/commands/zrangestore.json +++ b/src/commands/zrangestore.json @@ -95,7 +95,7 @@ }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/zrevrangebylex.json b/src/commands/zrevrangebylex.json index 34faa93ae..07bad6178 100644 --- a/src/commands/zrevrangebylex.json +++ b/src/commands/zrevrangebylex.json @@ -53,7 +53,7 @@ }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ diff --git a/src/commands/zrevrangebyscore.json b/src/commands/zrevrangebyscore.json index 9a0152cfe..9e0bab096 100644 --- a/src/commands/zrevrangebyscore.json +++ b/src/commands/zrevrangebyscore.json @@ -65,7 +65,7 @@ }, { "token": "LIMIT", - "name": "offset_count", + "name": "limit", "type": "block", "optional": true, "arguments": [ |