More testing of user flags

Author: mkoppanen

php_memcached.c

@@ -151,7 +151,7 @@ typedef unsigned long int uint32_t;
 ****************************************/
 #define MEMC_VAL_GET_USER_FLAGS(flags)            ((flags & MEMC_MASK_USER) >> 16)
 #define MEMC_VAL_SET_USER_FLAGS(flags, udf_flags) ((flags) |= ((udf_flags << 16) & MEMC_MASK_USER))
-#define MEMC_VAL_USER_FLAGS_MAX                   (MEMC_MASK_USER >> 16)
+#define MEMC_VAL_USER_FLAGS_MAX                   ((1 << 16) - 1)
 
 /****************************************
   "get" operation flags
@@ -1256,8 +1256,8 @@ static void php_memc_setMulti_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_ke
 	i_obj->rescode = MEMCACHED_SUCCESS;
 
 	/*
-	 * php_memcached uses 8 bits internally to store type, compression and serialization info.
-	 * We use 8 upper bits to store user defined flags.
+	 * php_memcached uses 16 bits internally to store type, compression and serialization info.
+	 * We use 16 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
 		if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
@@ -1465,8 +1465,8 @@ static void php_memc_store_impl(INTERNAL_FUNCTION_PARAMETERS, int op, zend_bool
 	}
 
 	/*
-	 * php_memcached uses 8 bits internally to store type, compression and serialization info.
-	 * We use 8 upper bits to store user defined flags.
+	 * php_memcached uses 16 bits internally to store type, compression and serialization info.
+	 * We use 16 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
 		if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {
@@ -1608,8 +1608,8 @@ static void php_memc_cas_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool by_key)
 	}
 
 	/*
-	 * php_memcached uses 8 bits internally to store type, compression and serialization info.
-	 * We use 8 upper bits to store user defined flags.
+	 * php_memcached uses 16 bits internally to store type, compression and serialization info.
+	 * We use 16 upper bits to store user defined flags.
 	 */
 	if (udf_flags > 0) {
 		if ((uint32_t) udf_flags > MEMC_VAL_USER_FLAGS_MAX) {

tests/user-flags.phpt

@@ -13,7 +13,9 @@ function check_flag ($flags, $flag)
 define ('FLAG_1', 1);
 define ('FLAG_2', 2);
 define ('FLAG_4', 4);
-
+define ('FLAG_32', 32);
+define ('FLAG_64', 64);
+define ('FLAG_TOO_LARGE', pow(2, 16));
 $x = 0;
 
 $m = new Memcached();
@@ -24,33 +26,34 @@ $key = uniqid ('udf_test_');
 
 echo "stored with flags" . PHP_EOL;
 
-$m->set ($key, '1', 10, FLAG_1 | FLAG_4);
+$m->set ($key, '1', 10, FLAG_1 | FLAG_4 | FLAG_64);
 $udf_flags = 0;
 $value = $m->get ($key, null, $x, $udf_flags);
 
 var_dump (check_flag ($udf_flags, FLAG_1));
 var_dump (check_flag ($udf_flags, FLAG_2));
 var_dump (check_flag ($udf_flags, FLAG_4));
-
+var_dump (check_flag ($udf_flags, FLAG_32));
+var_dump (check_flag ($udf_flags, FLAG_64));
 
 echo "stored without flags" . PHP_EOL;
 $m->set ($key, '1');
 $value = $m->get ($key, null, $x, $udf_flags);
 
-var_dump (check_flag ($udf_flags, FLAG_1));
-var_dump (check_flag ($udf_flags, FLAG_2));
-var_dump (check_flag ($udf_flags, FLAG_4));
-
+var_dump ($udf_flags == 0);
+$m->set ($key, '1', 10, FLAG_TOO_LARGE);
 
 echo "DONE TEST\n";
 ?>
---EXPECT--
+--EXPECTF--
 stored with flags
 bool(true)
 bool(false)
 bool(true)
-stored without flags
-bool(false)
-bool(false)
 bool(false)
+bool(true)
+stored without flags
+bool(true)
+
+Warning: Memcached::set(): udf_flags will be limited to 65535 in %s on line %d
 DONE TEST