Add INI option to set the default serializer.

Added new and updated tests to match ini setting change.

Author: tricky

php_memcached.c

@@ -227,6 +227,33 @@ static PHP_INI_MH(OnUpdateCompressionType)
 	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
 }
 
+static PHP_INI_MH(OnUpdateSerializer)
+{
+	if (!new_value) {
+		MEMC_G(serializer) = SERIALIZER_DEFAULT;
+	} else if (new_value_length == sizeof("php") - 1 &&
+		strncmp(new_value, "php", sizeof("php") - 1) == 0) {
+		MEMC_G(serializer) = SERIALIZER_PHP;
+#ifdef HAVE_MEMCACHE_IGBINARY
+	} else if (new_value_length == sizeof("igbinary") - 1 &&
+		strncmp(new_value, "igbinary", sizeof("igbinary") - 1) == 0) {
+		MEMC_G(serializer) = SERIALIZER_IGBINARY;
+#endif // IGBINARY
+#ifdef HAVE_JSON_API
+	} else if (new_value_length == sizeof("json") - 1 &&
+		strncmp(new_value, "json", sizeof("json") - 1) == 0) {
+		MEMC_G(serializer) = SERIALIZER_JSON;
+	} else if (new_value_length == sizeof("json_array") - 1 &&
+		strncmp(new_value, "json_array", sizeof("json_array") - 1) == 0) {
+		MEMC_G(serializer) = SERIALIZER_JSON_ARRAY;
+#endif // JSON
+	} else {
+		return FAILURE;
+	}
+
+	return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC);
+}
+
 /* {{{ INI entries */
 PHP_INI_BEGIN()
 #if HAVE_MEMCACHED_SESSION
@@ -238,6 +265,7 @@ PHP_INI_BEGIN()
 	STD_PHP_INI_ENTRY("memcached.compression_factor",	"1.3",		PHP_INI_ALL, OnUpdateReal, compression_factor,		zend_php_memcached_globals,	php_memcached_globals)
 	STD_PHP_INI_ENTRY("memcached.compression_threshold",	"2000",		PHP_INI_ALL, OnUpdateLong, compression_threshold,		zend_php_memcached_globals,	php_memcached_globals)
 
+	STD_PHP_INI_ENTRY("memcached.serializer",		SERIALIZER_DEFAULT_NAME, PHP_INI_ALL, OnUpdateSerializer, serializer_name,	zend_php_memcached_globals,	php_memcached_globals)
 PHP_INI_END()
 /* }}} */
 
