Don't use convert_to_string in redis_hmget_cmd

yatsukhnenko · yatsukhnenko · commit 99335d608157 · 2017-09-29T17:19:45.000+03:00
diff --git a/cluster_library.c b/cluster_library.c
@@ -2435,6 +2435,7 @@ int mbulk_resp_loop_assoc(RedisSock *redis_sock, zval *z_result,
 
     // Loop while we've got replies
     while(count--) {
+        zend_string *zstr = zval_get_string(&z_keys[i]);
         line = redis_sock_read(redis_sock, &line_len TSRMLS_CC);
 
         if(line != NULL) {
@@ -2444,19 +2445,17 @@ int mbulk_resp_loop_assoc(RedisSock *redis_sock, zval *z_result,
                 MAKE_STD_ZVAL(z);
                 *z = zv;
 #endif
-                add_assoc_zval_ex(z_result,Z_STRVAL(z_keys[i]),
-                    Z_STRLEN(z_keys[i]), z);
+                add_assoc_zval_ex(z_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), z);
             } else {
-                add_assoc_stringl_ex(z_result, Z_STRVAL(z_keys[i]),
-                    Z_STRLEN(z_keys[i]), line, line_len);
+                add_assoc_stringl_ex(z_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), line, line_len);
             }
             efree(line);
         } else {
-            add_assoc_bool_ex(z_result, Z_STRVAL(z_keys[i]),
-                Z_STRLEN(z_keys[i]), 0);
+            add_assoc_bool_ex(z_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), 0);
         }
 
         // Clean up key context
+        zend_string_release(zstr);
         zval_dtor(&z_keys[i]);
 
         // Move to the next key
diff --git a/library.c b/library.c
@@ -1705,6 +1705,7 @@ PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSoc
     array_init(z_multi_result); /* pre-allocate array for multi's results. */
 
     for(i = 0; i < numElems; ++i) {
+        zend_string *zstr = zval_get_string(&z_keys[i]);
         response = redis_sock_read(redis_sock, &response_len TSRMLS_CC);
         if(response != NULL) {
             zval zv0, *z = &zv0;
@@ -1713,22 +1714,23 @@ PHP_REDIS_API int redis_mbulk_reply_assoc(INTERNAL_FUNCTION_PARAMETERS, RedisSoc
                 MAKE_STD_ZVAL(z);
                 *z = zv0;
 #endif
-                add_assoc_zval_ex(z_multi_result, Z_STRVAL(z_keys[i]), Z_STRLEN(z_keys[i]), z);
+                add_assoc_zval_ex(z_multi_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), z);
             } else {
-                add_assoc_stringl_ex(z_multi_result, Z_STRVAL(z_keys[i]), Z_STRLEN(z_keys[i]), response, response_len);
+                add_assoc_stringl_ex(z_multi_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), response, response_len);
             }
             efree(response);
         } else {
-            add_assoc_bool_ex(z_multi_result, Z_STRVAL(z_keys[i]), Z_STRLEN(z_keys[i]), 0);
+            add_assoc_bool_ex(z_multi_result, ZSTR_VAL(zstr), ZSTR_LEN(zstr), 0);
         }
+        zend_string_release(zstr);
         zval_dtor(&z_keys[i]);
     }
     efree(z_keys);
 
     IF_NOT_ATOMIC() {
         add_next_index_zval(z_tab, z_multi_result);
     } else {
-        RETVAL_ZVAL(z_multi_result, 0, 1);
+        RETVAL_ZVAL(z_multi_result, 1, 0);
     }
     return 0;
 }
diff --git a/redis_commands.c b/redis_commands.c
@@ -1389,7 +1389,6 @@ int redis_hmget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
         ) {
             // Copy into our member array
             ZVAL_ZVAL(&z_mems[valid], z_mem, 1, 0);
-            convert_to_string(&z_mems[valid]);
 
             // Increment the member count to actually send
             valid++;
@@ -1416,8 +1415,9 @@ int redis_hmget_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 
     // Iterate over members, appending as arguments
     for(i=0;i<valid;i++) {
-        redis_cmd_append_sstr(&cmdstr, Z_STRVAL(z_mems[i]),
-            Z_STRLEN(z_mems[i]));
+        zend_string *zstr = zval_get_string(&z_mems[i]);
+        redis_cmd_append_sstr(&cmdstr, ZSTR_VAL(zstr), ZSTR_LEN(zstr));
+        zend_string_release(zstr);
     }
 
     // Set our slot
