Merge remote

Author: michael-grunder

config.w32

@@ -5,7 +5,7 @@ ARG_ENABLE("redis-session", "whether to enable sessions", "yes");
 ARG_ENABLE("redis-igbinary", "whether to enable igbinary serializer support", "no");
 
 if (PHP_REDIS != "no") {
-	var sources = "redis.c library.c redis_array.c redis_array_impl.c";
+	var sources = "redis.c library.c redis_array.c redis_array_impl.c redis_cluster.c cluster_library.c";
 	if (PHP_REDIS_SESSION != "no") {
 		ADD_SOURCES(configure_module_dirname, "redis_session.c", "redis");
 		ADD_EXTENSION_DEP("redis", "session");

library.c

@@ -20,13 +20,6 @@
 #include <ext/standard/php_math.h>
 #include <ext/standard/php_rand.h>
 
-#ifdef PHP_WIN32
-# if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION <= 4
-/* This proto is available from 5.5 on only */
-PHPAPI int usleep(unsigned int useconds);
-# endif
-#endif
-
 #define UNSERIALIZE_NONE 0
 #define UNSERIALIZE_KEYS 1
 #define UNSERIALIZE_VALS 2
@@ -130,12 +123,12 @@ static void redis_error_throw(char *err, size_t err_len TSRMLS_DC) {
     }
 }
 
-PHP_REDIS_API void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
-	if (!redis_sock->persistent) {
-		php_stream_close(redis_sock->stream);
-	} else {
-		php_stream_pclose(redis_sock->stream);
-	}
+PHPAPI void redis_stream_close(RedisSock *redis_sock TSRMLS_DC) {
+    if (!redis_sock->persistent) {
+        php_stream_close(redis_sock->stream);
+    } else {
+        php_stream_pclose(redis_sock->stream);
+    }
 }
 
 PHP_REDIS_API int redis_check_eof(RedisSock *redis_sock, int no_throw TSRMLS_DC)
@@ -509,7 +502,8 @@ PHP_REDIS_API char *redis_sock_read(RedisSock *redis_sock, int *buf_len TSRMLS_D
         redis_sock->status = REDIS_SOCK_STATUS_FAILED;
         redis_sock->mode = ATOMIC;
         redis_sock->watching = 0;
-        zend_throw_exception(redis_exception_ce, "read error on connection", 0 TSRMLS_CC);
+        zend_throw_exception(redis_exception_ce, "read error on connection", 
+                             0 TSRMLS_CC);
         return NULL;
     }
 
@@ -1086,8 +1080,7 @@ PHPAPI zval* redis_parse_client_list_response(char *response) {
                     } else {
                         add_assoc_string(z_sub_result, key, value, 0);
                     }
-
-                    /* If we hit a '\n', then we can add this user to our list */
+                    // If we hit a '\n', then we can add this user to our list
                     if(*p == '\n') {
                         /* Add our user */
                         add_next_index_zval(z_result, z_sub_result);
@@ -1099,7 +1092,7 @@ PHPAPI zval* redis_parse_client_list_response(char *response) {
                         }
                     }
 
-                    /* Free our key */
+                    // Free our key
                     efree(key);
                 } else {
                     // Something is wrong
@@ -1384,9 +1377,10 @@ PHPAPI int redis_mbulk_reply_zipped_vals(INTERNAL_FUNCTION_PARAMETERS, RedisSock
         z_tab, UNSERIALIZE_VALS, SCORE_DECODE_NONE);
 }
 
-PHPAPI void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, 
-                             RedisSock *redis_sock, zval *z_tab, void *ctx)
+PHP_REDIS_API void redis_1_response(INTERNAL_FUNCTION_PARAMETERS, 
+                             RedisSock *redis_sock, zval *z_tab, void *ctx) 
 {
+
     char *response;
     int response_len;
     char ret;
@@ -1765,23 +1759,23 @@ PHPAPI int redis_sock_set_err(RedisSock *redis_sock, const char *msg,
             redis_sock->err = erealloc(redis_sock->err, msg_len +1);
         }
 
-		/* Copy in our new error message, set new length, and null terminate */
-		memcpy(redis_sock->err, msg, msg_len);
-		redis_sock->err[msg_len] = '\0';
-		redis_sock->err_len = msg_len;
-	} else {
-		/* Free our last error */
-		if(redis_sock->err != NULL) {
-			efree(redis_sock->err);
-		}
+        // Copy in our new error message, set new length, and null terminate
+        memcpy(redis_sock->err, msg, msg_len);
+        redis_sock->err[msg_len] = '\0';
+        redis_sock->err_len = msg_len;
+    } else {
+        // Free our last error
+        if(redis_sock->err != NULL) {
+            efree(redis_sock->err);
+        }
 
-		/* Set to null, with zero length */
-		redis_sock->err = NULL;
-		redis_sock->err_len = 0;
-	}
+        // Set to null, with zero length
+        redis_sock->err = NULL;
+        redis_sock->err_len = 0;
+    }
 
