Fix big responses handling

closes gh-74
closes gh-82

Author: bigbes

src/tarantool.c

@@ -121,8 +121,8 @@ tarantool_stream_send(tarantool_object *obj TSRMLS_DC) {
  * See https://bugs.launchpad.net/tarantool/+bug/1182474
  */
 static size_t
-tarantool_stream_read(tarantool_object *obj, char *buf, size_t size) {
-	return tntll_stream_read(obj->stream, buf, size);
+tarantool_stream_read(tarantool_connection *obj, char *buf, size_t size) {
+	return tntll_stream_read2(obj->stream, buf, size);
 }
 
 static void
@@ -172,8 +172,8 @@ int __tarantool_connect(tarantool_object *obj, zval *id TSRMLS_DC) {
 				      &obj->stream, &err) == -1) {
 			continue;
 		}
-		if (tntll_stream_read(obj->stream, obj->greeting,
-				      GREETING_SIZE) == -1) {
+		if (tntll_stream_read2(obj->stream, obj->greeting,
+				       GREETING_SIZE) == -1) {
 			continue;
 		}
 		obj->salt = obj->greeting + SALT_PREFIX_SIZE;
@@ -257,7 +257,7 @@ static int64_t tarantool_step_recv(
 	*header = NULL;
 	*body = NULL;
 	if (tarantool_stream_read(obj, pack_len, 5) != 5) {
-		THROW_EXC("Can't read query from server");
+		THROW_EXC("Can't read query from server (failed to read length)");
 		goto error_con;
 	}
 	if (php_mp_check(pack_len, 5)) {
@@ -268,14 +268,15 @@ static int64_t tarantool_step_recv(
 	smart_string_ensure(obj->value, body_size);
 	if (tarantool_stream_read(obj, SSTR_POS(obj->value),
 				  body_size) != body_size) {
-		THROW_EXC("Can't read query from server");
+		THROW_EXC("Can't read query from server (failed to read %d "
+			  "bytes from server [header + body])", body_size);
 		goto error;
 	}
 	SSTR_LEN(obj->value) += body_size;
 
 	char *pos = SSTR_BEG(obj->value);
 	if (php_mp_check(pos, body_size)) {
-		THROW_EXC("Failed verifying msgpack");
+		THROW_EXC("Failed verifying header [bad msgpack]");
 		goto error;
 	}
 	if (php_mp_unpack(header, &pos) == FAILURE ||
@@ -284,7 +285,7 @@ static int64_t tarantool_step_recv(
 		goto error;
 	}
 	if (php_mp_check(pos, body_size)) {
-		THROW_EXC("Failed verifying msgpack");
+		THROW_EXC("Failed verifying body [bad msgpack]");
 		goto error_con;
 	}
 	if (php_mp_unpack(body, &pos) == FAILURE) {
@@ -591,14 +592,15 @@ int get_spaceno_by_name(tarantool_object *obj, zval *id, zval *name TSRMLS_DC) {
 
 	char pack_len[5] = {0, 0, 0, 0, 0};
 	if (tarantool_stream_read(obj, pack_len, 5) != 5) {
-		THROW_EXC("Can't read query from server");
+		THROW_EXC("Can't read query from server (failed to read length)");
 		return FAILURE;
 	}
 	size_t body_size = php_mp_unpack_package_size(pack_len);
 	smart_string_ensure(obj->value, body_size);
 	if (tarantool_stream_read(obj, obj->value->c,
 				body_size) != body_size) {
-		THROW_EXC("Can't read query from server");
+		THROW_EXC("Can't read query from server (failed to read %d "
+			  "bytes from server [header + body])", body_size);
 		return FAILURE;
 	}
 
@@ -651,14 +653,15 @@ int get_indexno_by_name(tarantool_object *obj, zval *id,
 
 	char pack_len[5] = {0, 0, 0, 0, 0};
 	if (tarantool_stream_read(obj, pack_len, 5) != 5) {
-		THROW_EXC("Can't read query from server");
+		THROW_EXC("Can't read query from server (failed to read length)");
 		return FAILURE;
 	}
 	size_t body_size = php_mp_unpack_package_size(pack_len);
 	smart_string_ensure(obj->value, body_size);
 	if (tarantool_stream_read(obj, obj->value->c,
 				body_size) != body_size) {
-		THROW_EXC("Can't read query from server");
+		THROW_EXC("Can't read query from server (failed to read %d "
+			  "bytes from server [header + body])", body_size);
 		return FAILURE;
 	}
 

src/tarantool_network.c

@@ -119,7 +119,7 @@ int tntll_stream_read2(php_stream *stream, char *buf, size_t size) {
 					    size - total_size);
 		assert(read_size + total_size <= size);
 		if (read_size <= 0)
-			 break;
+			break;
 		total_size += read_size;
 	}
 	return total_size;

test/RandomTest.php

@@ -0,0 +1,35 @@
+<?php
+
+function generateRandomString($length = 10) {
+	$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	$charactersLength = strlen($characters);
+	$randomString = '';
+	for ($i = 0; $i < $length; $i++) {
+		$randomString .= $characters[rand(0, $charactersLength - 1)];
+	}
+	return $randomString;
+}
+
+class RandomTest extends PHPUnit_Framework_TestCase
+{
+		protected static $tarantool;
+
+		public static function setUpBeforeClass() {
+			self::$tarantool = new Tarantool('localhost', getenv('PRIMARY_PORT'));
+			self::$tarantool->authenticate('test', 'test');
+			self::$tarantool->ping();
+		}
+
+		public function test_01_random_big_response() {
+			for ($i = 5000; $i < 100000; $i += 1000) {
+				$request = "do return '" . generateRandomString($i) . "' end";
+				self::$tarantool->evaluate($request);
+			}
+			$this->assertTrue(True);
+		}
+		public function test_02_very_big_response() {
+			$request = "do return '" . str_repeat('x', 1024 * 1024) . "' end";
+			self::$tarantool->evaluate($request);
+			$this->assertTrue(True);
+		}
+}

test/shared/phpunit_bas.xml

@@ -9,6 +9,7 @@
       <file>test/CreateTest.php</file>
       <file>test/MsgPackTest.php</file>
       <file>test/AssertTest.php</file>
+      <file>test/RandomTest.php</file>
     </testsuite>
   </testsuites>
 

test/shared/phpunit_tap.xml

@@ -10,6 +10,7 @@
       <file>test/CreateTest.php</file>
       <file>test/MsgPackTest.php</file>
       <file>test/AssertTest.php</file>
+      <file>test/RandomTest.php</file>
     </testsuite>
   </testsuites>