@@ -2565,11 +2593,8 @@ static void php_memc_init_globals(zend_php_memcached_globals *php_memcached_glob
 	MEMC_G(sess_lock_key) = NULL;
 	MEMC_G(sess_lock_key_len) = 0;
 #endif
-#ifdef HAVE_MEMCACHE_IGBINARY
-	MEMC_G(serializer) = SERIALIZER_IGBINARY;
-#else
-	MEMC_G(serializer) = SERIALIZER_PHP;
-#endif
+	MEMC_G(serializer_name) = NULL;
+	MEMC_G(serializer) = SERIALIZER_DEFAULT;
 	MEMC_G(compression_type) = NULL;
 	MEMC_G(compression_type_real) = COMPRESSION_TYPE_ZLIB;
 	MEMC_G(compression_factor) = 1.30;

php_memcached.h

@@ -43,6 +43,13 @@ enum memcached_serializer {
 	SERIALIZER_JSON = 3,
 	SERIALIZER_JSON_ARRAY = 4,
 };
+#ifdef HAVE_MEMCACHED_IGBINARY
+#define SERIALIZER_DEFAULT SERIALIZER_IGBINARY
+#define SERIALIZER_DEFAULT_NAME "igbinary"
+#else
+#define SERIALIZER_DEFAULT SERIALIZER_PHP
+#define SERIALIZER_DEFAULT_NAME "php"
+#endif //HAVE_MEMCACHED_IGBINARY
 
 ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 #if HAVE_MEMCACHED_SESSION
@@ -53,6 +60,7 @@ ZEND_BEGIN_MODULE_GLOBALS(php_memcached)
 	char* sess_lock_key;
 	int   sess_lock_key_len;
 #endif
+	char *serializer_name;
 	enum memcached_serializer serializer;
 
 	char *compression_type;

tests/experimental/moduleinfo.phpt

@@ -19,6 +19,7 @@ memcached support => enabled
 memcached.compression_factor => %f => %f
 memcached.compression_threshold => %d => %d
 memcached.compression_type => %s => %s
+memcached.serializer => %s => %s
 memcached.sess_lock_wait => %d => %d
 memcached.sess_locking => %d => %d
 memcached.sess_prefix => %s => %s

tests/experimental/set_default_serializer.phpt

@@ -0,0 +1,45 @@
+--TEST--
+Set default serializer
+--SKIPIF--
+<?php if (!extension_loaded("memcached")) print "skip"; ?>
+--FILE--
+<?php
+
+function comp_serializer(Memcached $old_m, $serializer, $m_serializer) {
+	$old_s = $old_m->getOption(Memcached::OPT_SERIALIZER);
+	$ok = ini_set('memcached.serializer', $serializer);
+	if ($ok !== false) {
+		$ok = ini_get('memcached.serializer') == $serializer;
+	}
+
+	if ($ok) {
+		$m = new Memcached();
+		$s = $m->getOption(Memcached::OPT_SERIALIZER);
+		if ($s != $m_serializer) {
+			echo "Serializer is $s, should be $m_serializer ($serializer)\n";
+		}
+	}
+
+	if ($old_m->getOption(Memcached::OPT_SERIALIZER) != $old_s) {
+		echo "Should not change instantiated objects.\n";
+	}
+}
+
+
+$m = new Memcached();
+$serializer = ini_get('memcached.serializer');
+$s = $m->getOption(Memcached::OPT_SERIALIZER);
+if ($serializer == "igbinary" && $s == Memcached::SERIALIZER_IGBINARY
+	|| $serializer == "php" && $s == Memcached::SERIALIZER_PHP) {
+	echo "OK: $serializer\n";
+} else {
+	echo "Differing serializer: $serializer vs. $s\n";
+}
+
+comp_serializer($m, 'json', Memcached::SERIALIZER_JSON);
+comp_serializer($m, 'igbinary', Memcached::SERIALIZER_IGBINARY);
+comp_serializer($m, 'json_array', Memcached::SERIALIZER_JSON_ARRAY);
+comp_serializer($m, 'php', Memcached::SERIALIZER_PHP);
+
+--EXPECTF--
+OK: %rigbinary|php%r

tests/experimental/set_invalid_serializer.phpt

@@ -0,0 +1,33 @@
+--TEST--
+Set invalid serializer
+--SKIPIF--
+<?php if (!extension_loaded("memcached")) print "skip"; ?>
+--FILE--
+<?php
+
+$default = ini_get('memcached.serializer');
+$ok = ini_set('memcached.serializer', 'asdfasdffad');
+if ($ok === false || ini_get('memcached.serializer') === $default) {
+	echo "OK: set failed\n";
+}
+
+$ok = ini_set('memcached.serializer', null);
+if ($ok === false || ini_get('memcached.serializer') === $default) {
+	echo "OK: set failed\n";
+}
+
+$ok = ini_set('memcached.serializer', '');
+if ($ok === false || ini_get('memcached.serializer') === $default) {
+	echo "OK: set failed\n";
+}
+
+$ok = ini_set('memcached.serializer', 'php.');
+if ($ok === false || ini_get('memcached.serializer') === $default) {
+	echo "OK: set failed\n";
+}
+
+--EXPECTF--
+OK: set failed
+OK: set failed
+OK: set failed
+OK: set failed