-	/* Success */
-	return 0;
+    // Success
+    return 0;
 }
 
 /**
@@ -1813,12 +1807,10 @@ PHPAPI int redis_sock_read_multibulk_reply(INTERNAL_FUNCTION_PARAMETERS,
         IF_MULTI_OR_PIPELINE() {
             add_next_index_bool(z_tab, 0);
         } else {
-            /* Capture our error if redis has given us one */
             if (inbuf[0] == '-') {
                 err_len = strlen(inbuf+1) - 2;
                 redis_sock_set_err(redis_sock, inbuf+1, err_len);
             }
-
             RETVAL_FALSE;
         }
         return -1;
@@ -2147,14 +2139,16 @@ redis_unserialize(RedisSock* redis_sock, const char *val, int val_len,
 
         case REDIS_SERIALIZER_IGBINARY:
 #ifdef HAVE_REDIS_IGBINARY
-			if(!*return_value) {
-				MAKE_STD_ZVAL(*return_value);
-				rv_free = 1;
-			}
-			if(igbinary_unserialize((const uint8_t *)val, (size_t)val_len, return_value TSRMLS_CC) == 0) {
-				return 1;
-			}
-			if(rv_free==1) efree(*return_value);
+            if(!*return_value) {
+                MAKE_STD_ZVAL(*return_value);
+                rv_free = 1;
+            }
+            if(igbinary_unserialize((const uint8_t *)val, (size_t)val_len, 
+                                    return_value TSRMLS_CC) == 0) 
+            {
+                return 1;
+            }
+            if (rv_free==1) efree(*return_value);
 #endif
             return 0;
             break;

library.h

@@ -63,6 +63,7 @@ PHP_REDIS_API int
 redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_DC);
 PHP_REDIS_API int
 redis_key_prefix(RedisSock *redis_sock, char **key, int *key_len);
+
 PHP_REDIS_API int
 redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **return_value TSRMLS_DC);
 

redis.c

