[WIP] Issue #1894

yatsukhnenko · yatsukhnenko · commit f9436e255b3f · 2022-03-21T19:41:08.000+02:00
Add NOMKSTREAM option to XADD command.
diff --git a/redis.stub.php b/redis.stub.php
@@ -461,7 +461,7 @@ public function wait(int $count, int $timeout): int;
 
     public function xack(string $key, string $group, array $ids): int;
 
-    public function xadd(string $key, string $id, array $values, int $maxlen = 0, bool $approx = false): string;
+    public function xadd(string $key, string $id, array $values, int $maxlen = 0, bool $approx = false, bool $nomkstream = false): string;
 
     public function xclaim(string $key, string $group, string $consumer, int $min_iddle, array $ids, array $options): string|array;
 
diff --git a/redis_arginfo.h b/redis_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: de74da38c8a832457554c3a0e1e042d47464e36c */
+ * Stub hash: 49b5dded8c4ca8f50f0427d203e35c89278ad364 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, options, IS_ARRAY, 0, "null")
@@ -748,6 +748,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_class_Redis_xadd, 0, 3, IS_STRIN
 	ZEND_ARG_TYPE_INFO(0, values, IS_ARRAY, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, maxlen, IS_LONG, 0, "0")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, approx, _IS_BOOL, 0, "false")
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, nomkstream, _IS_BOOL, 0, "false")
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_class_Redis_xclaim, 0, 6, MAY_BE_STRING|MAY_BE_ARRAY)
diff --git a/redis_commands.c b/redis_commands.c
@@ -3810,15 +3810,16 @@ int redis_xadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     zend_string *arrkey;
     zval *z_fields, *value;
     zend_long maxlen = 0;
-    zend_bool approx = 0;
+    zend_bool approx = 0, nomkstream = 0;
     zend_ulong idx;
     HashTable *ht_fields;
     int fcount, argc;
     char *key, *id;
     size_t keylen, idlen;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssa|lb", &key, &keylen,
-                              &id, &idlen, &z_fields, &maxlen, &approx) == FAILURE)
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "ssa|lbb", &key, &keylen,
+                              &id, &idlen, &z_fields, &maxlen, &approx,
+                              &nomkstream) == FAILURE)
     {
         return FAILURE;
     }
@@ -3838,12 +3839,16 @@ int redis_xadd_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     /* Calculate argc for XADD.  It's a bit complex because we've got
      * an optional MAXLEN argument which can either take the form MAXLEN N
      * or MAXLEN ~ N */
-    argc = 2 + (fcount*2) + (maxlen > 0 ? (approx ? 3 : 2) : 0);
+    argc = 2 + nomkstream + (fcount * 2) + (maxlen > 0 ? (approx ? 3 : 2) : 0);
 
     /* XADD key ID field string [field string ...] */
     REDIS_CMD_INIT_SSTR_STATIC(&cmdstr, argc, "XADD");
     redis_cmd_append_sstr_key(&cmdstr, key, keylen, redis_sock, slot);
 
+    if (nomkstream) {
+        REDIS_CMD_APPEND_SSTR_STATIC(&cmdstr, "NOMKSTREAM");
+    }
+
     /* Now append our MAXLEN bits if we've got them */
     if (maxlen > 0) {
         REDIS_CMD_APPEND_SSTR_STATIC(&cmdstr, "MAXLEN");
diff --git a/redis_legacy_arginfo.h b/redis_legacy_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: de74da38c8a832457554c3a0e1e042d47464e36c */
+ * Stub hash: 49b5dded8c4ca8f50f0427d203e35c89278ad364 */
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis___construct, 0, 0, 0)
 	ZEND_ARG_INFO(0, options)
@@ -664,6 +664,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis_xadd, 0, 0, 3)
 	ZEND_ARG_INFO(0, values)
 	ZEND_ARG_INFO(0, maxlen)
 	ZEND_ARG_INFO(0, approx)
+	ZEND_ARG_INFO(0, nomkstream)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_class_Redis_xclaim, 0, 0, 6)
