WL#11960 Refactoring of the session object

Author: FilipJaniszewski

mysqlx_session.cc

@@ -127,11 +127,11 @@ ZEND_END_ARG_INFO()
 static zend_bool
 mysqlx_throw_exception_from_session_if_needed(const XMYSQLND_SESSION_DATA session)
 {
-	const unsigned int error_num = session->m->get_error_no(session);
+    const unsigned int error_num = session->get_error_no();
 	DBG_ENTER("mysqlx_throw_exception_from_session_if_needed");
 	if (error_num) {
-		MYSQLND_CSTRING sqlstate = { session->m->get_sqlstate(session) , 0 };
-		MYSQLND_CSTRING errmsg = { session->m->get_error_str(session) , 0 };
+        MYSQLND_CSTRING sqlstate = { session->get_sqlstate() , 0 };
+        MYSQLND_CSTRING errmsg = { session->get_error_str() , 0 };
 		sqlstate.l = strlen(sqlstate.s);
 		errmsg.l = strlen(errmsg.s);
 		mysqlx_new_exception(error_num, sqlstate, errmsg);
@@ -182,7 +182,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_session, getClientId)
 	MYSQLX_FETCH_SESSION_FROM_ZVAL(object, object_zv);
 
 	if (XMYSQLND_SESSION session = object->session) {
-		RETVAL_LONG(session->data->m->get_client_id(session->data));
+        RETVAL_LONG(session->data->get_client_id());
 		mysqlx_throw_exception_from_session_if_needed(session->data);
 	} else {
 		RETVAL_FALSE;
@@ -267,8 +267,8 @@ mysqlx_session_command_handler_on_error(void * context,
 											 const MYSQLND_CSTRING message)
 {
 	DBG_ENTER("mysqlx_session_command_handler_on_error");
-	if (session) {
-				session->data->m->handler_on_error(session->data.get(), code, sql_state, message);
+    if (session) {
+        xmysqlnd_session_data_handler_on_error(session->data.get(), code, sql_state, message);
 	}
 	DBG_RETURN(HND_PASS_RETURN_FAIL);
 }
@@ -567,7 +567,7 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_session, quoteName)
 	MYSQLX_FETCH_SESSION_FROM_ZVAL(object, object_zv);
 
 	if ((session = object->session)) {
-		MYSQLND_STRING quoted_name = session->data->m->quote_name(session->data, name);
+        MYSQLND_STRING quoted_name = session->data->quote_name(name);
 		RETVAL_STRINGL(quoted_name.s, quoted_name.l);
 		if (quoted_name.s) {
 			mnd_efree(quoted_name.s);

mysqlx_x_session.cc

@@ -73,11 +73,11 @@ MYSQL_XDEVAPI_PHP_METHOD(mysqlx_x_session, __construct)
 static zend_bool
 mysqlx_throw_exception_from_session_if_needed(const XMYSQLND_SESSION_DATA session)
 {
-	const unsigned int error_num = session->m->get_error_no(session);
+    const unsigned int error_num = session->get_error_no();
 	DBG_ENTER("mysqlx_throw_exception_from_session_if_needed");
 	if (error_num) {
-		MYSQLND_CSTRING sqlstate = { session->m->get_sqlstate(session) , 0 };
-		MYSQLND_CSTRING errmsg = { session->m->get_error_str(session) , 0 };
+        MYSQLND_CSTRING sqlstate = { session->get_sqlstate() , 0 };
+        MYSQLND_CSTRING errmsg = { session->get_error_str() , 0 };
 		sqlstate.l = strlen(sqlstate.s);
 		errmsg.l = strlen(errmsg.s);
 		mysqlx_new_exception(error_num, sqlstate, errmsg);

xmysqlnd/xmysqlnd_extension_plugin.cc

@@ -259,24 +259,6 @@ _xmysqlnd_session_set_methods(const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_session)
 }
 /* }}} */
 
-
-/* {{{ _xmysqlnd_session_data_get_methods */
-static const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_session_data) *
-_xmysqlnd_session_data_get_methods()
-{
-	return MYSQLND_CLASS_METHODS_INSTANCE_NAME(xmysqlnd_session_data);
-}
-/* }}} */
-
-/* {{{ _xmysqlnd_session_data_set_methods */
-static void
-_xmysqlnd_session_data_set_methods(const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_session_data) * const methods)
-{
-	MYSQLND_CLASS_METHODS_INSTANCE_NAME(xmysqlnd_session_data) = methods;
-}
-/* }}} */
-
-
 /* {{{ _xmysqlnd_schema_get_methods */
 static const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_schema) *
 _xmysqlnd_schema_get_methods()
@@ -511,10 +493,6 @@ PHP_MYSQL_XDEVAPI_API struct st_xmysqlnd_plugin_methods_xetters xmysqlnd_plugin_
 		_xmysqlnd_session_get_methods,
 		_xmysqlnd_session_set_methods,
 	},
-	{
-		_xmysqlnd_session_data_get_methods,
-		_xmysqlnd_session_data_set_methods,
-	},
 	{
 		_xmysqlnd_schema_get_methods,
 		_xmysqlnd_schema_set_methods,

xmysqlnd/xmysqlnd_extension_plugin.h

@@ -101,12 +101,6 @@ struct st_xmysqlnd_plugin_methods_xetters
 		void (*set)(const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_session) * const methods);
 	} session;
 
-	struct st_xmnd_session_data_xetters
-	{
-		const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_session_data) * (*get)();
-		void (*set)(const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_session_data) * const methods);
-	} session_data;
-
 	struct st_xmnd_schema_xetters
 	{
 		const MYSQLND_CLASS_METHODS_TYPE(xmysqlnd_schema) * (*get)();
@@ -195,9 +189,6 @@ PHP_MYSQL_XDEVAPI_API extern struct st_xmysqlnd_plugin_methods_xetters xmysqlnd_
 #define xmysqlnd_session_get_methods()				xmysqlnd_plugin_methods_xetters.session.get()
 #define xmysqlnd_session_set_methods(m)			xmysqlnd_plugin_methods_xetters.session.set((m))
 
-#define xmysqlnd_session_data_get_methods()		xmysqlnd_plugin_methods_xetters.session_data.get()
-#define xmysqlnd_session_data_set_methods(m)		xmysqlnd_plugin_methods_xetters.session_data.set((m))
-
 #define xmysqlnd_schema_get_methods()				xmysqlnd_plugin_methods_xetters.schema.get()
 #define xmysqlnd_schema_set_methods(m)				xmysqlnd_plugin_methods_xetters.schema.set((m))
 

xmysqlnd/xmysqlnd_object_factory.cc

@@ -84,7 +84,6 @@ XMYSQLND_METHOD(xmysqlnd_object_factory, get_session_data)(const MYSQLND_CLASS_M
 		DBG_RETURN(nullptr);
 	}
 	object->persistent = persistent;
-	object->m = xmysqlnd_session_data_get_methods();
 	DBG_RETURN(object);
 }
 /* }}} */