Add support for namespaces and alternative name for Tarantool class

Namespaces:
* Tarantool                 -> Tarantool\Connection
* TarantoolException        -> Tarantool\Exception
* TarantoolIOException      -> Tarantool\Exception\IOException
* TarantoolParsingException -> Tarantool\Exception\ParsingException
* TarantoolClientError      -> Tarantool\Exception\ClientError

* Tarantool            -> Tarantool16
* Tarantool\Connection -> Tarantool\Connection16

Author: bigbes

src/php_tarantool.h

@@ -79,6 +79,8 @@ PHP_METHOD(Tarantool, flush_schema);
 
 ZEND_BEGIN_MODULE_GLOBALS(tarantool)
 	zend_bool persistent;
+	zend_bool use_namespace;
+	zend_bool connection_alias;
 	long sync_counter;
 	long retry_count;
 	double retry_sleep;
@@ -115,6 +117,11 @@ typedef struct tarantool_object {
 typedef struct tarantool_connection tarantool_connection;
 
 PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_ce(void);
+PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_exception(void);
+PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_ioexception(void);
+PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_clienterror(void);
+PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_parsingexception(void);
+PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_exception_base(int root TSRMLS_DC);
 
 #ifdef ZTS
 #  define TARANTOOL_G(v) TSRMG(tarantool_globals_id, zend_tarantool_globals *, v)

src/tarantool.c

@@ -3,6 +3,7 @@
 #include <limits.h>
 
 #include "php_tarantool.h"
+#include "tarantool_internal.h"
 
 #include "tarantool_tp.h"
 #include "tarantool_proto.h"
@@ -98,9 +99,15 @@ zend_module_entry tarantool_module_entry = {
 };
 
 PHP_INI_BEGIN()
-	STD_PHP_INI_ENTRY("tarantool.persistent", "0", PHP_INI_ALL,
-			  OnUpdateBool, persistent, zend_tarantool_globals,
-			  tarantool_globals)
+	STD_PHP_INI_BOOLEAN("tarantool.persistent", "0", PHP_INI_ALL,
+			    OnUpdateBool, persistent, zend_tarantool_globals,
+			    tarantool_globals)
+	STD_PHP_INI_BOOLEAN("tarantool.use_namespace", "0", PHP_INI_SYSTEM,
+			    OnUpdateBool, use_namespace,
+			    zend_tarantool_globals, tarantool_globals)
+	STD_PHP_INI_BOOLEAN("tarantool.connection_alias", "0", PHP_INI_SYSTEM,
+			    OnUpdateBool, connection_alias,
+			    zend_tarantool_globals, tarantool_globals)
 	STD_PHP_INI_ENTRY("tarantool.timeout", "10.0", PHP_INI_ALL,
 			  OnUpdateReal, timeout, zend_tarantool_globals,
 			  tarantool_globals)
@@ -938,7 +945,7 @@ static void php_tarantool_init_globals(zend_tarantool_globals *tarantool_globals
 	tarantool_globals->sync_counter    = 0;
 	tarantool_globals->retry_count     = 1;
 	tarantool_globals->retry_sleep     = 0.1;
-	tarantool_globals->timeout         = 10.0;
+	tarantool_globals->timeout         = 1.0;
 	tarantool_globals->request_timeout = 10.0;
 }
 
@@ -982,7 +989,15 @@ PHP_MINIT_FUNCTION(tarantool) {
 	zend_class_entry tarantool_class;
 
 	/* Initialize class entry */
-	INIT_CLASS_ENTRY(tarantool_class, "Tarantool", Tarantool_methods);
+	if (TARANTOOL_G(connection_alias)) {
+		TNT_INIT_CLASS_ENTRY(tarantool_class, "Tarantool16",
+				     "Tarantool\\Connection16",
+				     Tarantool_methods);
+	} else {
+		TNT_INIT_CLASS_ENTRY(tarantool_class, "Tarantool",
+				     "Tarantool\\Connection",
+				     Tarantool_methods);
+	}
 	tarantool_class.create_object = tarantool_create;
 	Tarantool_ptr = zend_register_internal_class(&tarantool_class);
 	/* Initialize object handlers */

src/tarantool_exception.c

@@ -1,5 +1,9 @@
 #include "php_tarantool.h"
 
+#include "tarantool_internal.h"
+
+#include "tarantool_exception.h"
+
 zend_class_entry *TarantoolException_ptr;
 zend_class_entry *TarantoolIOException_ptr;
 zend_class_entry *TarantoolClientError_ptr;
@@ -112,22 +116,28 @@ ZEND_MINIT_FUNCTION(tarantool_exception) {
 	zend_class_entry tarantool_client_er_class;
 	zend_class_entry tarantool_parsing_xc_class;
 
-	INIT_CLASS_ENTRY(tarantool_xc_class, "TarantoolException", NULL);
+	TNT_INIT_CLASS_ENTRY(tarantool_xc_class, "TarantoolException",
+			     "Tarantool\\Exception", NULL);
 	TarantoolException_ptr = zend_register_internal_class_ex(
 			&tarantool_xc_class,
 			php_tarantool_get_exception_base(0)
 	);
-	INIT_CLASS_ENTRY(tarantool_io_xc_class, "TarantoolIOException", NULL);
+	TNT_INIT_CLASS_ENTRY(tarantool_io_xc_class, "TarantoolIOException",
+			     "Tarantool\\Exception\\IOException", NULL);
 	TarantoolIOException_ptr = zend_register_internal_class_ex(
 			&tarantool_io_xc_class,
 			TarantoolException_ptr
 	);
-	INIT_CLASS_ENTRY(tarantool_client_er_class, "TarantoolClientError", NULL);
+	TNT_INIT_CLASS_ENTRY(tarantool_client_er_class, "TarantoolClientError",
+			     "Tarantool\\Exception\\ClientError", NULL);
 	TarantoolClientError_ptr = zend_register_internal_class_ex(
 			&tarantool_client_er_class,
 			TarantoolException_ptr
 	);
-	INIT_CLASS_ENTRY(tarantool_parsing_xc_class, "TarantoolParsingException", NULL);
+	TNT_INIT_CLASS_ENTRY(tarantool_parsing_xc_class,
+			     "TarantoolParsingException",
+			     "Tarantool\\Exception\\ParsingException",
+			     NULL);
 	TarantoolParsingException_ptr = zend_register_internal_class_ex(
 			&tarantool_parsing_xc_class,
 			TarantoolException_ptr

src/tarantool_exception.h

@@ -6,12 +6,6 @@ extern zend_class_entry *TarantoolIOException_ptr;
 extern zend_class_entry *TarantoolClientError_ptr;
 extern zend_class_entry *TarantoolParsingException_ptr;
 
-PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_exception(void);
-PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_ioexception(void);
-PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_clienterror(void);
-PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_parsingexception(void);
-PHP_TARANTOOL_API zend_class_entry *php_tarantool_get_exception_base(int root TSRMLS_DC);
-
 zend_object *tarantool_throw_exception(const char *fmt, ...);
 zend_object *tarantool_throw_ioexception(const char *fmt, ...);
 zend_object *tarantool_throw_clienterror(uint32_t code, const char *err,

src/tarantool_internal.h

@@ -0,0 +1,13 @@
+#ifndef   PHP_TNT_INTERNAL_H
+#define   PHP_TNT_INTERNAL_H
+
+#define TNT_INIT_CLASS_ENTRY(ce, name, name_ns, methods)			\
+	if (TARANTOOL_G(use_namespace)) {					\
+		printf("%s", name_ns);						\
+		INIT_CLASS_ENTRY(ce, name_ns, methods);				\
+	} else {								\
+		printf("%s", name);						\
+		INIT_CLASS_ENTRY(ce, name, methods);				\
+	}
+
+#endif /* PHP_TNT_INTERNAL_H */

src/tarantool_network.c

@@ -73,6 +73,7 @@ int tntll_stream_open(const char *host, int port, zend_string *pid,
 	if (pid) options |= STREAM_OPEN_PERSISTENT;
 	flags = STREAM_XPORT_CLIENT | STREAM_XPORT_CONNECT;
 	double_to_tv(TARANTOOL_G(timeout), &tv);
+	// printf("'tm - %lu, %lu' ", tv.tv_sec, tv.tv_usec);
 
 	const char *pid_str = pid == NULL ? NULL : pid->val;
 	stream = php_stream_xport_create(addr, addr_len, options, flags,
@@ -88,6 +89,8 @@ int tntll_stream_open(const char *host, int port, zend_string *pid,
 
 	/* Set READ_TIMEOUT */
 	double_to_tv(TARANTOOL_G(request_timeout), &tv);
+	// printf("'rtv - %lu, %lu' ", tv.tv_sec, tv.tv_usec);
+
 	if (tv.tv_sec != 0 || tv.tv_usec != 0) {
 		php_stream_set_option(stream, PHP_STREAM_OPTION_READ_TIMEOUT,
 				      0, &tv);

src/tarantool_schema.c

@@ -368,8 +368,7 @@ schema_add_space(
 				goto error;
 			break;
 		default:
-			/* unreacheable */
-			assert(false);
+			break;
 		}
 	}
 	space_string->index_hash = mh_schema_index_new();
@@ -487,8 +486,7 @@ static inline int schema_add_index(
 				goto error;
 			break;
 		default:
-			/* unreacheable */
-			assert(false);
+			break;
 		}
 	}
 	mh_int_t space_slot = mh_schema_space_find(schema, &space_key, NULL);