Experimental JSON support

Highly experimental support for JSON added.  There are a few
important things to consider with JSON (specifically as it
relates to PHP)

Most importantly, is how we would want data to be decoded.  By
default, PHP will decode JSON values into a stdClass object.
This works if you're checking for that, but will not necissarily
work if you're looking for an array to come back as an array.

For this commit I have decided to decode as associative until I
can determine the best way to handle this.  If we ever decide to
incorporate JSON into the main branch, this will likely need to
become another option set by the user.

In addition, I am attempting to find an example of json_decode_ex,
and json_encode being called (outside of php_json.c iteslf) where
I can test for error conditions.

With this commit, the unit tests are passing with the exception of
object encoding/decoding.

Author: michael-grunder

common.h

@@ -39,6 +39,7 @@ typedef enum _REDIS_REPLY_TYPE {
 #define REDIS_SERIALIZER_NONE		0
 #define REDIS_SERIALIZER_PHP 		1
 #define REDIS_SERIALIZER_IGBINARY 	2
+#define REDIS_SERIALIZER_JSON      3
 
 #define IF_MULTI() if(redis_sock->mode == MULTI)
 #define IF_MULTI_OR_ATOMIC() if(redis_sock->mode == MULTI || redis_sock->mode == ATOMIC)\

library.c

@@ -10,9 +10,20 @@
 #endif
 #include <ext/standard/php_smart_str.h>
 #include <ext/standard/php_var.h>
+
 #ifdef HAVE_REDIS_IGBINARY
 #include "igbinary/igbinary.h"
 #endif
+
+#ifdef HAVE_JSON
+	#include <ext/json/php_json.h>
+
+	// Define defualt depth if we don't have it
+	#ifndef JSON_PARSER_DEFAULT_DEPTH
+		#define JSON_PARSER_DEFAULT_DEPTH 512
+	#endif
+#endif
+
 #include <zend_exceptions.h>
 #include "php_redis.h"
 #include "library.h"
@@ -1313,6 +1324,22 @@ redis_serialize(RedisSock *redis_sock, zval *z, char **val, int *val_len TSRMLS_
 				*val_len = (int)sz;
 				return 1;
 			}
+#endif
+			return 0;
+		case REDIS_SERIALIZER_JSON:
+#ifdef HAVE_JSON
+	#if PHP_VERSION_ID >= 50399
+			php_json_encode(&sstr, z, 0 TSRMLS_CC);
+	#else
+			php_json_encode(&sstr, z, TSRMLS_CC);
+	#endif
+
+			// Return our value and length
+			*val = sstr.c;
+			*val_len = (int)sstr.len;
+
+			// Success
+			return 1;
 #endif
 			return 0;
 	}
@@ -1365,7 +1392,21 @@ redis_unserialize(RedisSock *redis_sock, const char *val, int val_len, zval **re
 #endif
 			return 0;
 			break;
+#ifdef HAVE_JSON
+		case REDIS_SERIALIZER_JSON:
+			if(!*return_value) {
+				MAKE_STD_ZVAL(*return_value);
+			}
+#if PHP_VERSION_ID >= 50399
+			php_json_decode_ex(*return_value, val, val_len, PHP_JSON_OBJECT_AS_ARRAY, JSON_PARSER_DEFAULT_DEPTH TSRMLS_CC);
+#else
+			php_json_decode(*return_value, val, val_len, 1, JSON_PARSER_DEFAULT_DEPTH TSRMLS_CC);
+#endif
+			return 1;
+			break;
+#endif
 	}
+
 	return 0;
 }
 

redis.c

@@ -40,10 +40,6 @@
 
 #include "library.h"
 
-#define R_SUB_CALLBACK_CLASS_TYPE 1
-#define R_SUB_CALLBACK_FT_TYPE 2
-#define R_SUB_CLOSURE_TYPE 3
-
 int le_redis_sock;
 extern int le_redis_array;
 
