From 93d951556be78e7a0b9fca40f0ebddb4e946ca27 Mon Sep 17 00:00:00 2001
From: Binbin <binloveplay1314@qq.com>
Date: Sat, 29 Jan 2022 21:21:59 +0800
Subject: [PATCH] commands arguments improvement about unix-time type (#10203)

Change the name to unix-time-seconds or unix-time-milliseconds
to be consistent. Change the type from INTEGER to UNIX_TIME.

SET (EXAT and PXAT) was already ok.
and naming aside, both PXAT and EXAT everywhere used unit-time (for both milliseconds and seconds).
the only ones that where wrong are GETEX and XCLAIM (using "integer" for both seconds and milliseconds)
---
 src/commands.c              | 10 +++++-----
 src/commands/expireat.json  |  2 +-
 src/commands/getex.json     |  8 ++++----
 src/commands/pexpireat.json |  2 +-
 src/commands/xclaim.json    |  4 ++--
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/commands.c b/src/commands.c
index 2b18f88b6..976c75494 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -1240,7 +1240,7 @@ struct redisCommandArg EXPIREAT_condition_Subargs[] = {
 /* EXPIREAT argument table */
 struct redisCommandArg EXPIREAT_Args[] = {
 {"key",ARG_TYPE_KEY,0,NULL,NULL,NULL,CMD_ARG_NONE},
-{"timestamp",ARG_TYPE_UNIX_TIME,-1,NULL,NULL,NULL,CMD_ARG_NONE},
+{"unix-time-seconds",ARG_TYPE_UNIX_TIME,-1,NULL,NULL,NULL,CMD_ARG_NONE},
 {"condition",ARG_TYPE_ONEOF,-1,NULL,NULL,"7.0.0",CMD_ARG_OPTIONAL,.subargs=EXPIREAT_condition_Subargs},
 {0}
 };
@@ -1494,7 +1494,7 @@ struct redisCommandArg PEXPIREAT_condition_Subargs[] = {
 /* PEXPIREAT argument table */
 struct redisCommandArg PEXPIREAT_Args[] = {
 {"key",ARG_TYPE_KEY,0,NULL,NULL,NULL,CMD_ARG_NONE},
-{"milliseconds-timestamp",ARG_TYPE_UNIX_TIME,-1,NULL,NULL,NULL,CMD_ARG_NONE},
+{"unix-time-milliseconds",ARG_TYPE_UNIX_TIME,-1,NULL,NULL,NULL,CMD_ARG_NONE},
 {"condition",ARG_TYPE_ONEOF,-1,NULL,NULL,"7.0.0",CMD_ARG_OPTIONAL,.subargs=PEXPIREAT_condition_Subargs},
 {0}
 };
@@ -5947,7 +5947,7 @@ struct redisCommandArg XCLAIM_Args[] = {
 {"min-idle-time",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_NONE},
 {"id",ARG_TYPE_STRING,-1,NULL,NULL,NULL,CMD_ARG_MULTIPLE},
 {"ms",ARG_TYPE_INTEGER,-1,"IDLE",NULL,NULL,CMD_ARG_OPTIONAL},
-{"ms-unix-time",ARG_TYPE_INTEGER,-1,"TIME",NULL,NULL,CMD_ARG_OPTIONAL},
+{"unix-time-milliseconds",ARG_TYPE_UNIX_TIME,-1,"TIME",NULL,NULL,CMD_ARG_OPTIONAL},
 {"count",ARG_TYPE_INTEGER,-1,"RETRYCOUNT",NULL,NULL,CMD_ARG_OPTIONAL},
 {"force",ARG_TYPE_PURE_TOKEN,-1,"FORCE",NULL,NULL,CMD_ARG_OPTIONAL},
 {"justid",ARG_TYPE_PURE_TOKEN,-1,"JUSTID",NULL,NULL,CMD_ARG_OPTIONAL},
@@ -6452,8 +6452,8 @@ struct redisCommandArg GETDEL_Args[] = {
 struct redisCommandArg GETEX_expiration_Subargs[] = {
 {"seconds",ARG_TYPE_INTEGER,-1,"EX",NULL,NULL,CMD_ARG_NONE},
 {"milliseconds",ARG_TYPE_INTEGER,-1,"PX",NULL,NULL,CMD_ARG_NONE},
-{"unix-time",ARG_TYPE_INTEGER,-1,"EXAT",NULL,NULL,CMD_ARG_NONE},
-{"unix-time",ARG_TYPE_INTEGER,-1,"PXAT",NULL,NULL,CMD_ARG_NONE},
+{"unix-time-seconds",ARG_TYPE_UNIX_TIME,-1,"EXAT",NULL,NULL,CMD_ARG_NONE},
+{"unix-time-milliseconds",ARG_TYPE_UNIX_TIME,-1,"PXAT",NULL,NULL,CMD_ARG_NONE},
 {"persist",ARG_TYPE_PURE_TOKEN,-1,"PERSIST",NULL,NULL,CMD_ARG_NONE},
 {0}
 };
diff --git a/src/commands/expireat.json b/src/commands/expireat.json
index 49119143d..43d9b748e 100644
--- a/src/commands/expireat.json
+++ b/src/commands/expireat.json
@@ -46,7 +46,7 @@
                 "key_spec_index": 0
             },
             {
-                "name": "timestamp",
+                "name": "unix-time-seconds",
                 "type": "unix-time"
             },
             {
diff --git a/src/commands/getex.json b/src/commands/getex.json
index 568986c78..128f55338 100644
--- a/src/commands/getex.json
+++ b/src/commands/getex.json
@@ -56,13 +56,13 @@
                         "token": "PX"
                     },
                     {
-                        "name": "unix-time",
-                        "type": "integer",
+                        "name": "unix-time-seconds",
+                        "type": "unix-time",
                         "token": "EXAT"
                     },
                     {
-                        "name": "unix-time",
-                        "type": "integer",
+                        "name": "unix-time-milliseconds",
+                        "type": "unix-time",
                         "token": "PXAT"
                     },
                     {
diff --git a/src/commands/pexpireat.json b/src/commands/pexpireat.json
index 4c2c10854..c08782c26 100644
--- a/src/commands/pexpireat.json
+++ b/src/commands/pexpireat.json
@@ -46,7 +46,7 @@
                 "key_spec_index": 0
             },
             {
-                "name": "milliseconds-timestamp",
+                "name": "unix-time-milliseconds",
                 "type": "unix-time"
             },
             {
diff --git a/src/commands/xclaim.json b/src/commands/xclaim.json
index 14354f8af..5dcf8d508 100644
--- a/src/commands/xclaim.json
+++ b/src/commands/xclaim.json
@@ -67,8 +67,8 @@
             },
             {
                 "token": "TIME",
-                "name": "ms-unix-time",
-                "type": "integer",
+                "name": "unix-time-milliseconds",
+                "type": "unix-time",
                 "optional": true
             },
             {