@@ -3485,17 +3485,16 @@ PHP_METHOD(Redis, clearLastError) {
     {
         RETURN_FALSE;
     }
-
-    /* Grab socket */
-    if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
+    // Grab socket
+    if(redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) {
         RETURN_FALSE;
     }
 
-    /* Clear error message if we have one */
-    if (redis_sock->err) {
+    // Clear error message
+    if(redis_sock->err) {
         efree(redis_sock->err);
-        redis_sock->err = NULL;
     }
+    redis_sock->err = NULL;
 
     RETURN_TRUE;
 }

redis_array_impl.c

@@ -565,8 +565,8 @@ ra_index_keys(zval *z_pairs, zval *z_redis TSRMLS_DC) {
 
 	/* Initialize key array */
 	zval *z_keys, **z_entry_pp;
-	HashPosition pos;
 	MAKE_STD_ZVAL(z_keys);
+    HashPosition pos;
 #if PHP_VERSION_ID > 50300
 	array_init_size(z_keys, zend_hash_num_elements(Z_ARRVAL_P(z_pairs)));
 #else
@@ -960,11 +960,6 @@ ra_move_zset(const char *key, int key_len, zval *z_from, zval *z_to, long ttl TS
 
     zval_dtor(&z_ret);
 
-    /* Free the array itself */
-    efree(z_zadd_args);
-
-    zval_dtor(&z_ret);
-
     /* Free the array itself */
     efree(z_zadd_args);
 

redis_cluster.c

@@ -2200,8 +2200,27 @@ PHP_METHOD(RedisCluster, exec) {
     CLUSTER_RESET_MULTI(c);
 }
 
+/* {{{ proto bool RedisCluster::discard() */
+PHP_METHOD(RedisCluster, discard) {
+    redisCluster *c = GET_CONTEXT();
+
+    if(CLUSTER_IS_ATOMIC(c)) {
+        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cluster is not in MULTI mode");
+        RETURN_FALSE;
+    }
+    
+    if(cluster_abort_exec(c TSRMLS_CC)<0) {
+        CLUSTER_RESET_MULTI(c);
+    }
+
+    CLUSTER_FREE_QUEUE(c);
+
+    RETURN_TRUE;
+}
+
 /* Get a slot either by key (string) or host/port array */
-static short cluster_cmd_get_slot(redisCluster *c, zval *z_arg TSRMLS_DC)
+static short
+cluster_cmd_get_slot(redisCluster *c, zval *z_arg TSRMLS_DC) 
 {
     int key_len, key_free;
     zval **z_host, **z_port, *z_tmp = NULL;
@@ -2211,7 +2230,7 @@ static short cluster_cmd_get_slot(redisCluster *c, zval *z_arg TSRMLS_DC)
     /* If it's a string, treat it as a key.  Otherwise, look for a two
      * element array */
     if(Z_TYPE_P(z_arg)==IS_STRING || Z_TYPE_P(z_arg)==IS_LONG ||
-       Z_TYPE_P(z_arg)==IS_DOUBLE)
+       Z_TYPE_P(z_arg)==IS_DOUBLE) 
     {
         /* Allow for any scalar here */
         if (Z_TYPE_P(z_arg) != IS_STRING) {
@@ -2235,7 +2254,7 @@ static short cluster_cmd_get_slot(redisCluster *c, zval *z_arg TSRMLS_DC)
             zval_dtor(z_tmp);
             efree(z_tmp);
         }
-    } else if (Z_TYPE_P(z_arg) == IS_ARRAY &&
+    } else if (Z_TYPE_P(z_arg) == IS_ARRAY && 
                zend_hash_index_find(Z_ARRVAL_P(z_arg),0,(void**)&z_host)!=FAILURE &&
                zend_hash_index_find(Z_ARRVAL_P(z_arg),1,(void**)&z_port)!=FAILURE &&
                Z_TYPE_PP(z_host)==IS_STRING && Z_TYPE_PP(z_port)==IS_LONG)
@@ -2245,7 +2264,7 @@ static short cluster_cmd_get_slot(redisCluster *c, zval *z_arg TSRMLS_DC)
             (unsigned short)Z_LVAL_PP(z_port));
 
         /* Inform the caller if they've passed bad data */
-        if(slot < 0) {
+        if(slot < 0) { 
             php_error_docref(0 TSRMLS_CC, E_WARNING, "Unknown node %s:%ld",
                 Z_STRVAL_PP(z_host), Z_LVAL_PP(z_port));
         }
@@ -2258,24 +2277,6 @@ static short cluster_cmd_get_slot(redisCluster *c, zval *z_arg TSRMLS_DC)
     return slot;
 }
 
-/* {{{ proto bool RedisCluster::discard() */
-PHP_METHOD(RedisCluster, discard) {
-    redisCluster *c = GET_CONTEXT();
-
-    if(CLUSTER_IS_ATOMIC(c)) {
-        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Cluster is not in MULTI mode");
-        RETURN_FALSE;
-    }
-    
-    if(cluster_abort_exec(c TSRMLS_CC)<0) {
-        CLUSTER_RESET_MULTI(c);
-    }
-
-    CLUSTER_FREE_QUEUE(c);
-
-    RETURN_TRUE;
-}
-
 /* Generic handler for things we want directed at a given node, like SAVE,
  * BGSAVE, FLUSHDB, FLUSHALL, etc */
 static void 
@@ -2856,7 +2857,7 @@ PHP_METHOD(RedisCluster, echo) {
     rtype = CLUSTER_IS_ATOMIC(c) ? TYPE_BULK : TYPE_LINE;
     if(cluster_send_slot(c,slot,cmd,cmd_len,rtype TSRMLS_CC)<0) {
         zend_throw_exception(redis_cluster_exception_ce,
-            "Unable to send command at the specificed node", 0 TSRMLS_CC);
+            "Unable to send commnad at the specificed node", 0 TSRMLS_CC);
         efree(cmd);
         RETURN_FALSE;
     }
@@ -2934,6 +2935,5 @@ PHP_METHOD(RedisCluster, rawcommand) {
 PHP_METHOD(RedisCluster, command) {
     CLUSTER_PROCESS_CMD(command, cluster_variant_resp, 0);
 }
-/* }}} */
 
 /* vim: set tabstop=4 softtabstops=4 noexpandtab shiftwidth=4: */

redis_commands.h

@@ -218,9 +218,6 @@ int redis_sdiffstore_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
 int redis_command_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
     char **cmd, int *cmd_len, short *slot, void **ctx);
 
-int redis_rawcommand_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
-                         char **cmd, int *cmd_len, short *slot, void **ctx);
-
 int redis_fmt_scan_cmd(char **cmd, REDIS_SCAN_TYPE type, char *key, int key_len,
                        long it, char *pat, int pat_len, long count);
 

tests/RedisArrayTest.php

@@ -544,17 +544,4 @@ function run_tests($className, $str_filter) {
 
 define('REDIS_ARRAY_DATA_SIZE', 1000);
 
-global $useIndex;
-foreach(array(true, false) as $useIndex) {
-    $str_limit = isset($argv[1]) ? $argv[1] : NULL;
-
-    echo "\n".($useIndex?"WITH":"WITHOUT"). " per-node index:\n";
-
-    //run_tests('Redis_Array_Test', $str_limit);
-	run_tests('Redis_Rehashing_Test', $str_limit);
-	//run_tests('Redis_Auto_Rehashing_Test', $str_limit);
-	//run_tests('Redis_Multi_Exec_Test', $str_limit);
-    //run_tests('Redis_Distributor_Test', $str_limit);
-}
-
 ?>