@@ -441,6 +437,9 @@ PHP_MINIT_FUNCTION(redis)
 #ifdef HAVE_REDIS_IGBINARY
     add_constant_long(redis_ce, "SERIALIZER_IGBINARY", REDIS_SERIALIZER_IGBINARY);
 #endif
+#ifdef HAVE_JSON
+    add_constant_long(redis_ce, "SERIALIZER_JSON", REDIS_SERIALIZER_JSON);
+#endif
 
 	zend_declare_class_constant_stringl(redis_ce, "AFTER", 5, "after", 5 TSRMLS_CC);
 	zend_declare_class_constant_stringl(redis_ce, "BEFORE", 6, "before", 6 TSRMLS_CC);
@@ -5681,6 +5680,9 @@ PHP_METHOD(Redis, setOption) {
                     if(val_long == REDIS_SERIALIZER_NONE
 #ifdef HAVE_REDIS_IGBINARY
 						 	|| val_long == REDIS_SERIALIZER_IGBINARY
+#endif
+#ifdef HAVE_JSON
+						 	|| val_long == REDIS_SERIALIZER_JSON
 #endif
 							|| val_long == REDIS_SERIALIZER_PHP) {
                             redis_sock->serializer = val_long;

tests/TestRedis.php

@@ -2189,6 +2189,8 @@ public function testPipeline() {
     }
 
     protected function sequence($mode) {
+		// Kill some keys as this is called multiple times
+		$this->redis->del('zkey1', 'zkey2', 'zKey5', 'zInter', 'zUnion');
 
 	    $ret = $this->redis->multi($mode)
 		    ->set('x', 42)
@@ -2649,6 +2651,7 @@ protected function sequence($mode) {
 
 	    $i = 0;
 	    $this->assertTrue(is_array($ret));
+
 	    $this->assertTrue(is_long($ret[$i]) && $ret[$i] >= 0 && $ret[$i] <= 3); $i++; // deleting at most 3 keys
 	    $this->assertTrue($ret[$i++] === 1);
 	    $this->assertTrue($ret[$i++] === 1);
@@ -2771,6 +2774,17 @@ public function testSerializerIGBinary() {
 	    }
     }
 
+    public function testSerializerJSON() {
+        if(defined('Redis::SERIALIZER_JSON')) {
+            $this->checkSerializer(Redis::SERIALIZER_JSON);
+
+            // wITH PREFIX
+            $this->redis->setOption(Redis::OPT_PREFIX, "test:");
+            $this->checkSerializer(Redis::SERIALIZER_JSON);
+            $this->redis->setOption(Redis::OPT_PREFIX, "");
+        }
+    }
+
     private function checkSerializer($mode) {
 
 	    $this->redis->delete('key');
@@ -3241,7 +3255,15 @@ public function testUnserialize() {
     		1,1.5,'one',Array('this','is','an','array')
     	);
 
-    	foreach(Array(Redis::SERIALIZER_PHP, Redis::SERIALIZER_IGBINARY) as $mode) {
+        $serializers = Array(Redis::SERIALIZER_PHP);
+        if(defined('Redis::SERIALIZER_IGBINARY')) {
+            $serializers[] = Redis::SERIALIZER_IGBINARY;
+        }
+        if(defined('Redis::SERIALIZER_JSON')) {
+            $serializers[] = Redis::SERIALIZER_JSON;
+        }
+
+    	foreach($serializers as $mode) {
     		$vals_enc = Array();
 
     		// Pass them through redis so they're serialized

tests/test.php

@@ -43,6 +43,7 @@ public static function run($className) {
 		$methods = $rc->GetMethods(ReflectionMethod::IS_PUBLIC);
 
 		foreach($methods as $m) {
+            if(strtolower($m->name) != 'testserializerjson') continue;
 
 			$name = $m->name;
 			if(substr($name, 0, 4) !== 'test')