Tests for default behavior

Author: mkoppanen

php_memcached.c

@@ -341,6 +341,11 @@ PHP_INI_BEGIN()
 	MEMC_INI_ENTRY("compression_threshold", "2000",                  OnUpdateLong,            compression_threshold)
 	MEMC_INI_ENTRY("serializer",            SERIALIZER_DEFAULT_NAME, OnUpdateSerializer,      serializer_name)
 	MEMC_INI_ENTRY("store_retry_count",     "2",                     OnUpdateLong,            store_retry_count)
+
+	MEMC_INI_ENTRY("default_consistent_hash",       "0", OnUpdateBool,       default_behavior.consistent_hash_enabled)
+	MEMC_INI_ENTRY("default_binary_protocol",       "0", OnUpdateBool,       default_behavior.binary_protocol_enabled)
+	MEMC_INI_ENTRY("default_connect_timeout",       "0", OnUpdateLongGEZero, default_behavior.connect_timeout)
+
 PHP_INI_END()
 /* }}} */
 
@@ -1190,7 +1195,8 @@ static PHP_METHOD(Memcached, __construct)
 	}
 
 	if (!intern->memc) {
-		// TODO: handle allocation fail
+		php_error_docref(NULL, E_ERROR, "Failed to allocate memory for memcached structure");
+		/* never reached */
 	}
 
 	memc_user_data                    = pecalloc (1, sizeof(*memc_user_data), is_persistent);
@@ -1203,6 +1209,38 @@ static PHP_METHOD(Memcached, __construct)
 
 	memcached_set_user_data(intern->memc, memc_user_data);
 
+	/* Set default behaviors */
+	{
+#ifdef mikko_0
+		fprintf (stderr, "consistent_hash_enabled=%d binary_protocol_enabled=%d connect_timeout=%ld\n",
+			MEMC_G(default_behavior.consistent_hash_enabled), MEMC_G(default_behavior.binary_protocol_enabled), MEMC_G(default_behavior.connect_timeout));
+#endif
+
+		memcached_return rc;
+
+		if (MEMC_G(default_behavior.consistent_hash_enabled)) {
+
+			rc = memcached_behavior_set(intern->memc, MEMCACHED_BEHAVIOR_DISTRIBUTION, MEMCACHED_DISTRIBUTION_CONSISTENT);
+			if (rc != MEMCACHED_SUCCESS) {
+				php_error_docref(NULL, E_WARNING, "Failed to turn on consistent hash: %s", memcached_strerror(intern->memc, rc));
+			}
+		}
+
+		if (MEMC_G(default_behavior.binary_protocol_enabled)) {
+			rc = memcached_behavior_set(intern->memc, MEMCACHED_BEHAVIOR_BINARY_PROTOCOL, 1);
+			if (rc != MEMCACHED_SUCCESS) {
+				php_error_docref(NULL, E_WARNING, "Failed to turn on binary protocol: %s", memcached_strerror(intern->memc, rc));
+			}
+		}
+
+		if (MEMC_G(default_behavior.connect_timeout)) {
+			rc = memcached_behavior_set(intern->memc, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, MEMC_G(default_behavior.connect_timeout));
+			if (rc != MEMCACHED_SUCCESS) {
+				php_error_docref(NULL, E_WARNING, "Failed to set connect timeout: %s", memcached_strerror(intern->memc, rc));
+			}
+		}
+	}
+
 	if (fci.size) {
 		if (!s_invoke_new_instance_cb(getThis(), &fci, &fci_cache, persistent_id) || EG(exception)) {
 			/* error calling or exception thrown from callback */
@@ -2263,7 +2301,7 @@ PHP_METHOD(Memcached, addServer)
 	}
 
 	MEMC_METHOD_FETCH_OBJECT;
-	intern->rescode = MEMCACHED_SUCCESS;
+	s_memc_set_status(intern, MEMCACHED_SUCCESS, 0);
 
 #if defined(LIBMEMCACHED_VERSION_HEX) && LIBMEMCACHED_VERSION_HEX < 0x01000002
 	if (host->val[0] == '/') { /* unix domain socket */
@@ -2712,7 +2750,7 @@ static PHP_METHOD(Memcached, flush)
 	}
 
 	MEMC_METHOD_FETCH_OBJECT;
-	intern->rescode = MEMCACHED_SUCCESS;
+	s_memc_set_status(intern, MEMCACHED_SUCCESS, 0);
 
 	status = memcached_flush(intern->memc, delay);
 	if (s_memc_status_handle_result_code(intern, status) == FAILURE) {
@@ -4100,6 +4138,11 @@ PHP_GINIT_FUNCTION(php_memcached)
 
 	php_memcached_globals->memc.sasl_initialised = 0;
 	php_memcached_globals->no_effect = 0;
+
+	/* Defaults for certain options */
+	php_memcached_globals->memc.default_behavior.consistent_hash_enabled = 0;
+	php_memcached_globals->memc.default_behavior.binary_protocol_enabled = 0;
+	php_memcached_globals->memc.default_behavior.connect_timeout         = 0;
 }
 
 zend_module_entry memcached_module_entry = {

php_memcached_private.h

@@ -150,7 +150,6 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 		zend_long lock_retries;
 		zend_long lock_expiration;
 
-		zend_bool compression_enabled;
 		zend_bool binary_protocol_enabled;
 		zend_bool consistent_hash_enabled;
 
@@ -183,6 +182,14 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 		/* Whether we have initialised sasl for this process */
 		zend_bool sasl_initialised;
 
+		struct {
+
+			zend_bool consistent_hash_enabled;
+			zend_bool binary_protocol_enabled;
+			zend_long connect_timeout;
+
+		} default_behavior;
+
 	} memc;
 
 	/* For deprecated values */

tests/default_behavior.phpt

@@ -0,0 +1,32 @@
+--TEST--
+Default behaviors
+--SKIPIF--
+<?php if (!extension_loaded("memcached")) print "skip"; ?>
+--FILE--
+<?php
+
+$m = new Memcached();
+var_dump ($m->getOption(Memcached::OPT_DISTRIBUTION) == Memcached::DISTRIBUTION_MODULA);
+var_dump ($m->getOption(Memcached::OPT_BINARY_PROTOCOL) == false);
+var_dump ($m->getOption(Memcached::OPT_CONNECT_TIMEOUT) != 0);
+
+ini_set('memcached.default_consistent_hash', true);
+ini_set('memcached.default_binary_protocol', true);
+ini_set('memcached.default_connect_timeout', 1212);
+
+$m = new Memcached();
+var_dump ($m->getOption(Memcached::OPT_DISTRIBUTION) == Memcached::DISTRIBUTION_CONSISTENT);
+var_dump ($m->getOption(Memcached::OPT_BINARY_PROTOCOL) == true);
+var_dump ($m->getOption(Memcached::OPT_CONNECT_TIMEOUT) == 1212);
+
+echo "OK";
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+OK