DEV: some corrections for the previous merge... (#1211)

* DEV: add new HFE commands

* DEV: correct previous merge

Author: dwdougherty

content/commands/hgetex/index.md

@@ -88,17 +88,18 @@ syntax_str: "[EX\_seconds | PX\_milliseconds | EXAT\_unix-time-seconds | PXAT\_u
   \ | PERSIST] FIELDS\_numfields field [field ...]"
 title: HGETEX
 ---
-Get the value of one or more fields of a given hash key and optionally set their expirations (time-to-live or TTL).
+
+Get the value of one or more fields of a given hash key and optionally set their expiration time or time-to-live (TTL).
 
 ## Options
 
 The `HGETEX` command supports a set of options:
 
 * `EX seconds` -- Set the specified expiration time, in seconds.
 * `PX milliseconds` -- Set the specified expiration time, in milliseconds.
-* `EXAT unix-time-seconds` -- Set the specified Unix time at which the field will expire, in seconds.
-* `PXAT unix-time-milliseconds` -- Set the specified Unix time at which the field will expire, in milliseconds.
-* `PERSIST` -- Remove the TTL associated with the field.
+* `EXAT unix-time-seconds` -- Set the specified Unix time at which the fields will expire, in seconds.
+* `PXAT unix-time-milliseconds` -- Set the specified Unix time at which the fields will expire, in milliseconds.
+* `PERSIST` -- Remove the TTL associated with the fields.
 
 The `EX`, `PX`, `EXAT`, `PXAT`, and `PERSIST` options are mutually exclusive.
 

content/commands/hsetex/index.md

@@ -106,7 +106,8 @@ syntax_str: "[FNX | FXX] [EX\_seconds | PX\_milliseconds | EXAT\_unix-time-secon
   \ value ...]"
 title: HSETEX
 ---
-Set the value of one or more fields of a given hash key, and optionally set their expirations (time-to-live or TTL).
+
+Set the value of one or more fields of a given hash key, and optionally set their expiration time or time-to-live (TTL).
 
 ## Options
 
@@ -116,9 +117,9 @@ The `HGETEX` command supports a set of options:
 * `FXX` -- Only set the fields if all of them already exist.
 * `EX seconds` -- Set the specified expiration time in seconds.
 * `PX milliseconds` -- Set the specified expiration time in milliseconds.
-* `EXAT unix-time-seconds` -- Set the specified Unix time in seconds at which the field will expire.
-* `PXAT unix-time-milliseconds` -- Set the specified Unix time in milliseconds at which the field will expire.
-* `KEEPTTL` -- Retain the TTL associated with the field.
+* `EXAT unix-time-seconds` -- Set the specified Unix time in seconds at which the fields will expire.
+* `PXAT unix-time-milliseconds` -- Set the specified Unix time in milliseconds at which the fields will expire.
+* `KEEPTTL` -- Retain the TTL associated with the fields.
 
 The `EX`, `PX`, `EXAT`, `PXAT`, and `KEEPTTL` options are mutually exclusive.
 
@@ -140,4 +141,3 @@ redis> HTTL mykey FIELDS 2 field1 field2
 1) (integer) 55481
 2) (integer) 55481
 ```
-

data/resp2_replies.json

@@ -573,7 +573,15 @@
     "* [Nil reply](../../develop/reference/protocol-spec#bulk-strings): If the field is not present in the hash or key does not exist."
   ],
   "HGETALL": [
-    "[Array reply](../../develop/reference/protocol-spec#arrays): a list of fields and their values stored in the hash, or an empty list when key does not exist."
+    "[Array reply](../../develop/reference/protocol-spec#arrays): a list of fields and their values, or an empty list when key does not exist."
+  ],
+  "HGETDEL": [
+    "[Array reply](../../develop/reference/protocol-spec#arrays): a list of deleted fields and their values or `nil` for fields that do not exist."
+  ],
+  "HGETEX": [
+    "* [Array reply](../../develop/reference/protocol-spec#arrays). For each field:",
+    "    - [Integer reply](../../develop/reference/protocol-spec#integers): `-2` if no such field exists in the provided hash key, or the provided key does not exist, or if the field exists but has no associated expiration set.",
+    "    - [Integer reply](../../develop/reference/protocol-spec#integers): the expiration in seconds."
   ],
   "HGETDEL": [
     "[Array reply](../../develop/reference/protocol-spec#arrays): a list of deleted fields and their values or `nil` for fields that do not exist."

data/resp3_replies.json

@@ -573,7 +573,15 @@
     "* [Null reply](../../develop/reference/protocol-spec#nulls): If the field is not present in the hash or key does not exist."
   ],
   "HGETALL": [
-    "[Map reply](../../develop/reference/protocol-spec#maps): a map of fields and their values stored in the hash, or an empty list when key does not exist."
+    "[Map reply](../../develop/reference/protocol-spec#maps): a map of fields and their values, or an empty list when key does not exist."
+  ],
+  "HGETDEL": [
+    "[Array reply](../../develop/reference/protocol-spec#arrays): a list of deleted fields and their values or `nil` for fields that do not exist."
+  ],
+  "HGETEX": [
+    "* [Array reply](../../develop/reference/protocol-spec#arrays). For each field:",
+    "    - [Integer reply](../../develop/reference/protocol-spec#integers): `-2` if no such field exists in the provided hash key, or the provided key does not exist, or if the field exists but has no associated expiration set.",
+    "    - [Integer reply](../../develop/reference/protocol-spec#integers): the expiration in seconds."
   ],
   "HGETDEL": [
     "[Array reply](../../develop/reference/protocol-spec#arrays): a list of deleted fields and their values or `nil` for fields that do not exist."