Merge branch 'master' of github.com:bpospichil/php-memcached

Author: mkoppanen

memcached-api.php

@@ -34,6 +34,8 @@ class Memcached {
 	const DISTRIBUTION_MODULA;
 
 	const DISTRIBUTION_CONSISTENT;
+	
+	const DISTRIBUTION_VIRTUAL_BUCKET;
 
 	const LIBKETAMA_COMPATIBLE;
 
@@ -203,9 +205,9 @@ public function fetchAll( ) {}
 
 	public function set( $key, $value, $expiration = 0, $udf_flags = 0 ) {}
 
-    public function touch( $key, $expiration = 0 ) {}
+	public function touch( $key, $expiration = 0 ) {}
 
-    public function touchbyKey( $key, $expiration = 0 ) {}
+	public function touchbyKey( $key, $expiration = 0 ) {}
 
 	public function setByKey( $server_key, $key, $value, $expiration = 0, $udf_flags = 0 ) {}
 
@@ -251,6 +253,8 @@ public function setOption( $option, $value ) {}
 
 	public function setOptions( array $options ) {}
 
+	public function setBucket( array $host_map, array $forward_map, $buckets, $replicas ) {}
+
 	public function addServer( $host, $port,  $weight = 0 ) {}
 
 	public function addServers( array $servers ) {}

php_memcached.c

@@ -2522,6 +2522,103 @@ static int php_memc_set_option(php_memc_t *i_obj, long option, zval *value TSRML
 	return 1;
 }
 
+/* {{{ Memcached::setBucket(array host_map, array forward_map, long buckets, long replicas)
+   Sets the memcached virtual buckets */
+
+PHP_METHOD(Memcached, setBucket)
+{
+	zval *host_map;
+	zval *forward_map;
+	long buckets;
+	long replicas;
+	
+	uint32_t *hm = NULL,*fm = NULL;
+	zend_bool ok = 1;
+	uint key_len;
+	char *key;
+	ulong key_index;
+	zval **value;
+	MEMC_METHOD_INIT_VARS;
+	
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "aa!ll", &host_map, &forward_map, &buckets, &replicas) == FAILURE) {
+		return;
+	}
+	
+	
+	hm = (uint32_t*)malloc(buckets * sizeof(uint32_t));
+	
+	int i = 0;
+	for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(host_map));
+		zend_hash_get_current_data(Z_ARRVAL_P(host_map), (void *) &value) == SUCCESS;
+		zend_hash_move_forward(Z_ARRVAL_P(host_map))) {
+		
+		if (i < buckets) {
+			if (zend_hash_get_current_key_ex(Z_ARRVAL_P(host_map), &key, &key_len, &key_index, 0, NULL) == HASH_KEY_IS_LONG) {
+				zval copy = **value;
+				zval_copy_ctor(&copy);
+				INIT_PZVAL(&copy);
+				convert_to_long(&copy);
+				hm[i] = Z_LVAL_P(&copy);
+				++i;
+				zval_dtor(&copy);
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid configuration option");
+				ok = 0;
+			}
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "array size mismatch");
+			ok = 0;
+			break;
+		}
+	}
+
+	if (i != buckets) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "array size mismatch");
+		ok = 0;
+	}
+
+	i = 0;
+	if (ok != 0 && forward_map != NULL) {
+		fm = (uint32_t*)malloc(buckets * sizeof(uint32_t));	
+		for (zend_hash_internal_pointer_reset(Z_ARRVAL_P(forward_map));
+			 zend_hash_get_current_data(Z_ARRVAL_P(forward_map), (void *) &value) == SUCCESS;
+			 zend_hash_move_forward(Z_ARRVAL_P(forward_map))) {
+
+			if (i < buckets) {
+				if (zend_hash_get_current_key_ex(Z_ARRVAL_P(forward_map), &key, &key_len, &key_index, 0, NULL) == HASH_KEY_IS_LONG) {
+					zval copy = **value;
+					zval_copy_ctor(&copy);
+					INIT_PZVAL(&copy);
+					
+					convert_to_long(&copy);
+					fm[i] = Z_LVAL_P(&copy);
+					++i;
+					zval_dtor(&copy);
+				} else {
+					php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid configuration option");
+					ok = 0;
+				}
+			} else {
+				php_error_docref(NULL TSRMLS_CC, E_WARNING, "array size mismatch");
+				ok = 0;
+			}
+		}
+	}
+	
+	MEMC_METHOD_FETCH_OBJECT;
+	
+	if (memcached_bucket_set(m_obj->memc, hm, fm, buckets, replicas) != MEMCACHED_SUCCESS)
+	{
+		ok = 0;
+		php_error_docref(NULL TSRMLS_CC, E_WARNING,"memcached_bucket_set don't returned MEMCACHED_SUCCESS");
+	}
+	free(hm);
+	free(fm);
+	RETURN_BOOL(ok);
+	
+}
+/* }}} */
+
 /* {{{ Memcached::setOptions(array options)
    Sets the value for the given option constant */
 static PHP_METHOD(Memcached, setOptions)
@@ -3772,6 +3869,13 @@ ZEND_BEGIN_ARG_INFO(arginfo_setOptions, 0)
 	ZEND_ARG_INFO(0, options)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO(arginfo_setBucket, 0)
+	ZEND_ARG_INFO(0, host_map)
+	ZEND_ARG_INFO(0, forward_map)
+	ZEND_ARG_INFO(0, buckets)
+	ZEND_ARG_INFO(0, replicas)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_getStats, 0)
 ZEND_END_ARG_INFO()
 
@@ -3859,6 +3963,7 @@ static zend_function_entry memcached_class_methods[] = {
 	MEMC_ME(getOption,          arginfo_getOption)
 	MEMC_ME(setOption,          arginfo_setOption)
 	MEMC_ME(setOptions,         arginfo_setOptions)
+	MEMC_ME(setBucket, 			arginfo_setBucket)
 #ifdef HAVE_MEMCACHED_SASL
     MEMC_ME(setSaslAuthData,    arginfo_setSaslAuthData)
 #endif