Use zval_get_tmp_string method that is faster when provided zval is string

JakubOnderka · michael-grunder · commit f6906470a52e · 2024-11-26T18:28:09.000-08:00
diff --git a/library.c b/library.c
@@ -1089,7 +1089,7 @@ redis_cmd_append_sstr_dbl(smart_string *str, double value)
  * the value may be serialized, if we're configured to do that. */
 int redis_cmd_append_sstr_zval(smart_string *str, zval *z, RedisSock *redis_sock) {
     int valfree, retval;
-    zend_string *zstr;
+    zend_string *zstr, *tmp;
     size_t vallen;
     char *val;
 
@@ -1098,9 +1098,9 @@ int redis_cmd_append_sstr_zval(smart_string *str, zval *z, RedisSock *redis_sock
         retval = redis_cmd_append_sstr(str, val, vallen);
         if (valfree) efree(val);
     } else {
-        zstr = zval_get_string(z);
-        retval = redis_cmd_append_sstr_zstr(str, zstr);
-        zend_string_release(zstr);
+        zstr = zval_get_tmp_string(z, &tmp);
+        retval = redis_cmd_append_sstr(str, ZSTR_VAL(zstr), ZSTR_LEN(zstr));
+        zend_tmp_string_release(tmp);
     }
 
     return retval;
@@ -1128,12 +1128,12 @@ int redis_cmd_append_sstr_key_zstr(smart_string *dst, zend_string *key, RedisSoc
 }
 
 int redis_cmd_append_sstr_key_zval(smart_string *dst, zval *zv, RedisSock *redis_sock, short *slot) {
-    zend_string *key;
+    zend_string *key, *tmp;
     int res;
 
-    key = zval_get_string(zv);
-    res = redis_cmd_append_sstr_key_zstr(dst, key, redis_sock, slot);
-    zend_string_release(key);
+    key = zval_get_tmp_string(zv, &tmp);
+    res = redis_cmd_append_sstr_key(dst, ZSTR_VAL(key), ZSTR_LEN(key), redis_sock, slot);
+    zend_tmp_string_release(tmp);
 
     return res;
 }
diff --git a/redis_commands.c b/redis_commands.c
@@ -3482,9 +3482,7 @@ int redis_hset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         redis_cmd_init_sstr(&cmdstr, 1 + zend_hash_num_elements(Z_ARRVAL(z_args[1])) * 2, ZEND_STRL("HSET"));
 
         /* Append key */
-        zkey = zval_get_string(&z_args[0]);
-        redis_cmd_append_sstr_key(&cmdstr, ZSTR_VAL(zkey), ZSTR_LEN(zkey), redis_sock, slot);
-        zend_string_release(zkey);
+        redis_cmd_append_sstr_key_zval(&cmdstr, &z_args[0], redis_sock, slot);
 
         ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL(z_args[1]), zkey, z_ele) {
             if (zkey != NULL) {
@@ -3502,15 +3500,11 @@ int redis_hset_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         redis_cmd_init_sstr(&cmdstr, argc, ZEND_STRL("HSET"));
 
         /* Append key */
-        zkey = zval_get_string(&z_args[0]);
-        redis_cmd_append_sstr_key(&cmdstr, ZSTR_VAL(zkey), ZSTR_LEN(zkey), redis_sock, slot);
-        zend_string_release(zkey);
+        redis_cmd_append_sstr_key_zval(&cmdstr, &z_args[0], redis_sock, slot);
 
         for (i = 1; i < argc; ++i) {
             if (i % 2) {
-                zkey = zval_get_string(&z_args[i]);
-                redis_cmd_append_sstr(&cmdstr, ZSTR_VAL(zkey), ZSTR_LEN(zkey));
-                zend_string_release(zkey);
+                redis_cmd_append_sstr_zval(&cmdstr, &z_args[i], NULL);
             } else {
                 redis_cmd_append_sstr_zval(&cmdstr, &z_args[i], redis_sock);
             }
