Added keyinfo specs

Signed-off-by: otheng03 <[email protected]>

Author: otheng03

src/commands.def

@@ -6823,141 +6823,6 @@ struct COMMAND_STRUCT COMMANDLOG_Subcommands[] = {
 #define COMMANDLOG_Keyspecs NULL
 #endif
 
-/********** KEYINFO GET ********************/
-
-#ifndef SKIP_CMD_HISTORY_TABLE
-/* KEYINFO GET history */
-#define KEYINFO_GET_History NULL
-#endif
-
-#ifndef SKIP_CMD_TIPS_TABLE
-/* KEYINFO GET tips */
-const char *KEYINFO_GET_Tips[] = {
-        "request_policy:all_nodes",
-        "nondeterministic_output",
-};
-#endif
-
-#ifndef SKIP_CMD_KEY_SPECS_TABLE
-/* KEYINFO GET key specs */
-#define KEYINFO_GET_Keyspecs NULL
-#endif
-
-/* KEYINFO GET type argument table */
-struct COMMAND_ARG KEYINFO_GET_type_Subargs[] = {
-        {MAKE_ARG("many-elements",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-};
-
-/* KEYINFO GET argument table */
-struct COMMAND_ARG KEYINFO_GET_Args[] = {
-        {MAKE_ARG("count",ARG_TYPE_INTEGER,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-        {MAKE_ARG("type",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,1,NULL),.subargs=KEYINFO_GET_type_Subargs},
-};
-
-/********** KEYINFO HELP ********************/
-
-#ifndef SKIP_CMD_HISTORY_TABLE
-/* KEYINFO HELP history */
-#define KEYINFO_HELP_History NULL
-#endif
-
-#ifndef SKIP_CMD_TIPS_TABLE
-/* KEYINFO HELP tips */
-#define KEYINFO_HELP_Tips NULL
-#endif
-
-#ifndef SKIP_CMD_KEY_SPECS_TABLE
-/* KEYINFO HELP key specs */
-#define KEYINFO_HELP_Keyspecs NULL
-#endif
-
-/********** KEYINFO LEN ********************/
-
-#ifndef SKIP_CMD_HISTORY_TABLE
-/* KEYINFO LEN history */
-#define KEYINFO_LEN_History NULL
-#endif
-
-#ifndef SKIP_CMD_TIPS_TABLE
-/* KEYINFO LEN tips */
-const char *KEYINFO_LEN_Tips[] = {
-        "request_policy:all_nodes",
-        "response_policy:agg_sum",
-        "nondeterministic_output",
-};
-#endif
-
-#ifndef SKIP_CMD_KEY_SPECS_TABLE
-/* KEYINFO LEN key specs */
-#define KEYINFO_LEN_Keyspecs NULL
-#endif
-
-/* KEYINFO LEN type argument table */
-struct COMMAND_ARG KEYINFO_LEN_type_Subargs[] = {
-        {MAKE_ARG("many-elements",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-};
-
-/* KEYINFO LEN argument table */
-struct COMMAND_ARG KEYINFO_LEN_Args[] = {
-        {MAKE_ARG("type",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,1,NULL),.subargs=KEYINFO_LEN_type_Subargs},
-};
-
-/********** KEYINFO RESET ********************/
-
-#ifndef SKIP_CMD_HISTORY_TABLE
-/* KEYINFO RESET history */
-#define KEYINFO_RESET_History NULL
-#endif
-
-#ifndef SKIP_CMD_TIPS_TABLE
-/* KEYINFO RESET tips */
-const char *KEYINFO_RESET_Tips[] = {
-        "request_policy:all_nodes",
-        "response_policy:all_succeeded",
-};
-#endif
-
-#ifndef SKIP_CMD_KEY_SPECS_TABLE
-/* KEYINFO RESET key specs */
-#define KEYINFO_RESET_Keyspecs NULL
-#endif
-
-/* KEYINFO RESET type argument table */
-struct COMMAND_ARG KEYINFO_RESET_type_Subargs[] = {
-        {MAKE_ARG("many-elements",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-};
-
-/* KEYINFO RESET argument table */
-struct COMMAND_ARG KEYINFO_RESET_Args[] = {
-        {MAKE_ARG("type",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,1,NULL),.subargs=KEYINFO_RESET_type_Subargs},
-};
-
-/* KEYINFO command table */
-struct COMMAND_STRUCT KEYINFO_Subcommands[] = {
-        {MAKE_CMD("get","Returns the specified keyinfo entries.","O(N) where N is the number of entries returned","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_GET_History,0,KEYINFO_GET_Tips,2,keyinfoCommand,4,CMD_ADMIN|CMD_LOADING|CMD_STALE,0,KEYINFO_GET_Keyspecs,0,NULL,2),.args=KEYINFO_GET_Args},
-        {MAKE_CMD("help","Show helpful text about the different subcommands","O(1)","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_HELP_History,0,KEYINFO_HELP_Tips,0,keyinfoCommand,2,CMD_LOADING|CMD_STALE,0,KEYINFO_HELP_Keyspecs,0,NULL,0)},
-        {MAKE_CMD("len","Returns the number of entries in the specified type of keyinfo.","O(1)","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_LEN_History,0,KEYINFO_LEN_Tips,3,keyinfoCommand,3,CMD_ADMIN|CMD_LOADING|CMD_STALE,0,KEYINFO_LEN_Keyspecs,0,NULL,1),.args=KEYINFO_LEN_Args},
-        {MAKE_CMD("reset","Clears all entries from the specified type of keyinfo.","O(N) where N is the number of entries in the KEYINFO","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_RESET_History,0,KEYINFO_RESET_Tips,2,keyinfoCommand,3,CMD_ADMIN|CMD_LOADING|CMD_STALE,0,KEYINFO_RESET_Keyspecs,0,NULL,1),.args=KEYINFO_RESET_Args},
-        {0}
-};
-
-/********** KEYINFO ********************/
-
-#ifndef SKIP_CMD_HISTORY_TABLE
-/* KEYINFO history */
-#define KEYINFO_History NULL
-#endif
-
-#ifndef SKIP_CMD_TIPS_TABLE
-/* KEYINFO tips */
-#define KEYINFO_Tips NULL
-#endif
-
-#ifndef SKIP_CMD_KEY_SPECS_TABLE
-/* KEYINFO key specs */
-#define KEYINFO_Keyspecs NULL
-#endif
-
 /********** CONFIG GET ********************/
 
 #ifndef SKIP_CMD_HISTORY_TABLE
@@ -7263,6 +7128,144 @@ struct COMMAND_ARG INFO_Args[] = {
 {MAKE_ARG("section",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_OPTIONAL|CMD_ARG_MULTIPLE,0,NULL)},
 };
 
+/********** KEYINFO GET ********************/
+
+#ifndef SKIP_CMD_HISTORY_TABLE
+/* KEYINFO GET history */
+#define KEYINFO_GET_History NULL
+#endif
+
+#ifndef SKIP_CMD_TIPS_TABLE
+/* KEYINFO GET tips */
+const char *KEYINFO_GET_Tips[] = {
+"request_policy:all_nodes",
+"nondeterministic_output",
+};
+#endif
+
+#ifndef SKIP_CMD_KEY_SPECS_TABLE
+/* KEYINFO GET key specs */
+#define KEYINFO_GET_Keyspecs NULL
+#endif
+
+/* KEYINFO GET type argument table */
+struct COMMAND_ARG KEYINFO_GET_type_Subargs[] = {
+{MAKE_ARG("many-elements",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+{MAKE_ARG("large-memory",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+};
+
+/* KEYINFO GET argument table */
+struct COMMAND_ARG KEYINFO_GET_Args[] = {
+{MAKE_ARG("count",ARG_TYPE_INTEGER,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+{MAKE_ARG("type",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,2,NULL),.subargs=KEYINFO_GET_type_Subargs},
+};
+
+/********** KEYINFO HELP ********************/
+
+#ifndef SKIP_CMD_HISTORY_TABLE
+/* KEYINFO HELP history */
+#define KEYINFO_HELP_History NULL
+#endif
+
+#ifndef SKIP_CMD_TIPS_TABLE
+/* KEYINFO HELP tips */
+#define KEYINFO_HELP_Tips NULL
+#endif
+
+#ifndef SKIP_CMD_KEY_SPECS_TABLE
+/* KEYINFO HELP key specs */
+#define KEYINFO_HELP_Keyspecs NULL
+#endif
+
+/********** KEYINFO LEN ********************/
+
+#ifndef SKIP_CMD_HISTORY_TABLE
+/* KEYINFO LEN history */
+#define KEYINFO_LEN_History NULL
+#endif
+
+#ifndef SKIP_CMD_TIPS_TABLE
+/* KEYINFO LEN tips */
+const char *KEYINFO_LEN_Tips[] = {
+"request_policy:all_nodes",
+"response_policy:agg_sum",
+"nondeterministic_output",
+};
+#endif
+
+#ifndef SKIP_CMD_KEY_SPECS_TABLE
+/* KEYINFO LEN key specs */
+#define KEYINFO_LEN_Keyspecs NULL
+#endif
+
+/* KEYINFO LEN type argument table */
+struct COMMAND_ARG KEYINFO_LEN_type_Subargs[] = {
+{MAKE_ARG("many-elements",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+{MAKE_ARG("large-memory",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+};
+
+/* KEYINFO LEN argument table */
+struct COMMAND_ARG KEYINFO_LEN_Args[] = {
+{MAKE_ARG("type",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,2,NULL),.subargs=KEYINFO_LEN_type_Subargs},
+};
+
+/********** KEYINFO RESET ********************/
+
+#ifndef SKIP_CMD_HISTORY_TABLE
+/* KEYINFO RESET history */
+#define KEYINFO_RESET_History NULL
+#endif
+
+#ifndef SKIP_CMD_TIPS_TABLE
+/* KEYINFO RESET tips */
+const char *KEYINFO_RESET_Tips[] = {
+"request_policy:all_nodes",
+"response_policy:all_succeeded",
+};
+#endif
+
+#ifndef SKIP_CMD_KEY_SPECS_TABLE
+/* KEYINFO RESET key specs */
+#define KEYINFO_RESET_Keyspecs NULL
+#endif
+
+/* KEYINFO RESET type argument table */
+struct COMMAND_ARG KEYINFO_RESET_type_Subargs[] = {
+{MAKE_ARG("many-elements",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+{MAKE_ARG("large-memory",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+};
+
+/* KEYINFO RESET argument table */
+struct COMMAND_ARG KEYINFO_RESET_Args[] = {
+{MAKE_ARG("type",ARG_TYPE_ONEOF,-1,NULL,NULL,NULL,CMD_ARG_NONE,2,NULL),.subargs=KEYINFO_RESET_type_Subargs},
+};
+
+/* KEYINFO command table */
+struct COMMAND_STRUCT KEYINFO_Subcommands[] = {
+{MAKE_CMD("get","Returns the specified keyinfo entries.","O(N) where N is the number of entries returned","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_GET_History,0,KEYINFO_GET_Tips,2,keyinfoCommand,4,CMD_ADMIN|CMD_LOADING|CMD_STALE,0,KEYINFO_GET_Keyspecs,0,NULL,2),.args=KEYINFO_GET_Args},
+{MAKE_CMD("help","Show helpful text about the different subcommands","O(1)","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_HELP_History,0,KEYINFO_HELP_Tips,0,keyinfoCommand,2,CMD_LOADING|CMD_STALE,0,KEYINFO_HELP_Keyspecs,0,NULL,0)},
+{MAKE_CMD("len","Returns the number of entries in the specified type of keyinfo.","O(1)","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_LEN_History,0,KEYINFO_LEN_Tips,3,keyinfoCommand,3,CMD_ADMIN|CMD_LOADING|CMD_STALE,0,KEYINFO_LEN_Keyspecs,0,NULL,1),.args=KEYINFO_LEN_Args},
+{MAKE_CMD("reset","Clears all entries from the specified type of keyinfo.","O(N) where N is the number of entries in the keyinfo","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_RESET_History,0,KEYINFO_RESET_Tips,2,keyinfoCommand,3,CMD_ADMIN|CMD_LOADING|CMD_STALE,0,KEYINFO_RESET_Keyspecs,0,NULL,1),.args=KEYINFO_RESET_Args},
+{0}
+};
+
+/********** KEYINFO ********************/
+
+#ifndef SKIP_CMD_HISTORY_TABLE
+/* KEYINFO history */
+#define KEYINFO_History NULL
+#endif
+
+#ifndef SKIP_CMD_TIPS_TABLE
+/* KEYINFO tips */
+#define KEYINFO_Tips NULL
+#endif
+
+#ifndef SKIP_CMD_KEY_SPECS_TABLE
+/* KEYINFO key specs */
+#define KEYINFO_Keyspecs NULL
+#endif
+
 /********** LASTSAVE ********************/
 
 #ifndef SKIP_CMD_HISTORY_TABLE
@@ -11334,14 +11337,14 @@ struct COMMAND_STRUCT serverCommandTable[] = {
 {MAKE_CMD("bgsave","Asynchronously saves the database(s) to disk.","O(1)","1.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,BGSAVE_History,2,BGSAVE_Tips,0,bgsaveCommand,-1,CMD_NO_ASYNC_LOADING|CMD_ADMIN|CMD_NOSCRIPT,0,BGSAVE_Keyspecs,0,NULL,1),.args=BGSAVE_Args},
 {MAKE_CMD("command","Returns detailed information about all commands.","O(N) where N is the total number of commands","2.8.13",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,COMMAND_History,0,COMMAND_Tips,1,commandCommand,-1,CMD_LOADING|CMD_STALE|CMD_SENTINEL,ACL_CATEGORY_CONNECTION,COMMAND_Keyspecs,0,NULL,0),.subcommands=COMMAND_Subcommands},
 {MAKE_CMD("commandlog","A container for command log commands.","Depends on subcommand.","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,COMMANDLOG_History,0,COMMANDLOG_Tips,0,NULL,-2,0,0,COMMANDLOG_Keyspecs,0,NULL,0),.subcommands=COMMANDLOG_Subcommands},
-{MAKE_CMD("keyinfo","A container for keyinfo commands.","Depends on subcommand.","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_History,0,KEYINFO_Tips,0,NULL,-2,0,0,KEYINFO_Keyspecs,0,NULL,0),.subcommands=KEYINFO_Subcommands},
 {MAKE_CMD("config","A container for server configuration commands.","Depends on subcommand.","2.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,CONFIG_History,0,CONFIG_Tips,0,NULL,-2,0,0,CONFIG_Keyspecs,0,NULL,0),.subcommands=CONFIG_Subcommands},
 {MAKE_CMD("dbsize","Returns the number of keys in the database.","O(1)","1.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,DBSIZE_History,0,DBSIZE_Tips,2,dbsizeCommand,1,CMD_READONLY|CMD_FAST,ACL_CATEGORY_KEYSPACE,DBSIZE_Keyspecs,0,NULL,0)},
 {MAKE_CMD("debug","A container for debugging commands.","Depends on subcommand.","1.0.0",CMD_DOC_SYSCMD,NULL,NULL,"server",COMMAND_GROUP_SERVER,DEBUG_History,0,DEBUG_Tips,0,debugCommand,-2,CMD_ADMIN|CMD_NOSCRIPT|CMD_LOADING|CMD_STALE|CMD_PROTECTED,0,DEBUG_Keyspecs,0,NULL,0)},
 {MAKE_CMD("failover","Starts a coordinated failover from a server to one of its replicas.","O(1)","6.2.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,FAILOVER_History,0,FAILOVER_Tips,0,failoverCommand,-1,CMD_ADMIN|CMD_NOSCRIPT|CMD_STALE,0,FAILOVER_Keyspecs,0,NULL,3),.args=FAILOVER_Args},
 {MAKE_CMD("flushall","Removes all keys from all databases.","O(N) where N is the total number of keys in all databases","1.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,FLUSHALL_History,2,FLUSHALL_Tips,2,flushallCommand,-1,CMD_WRITE,ACL_CATEGORY_KEYSPACE|ACL_CATEGORY_DANGEROUS,FLUSHALL_Keyspecs,0,NULL,1),.args=FLUSHALL_Args},
 {MAKE_CMD("flushdb","Remove all keys from the current database.","O(N) where N is the number of keys in the selected database","1.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,FLUSHDB_History,2,FLUSHDB_Tips,2,flushdbCommand,-1,CMD_WRITE,ACL_CATEGORY_KEYSPACE|ACL_CATEGORY_DANGEROUS,FLUSHDB_Keyspecs,0,NULL,1),.args=FLUSHDB_Args},
 {MAKE_CMD("info","Returns information and statistics about the server.","O(1)","1.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,INFO_History,1,INFO_Tips,3,infoCommand,-1,CMD_LOADING|CMD_STALE|CMD_SENTINEL,ACL_CATEGORY_DANGEROUS,INFO_Keyspecs,0,NULL,1),.args=INFO_Args},
+{MAKE_CMD("keyinfo","A container for keyinfo commands.","Depends on subcommand.","8.1.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,KEYINFO_History,0,KEYINFO_Tips,0,NULL,-2,0,0,KEYINFO_Keyspecs,0,NULL,0),.subcommands=KEYINFO_Subcommands},
 {MAKE_CMD("lastsave","Returns the Unix timestamp of the last successful save to disk.","O(1)","1.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,LASTSAVE_History,0,LASTSAVE_Tips,1,lastsaveCommand,1,CMD_LOADING|CMD_STALE|CMD_FAST,ACL_CATEGORY_ADMIN|ACL_CATEGORY_DANGEROUS,LASTSAVE_Keyspecs,0,NULL,0)},
 {MAKE_CMD("latency","A container for latency diagnostics commands.","Depends on subcommand.","2.8.13",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,LATENCY_History,0,LATENCY_Tips,0,NULL,-2,0,0,LATENCY_Keyspecs,0,NULL,0),.subcommands=LATENCY_Subcommands},
 {MAKE_CMD("lolwut","Displays computer art and the server version",NULL,"5.0.0",CMD_DOC_NONE,NULL,NULL,"server",COMMAND_GROUP_SERVER,LOLWUT_History,0,LOLWUT_Tips,0,lolwutCommand,-1,CMD_READONLY|CMD_FAST,0,LOLWUT_Keyspecs,0,NULL,1),.args=LOLWUT_Args},

src/commands/keyinfo-get.json

@@ -0,0 +1,71 @@
+{
+    "GET": {
+        "summary": "Returns the specified keyinfo entries.",
+        "complexity": "O(N) where N is the number of entries returned",
+        "group": "server",
+        "since": "8.1.0",
+        "arity": 4,
+        "container": "KEYINFO",
+        "function": "keyinfoCommand",
+        "command_flags": [
+            "ADMIN",
+            "LOADING",
+            "STALE"
+        ],
+        "command_tips": [
+            "REQUEST_POLICY:ALL_NODES",
+            "NONDETERMINISTIC_OUTPUT"
+        ],
+        "reply_schema": {
+            "type": "array",
+            "description": "Entries from the keyinfo.",
+            "uniqueItems": true,
+            "items": {
+                "type": "array",
+                "minItems": 4,
+                "maxItems": 4,
+                "items": [
+                    {
+                        "type": "integer",
+                        "description": "keyinfo entry ID."
+                    },
+                    {
+                        "type": "string",
+                        "description": "key name."
+                    },
+                    {
+                        "type": "integer",
+                        "description": "Determined by the type parameter.",
+                        "minimum": 0
+                    },
+                    {
+                        "type": "integer",
+                        "description": "The unix timestamp at which the keyinfo was processed.",
+                        "minimum": 0
+                    }
+                ]
+            }
+        },
+        "arguments": [
+            {
+                "name": "count",
+                "type": "integer"
+            },
+            {
+                "name": "type",
+                "type": "oneof",
+                "arguments": [
+                    {
+                        "name": "many-elements",
+                        "type": "string"
+                    },
+                    {
+                        "name": "large-memory",
+                        "type": "string"
+                    }
+                ]
+            }
+        ]
+    }
+}
+

src/commands/keyinfo-help.json

@@ -0,0 +1,22 @@
+{
+    "HELP": {
+        "summary": "Show helpful text about the different subcommands",
+        "complexity": "O(1)",
+        "group": "server",
+        "since": "8.1.0",
+        "arity": 2,
+        "container": "KEYINFO",
+        "function": "keyinfoCommand",
+        "command_flags": [
+            "LOADING",
+            "STALE"
+        ],
+        "reply_schema": {
+            "type": "array",
+            "description": "Helpful text about subcommands.",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}