Refactor MGET command.

michael-grunder · michael-grunder · commit 8cb6dd17fe43 · 2022-12-07T11:18:25.000-08:00
diff --git a/redis.c b/redis.c
@@ -894,52 +894,8 @@ PHP_METHOD(Redis, decrBy){
 
 /* {{{ proto array Redis::mget(array keys)
  */
-PHP_METHOD(Redis, mget)
-{
-    zval *object, *z_args, *z_ele;
-    HashTable *hash;
-    RedisSock *redis_sock;
-    smart_string cmd = {0};
-    int arg_count;
-
-    /* Make sure we have proper arguments */
-    if(zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Oa",
-                                    &object, redis_ce, &z_args) == FAILURE) {
-        RETURN_FALSE;
-    }
-
-    /* We'll need the socket */
-    if ((redis_sock = redis_sock_get(object, 0)) == NULL) {
-        RETURN_FALSE;
-    }
-
-    /* Grab our array */
-    hash = Z_ARRVAL_P(z_args);
-
-    /* We don't need to do anything if there aren't any keys */
-    if((arg_count = zend_hash_num_elements(hash)) == 0) {
-        RETURN_FALSE;
-    }
-
-    /* Build our command header */
-    redis_cmd_init_sstr(&cmd, arg_count, "MGET", 4);
-
-    /* Iterate through and grab our keys */
-    ZEND_HASH_FOREACH_VAL(hash, z_ele) {
-        zend_string *zstr = zval_get_string(z_ele);
-        redis_cmd_append_sstr_key(&cmd, ZSTR_VAL(zstr), ZSTR_LEN(zstr), redis_sock, NULL);
-        zend_string_release(zstr);
-    } ZEND_HASH_FOREACH_END();
-
-    /* Kick off our command */
-    REDIS_PROCESS_REQUEST(redis_sock, cmd.c, cmd.len);
-    if (IS_ATOMIC(redis_sock)) {
-        if(redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAM_PASSTHRU,
-                                           redis_sock, NULL, NULL) < 0) {
-            RETURN_FALSE;
-        }
-    }
-    REDIS_PROCESS_RESPONSE(redis_sock_read_multibulk_reply);
+PHP_METHOD(Redis, mget) {
+    REDIS_PROCESS_CMD(mget, redis_sock_read_multibulk_reply);
 }
 
 /* {{{ proto boolean Redis::exists(string $key, string ...$more_keys)
diff --git a/redis_commands.c b/redis_commands.c
@@ -2273,6 +2273,37 @@ int redis_set_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     return SUCCESS;
 }
 
+/* MGET */
+int redis_mget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
+                   char **cmd, int *cmd_len, short *slot, void **ctx)
+{
+    smart_string cmdstr = {0};
+    HashTable *keys = NULL;
+    zval *zkey;
+
+    /* RedisCluster has a custom MGET implementation */
+    ZEND_ASSERT(slot == NULL);
+
+    ZEND_PARSE_PARAMETERS_START(1, 1)
+        Z_PARAM_ARRAY_HT(keys)
+    ZEND_PARSE_PARAMETERS_END_EX(return FAILURE);
+
+    if (zend_hash_num_elements(keys) == 0)
+        return FAILURE;
+
+    REDIS_CMD_INIT_SSTR_STATIC(&cmdstr, zend_hash_num_elements(keys), "MGET");
+
+    ZEND_HASH_FOREACH_VAL(keys, zkey) {
+        ZVAL_DEREF(zkey);
+        redis_cmd_append_sstr_key_zval(&cmdstr, zkey, redis_sock, slot);
+    } ZEND_HASH_FOREACH_END();
+
+    *cmd = cmdstr.c;
+    *cmd_len = cmdstr.len;
+
+    return SUCCESS;
+}
+
 int
 redis_getex_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
                 char **cmd, int *cmd_len, short *slot, void **ctx)
diff --git a/redis_commands.h b/redis_commands.h
@@ -212,6 +212,9 @@ int redis_hincrbyfloat_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 int redis_hmget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     char **cmd, int *cmd_len, short *slot, void **ctx);
 
+int redis_mget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
+    char **cmd, int *cmd_len, short *slot, void **ctx);
+
 int redis_hmset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     char **cmd, int *cmd_len, short *slot, void **ctx);
 
