From: Dmitry Stogov Date: Tue, 14 Nov 2017 14:32:41 +0000 (+0300) Subject: Run mysqlmd commands in one step (without separate create/run/free). X-Git-Tag: php-7.3.0alpha1~1036 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d5330fbe1eab52835bb3dbf9c8dc85f31dfbc99;p=php Run mysqlmd commands in one step (without separate create/run/free). --- diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 52cc55798f..d747c5050a 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -186,11 +186,7 @@ mysqlnd_switch_to_ssl_if_needed(MYSQLND_CONN_DATA * conn, { size_t client_capabilities = mysql_flags; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_ENABLE_SSL, conn, client_capabilities, server_capabilities, charset_no); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_ENABLE_SSL, conn, client_capabilities, server_capabilities, charset_no); } DBG_RETURN(ret); } diff --git a/ext/mysqlnd/mysqlnd_commands.c b/ext/mysqlnd/mysqlnd_commands.c index 579ae25aef..5232055c90 100644 --- a/ext/mysqlnd/mysqlnd_commands.c +++ b/ext/mysqlnd/mysqlnd_commands.c @@ -29,28 +29,16 @@ struct st_mysqlnd_protocol_no_params_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_protocol_no_params_command_context { MYSQLND_CONN_DATA * conn; } context; }; -/* {{{ mysqlnd_com_no_params_free_command */ -static void -mysqlnd_com_no_params_free_command(void * command) -{ - DBG_ENTER("mysqlnd_com_no_params_free_command"); - mnd_efree(command); - DBG_VOID_RETURN; -} -/* }}} */ - /************************** COM_SET_OPTION ******************************************/ struct st_mysqlnd_protocol_com_set_option_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_set_option_context { MYSQLND_CONN_DATA * conn; @@ -60,7 +48,7 @@ struct st_mysqlnd_protocol_com_set_option_command /* {{{ mysqlnd_com_set_option_run */ -enum_func_status +static enum_func_status mysqlnd_com_set_option_run(void *cmd) { struct st_mysqlnd_protocol_com_set_option_command * command = (struct st_mysqlnd_protocol_com_set_option_command *) cmd; @@ -90,22 +78,20 @@ mysqlnd_com_set_option_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_set_option_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_set_option_create_command(va_list args) +/* {{{ mysqlnd_com_set_option_run_command */ +static enum_func_status +mysqlnd_com_set_option_run_command(va_list args) { - struct st_mysqlnd_protocol_com_set_option_command * command; - DBG_ENTER("mysqlnd_com_set_option_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_set_option_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.option = va_arg(args, enum_mysqlnd_server_option); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_set_option_run; - } + struct st_mysqlnd_protocol_com_set_option_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_set_option_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.option = va_arg(args, enum_mysqlnd_server_option); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_set_option_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -140,21 +126,19 @@ mysqlnd_com_debug_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_debug_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_debug_create_command(va_list args) +/* {{{ mysqlnd_com_debug_run_command */ +static enum_func_status +mysqlnd_com_debug_run_command(va_list args) { - struct st_mysqlnd_protocol_no_params_command * command; - DBG_ENTER("mysqlnd_com_debug_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_no_params_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->parent.free_command = mysqlnd_com_no_params_free_command; - - command->parent.run = mysqlnd_com_debug_run; - } + struct st_mysqlnd_protocol_no_params_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_debug_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_debug_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -162,7 +146,6 @@ mysqlnd_com_debug_create_command(va_list args) /************************** COM_INIT_DB ******************************************/ struct st_mysqlnd_protocol_com_init_db_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_init_db_context { MYSQLND_CONN_DATA * conn; @@ -219,22 +202,20 @@ mysqlnd_com_init_db_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_init_db_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_init_db_create_command(va_list args) +/* {{{ mysqlnd_com_init_db_run_command */ +static enum_func_status +mysqlnd_com_init_db_run_command(va_list args) { - struct st_mysqlnd_protocol_com_init_db_command * command; - DBG_ENTER("mysqlnd_com_init_db_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_init_db_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.db = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_init_db_run; - } + struct st_mysqlnd_protocol_com_init_db_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_init_db_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.db = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_init_db_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -274,21 +255,19 @@ mysqlnd_com_ping_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_ping_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_ping_create_command(va_list args) +/* {{{ mysqlnd_com_ping_run_command */ +static enum_func_status +mysqlnd_com_ping_run_command(va_list args) { - struct st_mysqlnd_protocol_no_params_command * command; - DBG_ENTER("mysqlnd_com_ping_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_no_params_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->parent.free_command = mysqlnd_com_no_params_free_command; - - command->parent.run = mysqlnd_com_ping_run; - } + struct st_mysqlnd_protocol_no_params_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_ping_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_ping_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -296,7 +275,6 @@ mysqlnd_com_ping_create_command(va_list args) /************************** COM_STATISTICS ******************************************/ struct st_mysqlnd_protocol_com_statistics_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_statistics_context { MYSQLND_CONN_DATA * conn; @@ -342,29 +320,26 @@ mysqlnd_com_statistics_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_statistics_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_statistics_create_command(va_list args) +/* {{{ mysqlnd_com_statistics_run_command */ +static enum_func_status +mysqlnd_com_statistics_run_command(va_list args) { - struct st_mysqlnd_protocol_com_statistics_command * command; - DBG_ENTER("mysqlnd_com_statistics_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_statistics_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.message = va_arg(args, zend_string **); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_statistics_run; - } + struct st_mysqlnd_protocol_com_statistics_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_statistics_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.message = va_arg(args, zend_string **); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_statistics_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_PROCESS_KILL ******************************************/ struct st_mysqlnd_protocol_com_process_kill_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_process_kill_context { MYSQLND_CONN_DATA * conn; @@ -417,30 +392,27 @@ mysqlnd_com_process_kill_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_process_kill_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_process_kill_create_command(va_list args) +/* {{{ mysqlnd_com_process_kill_run_command */ +static enum_func_status +mysqlnd_com_process_kill_run_command(va_list args) { - struct st_mysqlnd_protocol_com_process_kill_command * command; - DBG_ENTER("mysqlnd_com_process_kill_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_process_kill_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.process_id = va_arg(args, unsigned int); - command->context.read_response = va_arg(args, unsigned int)? TRUE:FALSE; - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_process_kill_run; - } + struct st_mysqlnd_protocol_com_process_kill_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_process_kill_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.process_id = va_arg(args, unsigned int); + command.context.read_response = va_arg(args, unsigned int)? TRUE:FALSE; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_process_kill_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_REFRESH ******************************************/ struct st_mysqlnd_protocol_com_refresh_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_refresh_context { MYSQLND_CONN_DATA * conn; @@ -480,22 +452,20 @@ mysqlnd_com_refresh_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_refresh_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_refresh_create_command(va_list args) +/* {{{ mysqlnd_com_refresh_run_command */ +static enum_func_status +mysqlnd_com_refresh_run_command(va_list args) { - struct st_mysqlnd_protocol_com_refresh_command * command; - DBG_ENTER("mysqlnd_com_refresh_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_refresh_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.options = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_refresh_run; - } + struct st_mysqlnd_protocol_com_refresh_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_refresh_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.options = va_arg(args, unsigned int); + + ret = mysqlnd_com_refresh_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -503,7 +473,6 @@ mysqlnd_com_refresh_create_command(va_list args) /************************** COM_SHUTDOWN ******************************************/ struct st_mysqlnd_protocol_com_shutdown_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_shutdown_context { MYSQLND_CONN_DATA * conn; @@ -543,22 +512,20 @@ mysqlnd_com_shutdown_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_shutdown_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_shutdown_create_command(va_list args) +/* {{{ mysqlnd_com_shutdown_run_command */ +static enum_func_status +mysqlnd_com_shutdown_run_command(va_list args) { - struct st_mysqlnd_protocol_com_shutdown_command * command; - DBG_ENTER("mysqlnd_com_shutdown_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_shutdown_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.level = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_shutdown_run; - } + struct st_mysqlnd_protocol_com_shutdown_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_shutdown_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.level = va_arg(args, unsigned int); + + ret = mysqlnd_com_shutdown_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -566,7 +533,6 @@ mysqlnd_com_shutdown_create_command(va_list args) /************************** COM_QUIT ******************************************/ struct st_mysqlnd_protocol_com_quit_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_quit_context { MYSQLND_CONN_DATA * conn; @@ -598,28 +564,25 @@ mysqlnd_com_quit_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_quit_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_quit_create_command(va_list args) +/* {{{ mysqlnd_com_quit_run_command */ +static enum_func_status +mysqlnd_com_quit_run_command(va_list args) { - struct st_mysqlnd_protocol_com_quit_command * command; - DBG_ENTER("mysqlnd_com_quit_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_quit_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_quit_run; - } + struct st_mysqlnd_protocol_com_quit_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_quit_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + + ret = mysqlnd_com_quit_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_QUERY ******************************************/ struct st_mysqlnd_protocol_com_query_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_query_context { MYSQLND_CONN_DATA * conn; @@ -656,29 +619,26 @@ mysqlnd_com_query_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_query_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_query_create_command(va_list args) +/* {{{ mysqlnd_com_query_run_command */ +static enum_func_status +mysqlnd_com_query_run_command(va_list args) { - struct st_mysqlnd_protocol_com_query_command * command; - DBG_ENTER("mysqlnd_com_query_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_query_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.query = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_query_run; - } + struct st_mysqlnd_protocol_com_query_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_query_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.query = va_arg(args, MYSQLND_CSTRING); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_query_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_CHANGE_USER ******************************************/ struct st_mysqlnd_protocol_com_change_user_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_change_user_context { MYSQLND_CONN_DATA * conn; @@ -712,23 +672,21 @@ mysqlnd_com_change_user_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_change_user_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_change_user_create_command(va_list args) +/* {{{ mysqlnd_com_change_user_run_command */ +static enum_func_status +mysqlnd_com_change_user_run_command(va_list args) { - struct st_mysqlnd_protocol_com_change_user_command * command; - DBG_ENTER("mysqlnd_com_change_user_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_change_user_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - command->context.silent = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_change_user_run; - } + struct st_mysqlnd_protocol_com_change_user_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_change_user_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); + command.context.silent = va_arg(args, unsigned int); + + ret = mysqlnd_com_change_user_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -736,7 +694,6 @@ mysqlnd_com_change_user_create_command(va_list args) /************************** COM_REAP_RESULT ******************************************/ struct st_mysqlnd_protocol_com_reap_result_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_reap_result_context { MYSQLND_CONN_DATA * conn; @@ -766,21 +723,19 @@ mysqlnd_com_reap_result_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_reap_result_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_reap_result_create_command(va_list args) +/* {{{ mysqlnd_com_reap_result_run_command */ +static enum_func_status +mysqlnd_com_reap_result_run_command(va_list args) { - struct st_mysqlnd_protocol_com_reap_result_command * command; - DBG_ENTER("mysqlnd_com_reap_result_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_reap_result_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_reap_result_run; - } + struct st_mysqlnd_protocol_com_reap_result_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_reap_result_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + + ret = mysqlnd_com_reap_result_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -788,7 +743,6 @@ mysqlnd_com_reap_result_create_command(va_list args) /************************** COM_STMT_PREPARE ******************************************/ struct st_mysqlnd_protocol_com_stmt_prepare_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_prepare_context { MYSQLND_CONN_DATA * conn; @@ -821,22 +775,20 @@ mysqlnd_com_stmt_prepare_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_prepare_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_prepare_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_prepare_run_command */ +static enum_func_status +mysqlnd_com_stmt_prepare_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_prepare_command * command; - DBG_ENTER("mysqlnd_com_stmt_prepare_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_prepare_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.query = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_prepare_run; - } + struct st_mysqlnd_protocol_com_stmt_prepare_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_stmt_prepare_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.query = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_stmt_prepare_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -844,7 +796,6 @@ mysqlnd_com_stmt_prepare_create_command(va_list args) /************************** COM_STMT_EXECUTE ******************************************/ struct st_mysqlnd_protocol_com_stmt_execute_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_execute_context { MYSQLND_CONN_DATA * conn; @@ -877,22 +828,20 @@ mysqlnd_com_stmt_execute_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_execute_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_execute_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_execute_run_command */ +static enum_func_status +mysqlnd_com_stmt_execute_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_execute_command * command; - DBG_ENTER("mysqlnd_com_stmt_execute_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_execute_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_execute_run; - } + struct st_mysqlnd_protocol_com_stmt_execute_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_execute_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_stmt_execute_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -900,7 +849,6 @@ mysqlnd_com_stmt_execute_create_command(va_list args) /************************** COM_STMT_FETCH ******************************************/ struct st_mysqlnd_protocol_com_stmt_fetch_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_fetch_context { MYSQLND_CONN_DATA * conn; @@ -933,22 +881,20 @@ mysqlnd_com_stmt_fetch_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_fetch_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_fetch_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_fetch_run_command */ +static enum_func_status +mysqlnd_com_stmt_fetch_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_fetch_command * command; - DBG_ENTER("mysqlnd_com_stmt_fetch_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_fetch_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_fetch_run; - } + struct st_mysqlnd_protocol_com_stmt_fetch_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_stmt_fetch_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_stmt_fetch_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -956,7 +902,6 @@ mysqlnd_com_stmt_fetch_create_command(va_list args) /************************** COM_STMT_RESET ******************************************/ struct st_mysqlnd_protocol_com_stmt_reset_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_reset_context { MYSQLND_CONN_DATA * conn; @@ -996,22 +941,20 @@ mysqlnd_com_stmt_reset_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_reset_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_reset_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_reset_run_command */ +static enum_func_status +mysqlnd_com_stmt_reset_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_reset_command * command; - DBG_ENTER("mysqlnd_com_stmt_reset_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_reset_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.stmt_id = va_arg(args, size_t); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_reset_run; - } + struct st_mysqlnd_protocol_com_stmt_reset_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_reset_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.stmt_id = va_arg(args, size_t); + + ret = mysqlnd_com_stmt_reset_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -1019,7 +962,6 @@ mysqlnd_com_stmt_reset_create_command(va_list args) /************************** COM_STMT_SEND_LONG_DATA ******************************************/ struct st_mysqlnd_protocol_com_stmt_send_long_data_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_send_long_data_context { MYSQLND_CONN_DATA * conn; @@ -1052,22 +994,20 @@ mysqlnd_com_stmt_send_long_data_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_send_long_data_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_send_long_data_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_send_long_data_run_command */ +static enum_func_status +mysqlnd_com_stmt_send_long_data_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_send_long_data_command * command; - DBG_ENTER("mysqlnd_com_stmt_send_long_data_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_send_long_data_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.payload = va_arg(args, MYSQLND_CSTRING); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_send_long_data_run; - } + struct st_mysqlnd_protocol_com_stmt_send_long_data_command command; + enum_func_status ret; - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_ENTER("mysqlnd_com_stmt_send_long_data_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.payload = va_arg(args, MYSQLND_CSTRING); + + ret = mysqlnd_com_stmt_send_long_data_run(&command); + + DBG_RETURN(ret); } /* }}} */ @@ -1075,7 +1015,6 @@ mysqlnd_com_stmt_send_long_data_create_command(va_list args) /************************** COM_STMT_CLOSE ******************************************/ struct st_mysqlnd_protocol_com_stmt_close_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_stmt_close_context { MYSQLND_CONN_DATA * conn; @@ -1110,22 +1049,20 @@ mysqlnd_com_stmt_close_run(void *cmd) /* }}} */ -/* {{{ mysqlnd_com_stmt_close_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_stmt_close_create_command(va_list args) +/* {{{ mysqlnd_com_stmt_close_run_command */ +static enum_func_status +mysqlnd_com_stmt_close_run_command(va_list args) { - struct st_mysqlnd_protocol_com_stmt_close_command * command; - DBG_ENTER("mysqlnd_com_stmt_close_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_stmt_close_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.stmt_id = va_arg(args, size_t); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_stmt_close_run; - } + struct st_mysqlnd_protocol_com_stmt_close_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_stmt_close_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.stmt_id = va_arg(args, size_t); + + ret = mysqlnd_com_stmt_close_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ @@ -1134,7 +1071,6 @@ mysqlnd_com_stmt_close_create_command(va_list args) /************************** COM_ENABLE_SSL ******************************************/ struct st_mysqlnd_protocol_com_enable_ssl_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_enable_ssl_context { MYSQLND_CONN_DATA * conn; @@ -1233,31 +1169,28 @@ close_conn: /* }}} */ -/* {{{ mysqlnd_com_enable_ssl_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_enable_ssl_create_command(va_list args) +/* {{{ mysqlnd_com_enable_ssl_run_command */ +static enum_func_status +mysqlnd_com_enable_ssl_run_command(va_list args) { - struct st_mysqlnd_protocol_com_enable_ssl_command * command; - DBG_ENTER("mysqlnd_com_enable_ssl_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_enable_ssl_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.client_capabilities = va_arg(args, size_t); - command->context.server_capabilities = va_arg(args, size_t); - command->context.charset_no = va_arg(args, unsigned int); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_enable_ssl_run; - } + struct st_mysqlnd_protocol_com_enable_ssl_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_enable_ssl_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.client_capabilities = va_arg(args, size_t); + command.context.server_capabilities = va_arg(args, size_t); + command.context.charset_no = va_arg(args, unsigned int); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + ret = mysqlnd_com_enable_ssl_run(&command); + + DBG_RETURN(ret); } /* }}} */ /************************** COM_READ_HANDSHAKE ******************************************/ struct st_mysqlnd_protocol_com_handshake_command { - struct st_mysqlnd_protocol_command parent; struct st_mysqlnd_com_handshake_context { MYSQLND_CONN_DATA * conn; @@ -1346,99 +1279,97 @@ err: /* }}} */ -/* {{{ mysqlnd_com_handshake_create_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_com_handshake_create_command(va_list args) +/* {{{ mysqlnd_com_handshake_run_command */ +static enum_func_status +mysqlnd_com_handshake_run_command(va_list args) { - struct st_mysqlnd_protocol_com_handshake_command * command; - DBG_ENTER("mysqlnd_com_handshake_create_command"); - command = mnd_ecalloc(1, sizeof(struct st_mysqlnd_protocol_com_handshake_command)); - if (command) { - command->context.conn = va_arg(args, MYSQLND_CONN_DATA *); - command->context.user = *va_arg(args, const MYSQLND_CSTRING *); - command->context.passwd = *va_arg(args, const MYSQLND_CSTRING *); - command->context.database = *va_arg(args, const MYSQLND_CSTRING *); - command->context.client_flags = va_arg(args, size_t); - - command->parent.free_command = mysqlnd_com_no_params_free_command; - command->parent.run = mysqlnd_com_handshake_run; - } + struct st_mysqlnd_protocol_com_handshake_command command; + enum_func_status ret; + + DBG_ENTER("mysqlnd_com_handshake_run_command"); + command.context.conn = va_arg(args, MYSQLND_CONN_DATA *); + command.context.user = *va_arg(args, const MYSQLND_CSTRING *); + command.context.passwd = *va_arg(args, const MYSQLND_CSTRING *); + command.context.database = *va_arg(args, const MYSQLND_CSTRING *); + command.context.client_flags = va_arg(args, size_t); + + ret = mysqlnd_com_handshake_run(&command); - DBG_RETURN((struct st_mysqlnd_protocol_command *) command); + DBG_RETURN(ret); } /* }}} */ -/* {{{ mysqlnd_get_command */ -static struct st_mysqlnd_protocol_command * -mysqlnd_get_command(enum php_mysqlnd_server_command command, ...) +/* {{{ _mysqlnd_run_command */ +static enum_func_status +_mysqlnd_run_command(enum php_mysqlnd_server_command command, ...) { - struct st_mysqlnd_protocol_command * ret; + enum_func_status ret = FAIL; va_list args; - DBG_ENTER("mysqlnd_get_command"); + DBG_ENTER("_mysqlnd_run_command"); va_start(args, command); switch (command) { case COM_SET_OPTION: - ret = mysqlnd_com_set_option_create_command(args); + ret = mysqlnd_com_set_option_run_command(args); break; case COM_DEBUG: - ret = mysqlnd_com_debug_create_command(args); + ret = mysqlnd_com_debug_run_command(args); break; case COM_INIT_DB: - ret = mysqlnd_com_init_db_create_command(args); + ret = mysqlnd_com_init_db_run_command(args); break; case COM_PING: - ret = mysqlnd_com_ping_create_command(args); + ret = mysqlnd_com_ping_run_command(args); break; case COM_STATISTICS: - ret = mysqlnd_com_statistics_create_command(args); + ret = mysqlnd_com_statistics_run_command(args); break; case COM_PROCESS_KILL: - ret = mysqlnd_com_process_kill_create_command(args); + ret = mysqlnd_com_process_kill_run_command(args); break; case COM_REFRESH: - ret = mysqlnd_com_refresh_create_command(args); + ret = mysqlnd_com_refresh_run_command(args); break; case COM_SHUTDOWN: - ret = mysqlnd_com_shutdown_create_command(args); + ret = mysqlnd_com_shutdown_run_command(args); break; case COM_QUIT: - ret = mysqlnd_com_quit_create_command(args); + ret = mysqlnd_com_quit_run_command(args); break; case COM_QUERY: - ret = mysqlnd_com_query_create_command(args); + ret = mysqlnd_com_query_run_command(args); break; case COM_REAP_RESULT: - ret = mysqlnd_com_reap_result_create_command(args); + ret = mysqlnd_com_reap_result_run_command(args); break; case COM_CHANGE_USER: - ret = mysqlnd_com_change_user_create_command(args); + ret = mysqlnd_com_change_user_run_command(args); break; case COM_STMT_PREPARE: - ret = mysqlnd_com_stmt_prepare_create_command(args); + ret = mysqlnd_com_stmt_prepare_run_command(args); break; case COM_STMT_EXECUTE: - ret = mysqlnd_com_stmt_execute_create_command(args); + ret = mysqlnd_com_stmt_execute_run_command(args); break; case COM_STMT_FETCH: - ret = mysqlnd_com_stmt_fetch_create_command(args); + ret = mysqlnd_com_stmt_fetch_run_command(args); break; case COM_STMT_RESET: - ret = mysqlnd_com_stmt_reset_create_command(args); + ret = mysqlnd_com_stmt_reset_run_command(args); break; case COM_STMT_SEND_LONG_DATA: - ret = mysqlnd_com_stmt_send_long_data_create_command(args); + ret = mysqlnd_com_stmt_send_long_data_run_command(args); break; case COM_STMT_CLOSE: - ret = mysqlnd_com_stmt_close_create_command(args); + ret = mysqlnd_com_stmt_close_run_command(args); break; case COM_ENABLE_SSL: - ret = mysqlnd_com_enable_ssl_create_command(args); + ret = mysqlnd_com_enable_ssl_run_command(args); break; case COM_HANDSHAKE: - ret = mysqlnd_com_handshake_create_command(args); + ret = mysqlnd_com_handshake_run_command(args); break; default: break; @@ -1448,7 +1379,7 @@ mysqlnd_get_command(enum php_mysqlnd_server_command command, ...) } /* }}} */ -func_mysqlnd__command_factory mysqlnd_command_factory = mysqlnd_get_command; +func_mysqlnd__run_command mysqlnd_run_command = _mysqlnd_run_command; /* * Local variables: diff --git a/ext/mysqlnd/mysqlnd_commands.h b/ext/mysqlnd/mysqlnd_commands.h index 99f21cb0f4..6c931c6d4b 100644 --- a/ext/mysqlnd/mysqlnd_commands.h +++ b/ext/mysqlnd/mysqlnd_commands.h @@ -20,7 +20,7 @@ #ifndef MYSQLND_COMMANDS_H #define MYSQLND_COMMANDS_H -extern func_mysqlnd__command_factory mysqlnd_command_factory; +extern func_mysqlnd__run_command mysqlnd_run_command; #endif /* MYSQLND_COMMANDS_H */ diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index 461a8df552..960b9f10b6 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -390,12 +390,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, set_server_option)(MYSQLND_CONN_DATA * const c enum_func_status ret = FAIL; DBG_ENTER("mysqlnd_conn_data::set_server_option"); if (PASS == conn->m->local_tx_start(conn, this_func)) { - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_SET_OPTION, conn, option); - if (command) { - ret = command->run(command); - command->free_command(command); - } - + ret = conn->run_command(COM_SET_OPTION, conn, option); conn->m->local_tx_end(conn, this_func, ret); } DBG_RETURN(ret); @@ -546,11 +541,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect_handshake)(MYSQLND_CONN_DATA * conn, PASS == conn->protocol_frame_codec->data->m.reset(conn->protocol_frame_codec, conn->stats, conn->error_info)) { size_t client_flags = mysql_flags; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_HANDSHAKE, conn, username, password, database, client_flags); - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_HANDSHAKE, conn, username, password, database, client_flags); } DBG_RETURN(ret); } @@ -891,11 +883,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_query)(MYSQLND_CONN_DATA * conn, const ch if (type == MYSQLND_SEND_QUERY_IMPLICIT || PASS == conn->m->local_tx_start(conn, this_func)) { const MYSQLND_CSTRING query_string = {query, query_len}; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_QUERY, conn, query_string); - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_QUERY, conn, query_string); if (type == MYSQLND_SEND_QUERY_EXPLICIT) { conn->m->local_tx_end(conn, this_func, ret); @@ -919,11 +908,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, reap_query)(MYSQLND_CONN_DATA * conn, enum_mys DBG_INF_FMT("conn->server_status=%u", UPSERT_STATUS_GET_SERVER_STATUS(conn->upsert_status)); if (type == MYSQLND_REAP_RESULT_IMPLICIT || PASS == conn->m->local_tx_start(conn, this_func)) { - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_REAP_RESULT, conn); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_REAP_RESULT, conn); if (type == MYSQLND_REAP_RESULT_EXPLICIT) { conn->m->local_tx_end(conn, this_func, ret); @@ -1068,12 +1053,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, dump_debug_info)(MYSQLND_CONN_DATA * const con DBG_ENTER("mysqlnd_conn_data::dump_debug_info"); DBG_INF_FMT("conn=%llu", conn->thread_id); if (PASS == conn->m->local_tx_start(conn, this_func)) { - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_DEBUG, conn); - if (command) { - ret = command->run(command); - command->free_command(command); - } - + ret = conn->run_command(COM_DEBUG, conn); conn->m->local_tx_end(conn, this_func, ret); } @@ -1094,12 +1074,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, select_db)(MYSQLND_CONN_DATA * const conn, con if (PASS == conn->m->local_tx_start(conn, this_func)) { const MYSQLND_CSTRING database = {db, db_len}; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_INIT_DB, conn, database); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_INIT_DB, conn, database); conn->m->local_tx_end(conn, this_func, ret); } DBG_RETURN(ret); @@ -1118,11 +1094,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, ping)(MYSQLND_CONN_DATA * const conn) DBG_INF_FMT("conn=%llu", conn->thread_id); if (PASS == conn->m->local_tx_start(conn, this_func)) { - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_PING, conn); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_PING, conn); conn->m->local_tx_end(conn, this_func, ret); } DBG_INF_FMT("ret=%u", ret); @@ -1142,11 +1114,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, statistic)(MYSQLND_CONN_DATA * conn, zend_stri DBG_INF_FMT("conn=%llu", conn->thread_id); if (PASS == conn->m->local_tx_start(conn, this_func)) { - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_STATISTICS, conn, message); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_STATISTICS, conn, message); conn->m->local_tx_end(conn, this_func, ret); } DBG_RETURN(ret); @@ -1168,11 +1136,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, kill)(MYSQLND_CONN_DATA * conn, unsigned int p unsigned int process_id = pid; /* 'unsigned char' is promoted to 'int' when passed through '...' */ unsigned int read_response = (pid != conn->thread_id); - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_PROCESS_KILL, conn, process_id, read_response); - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_PROCESS_KILL, conn, process_id, read_response); conn->m->local_tx_end(conn, this_func, ret); } DBG_RETURN(ret); @@ -1230,11 +1195,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, refresh)(MYSQLND_CONN_DATA * const conn, uint8 if (PASS == conn->m->local_tx_start(conn, this_func)) { unsigned int options_param = (unsigned int) options; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_REFRESH, conn, options_param); - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_REFRESH, conn, options_param); conn->m->local_tx_end(conn, this_func, ret); } DBG_RETURN(ret); @@ -1253,11 +1215,8 @@ MYSQLND_METHOD(mysqlnd_conn_data, shutdown)(MYSQLND_CONN_DATA * const conn, uint if (PASS == conn->m->local_tx_start(conn, this_func)) { unsigned int level_param = (unsigned int) level; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_SHUTDOWN, conn, level_param); - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_SHUTDOWN, conn, level_param); conn->m->local_tx_end(conn, this_func, ret); } DBG_RETURN(ret); @@ -1288,11 +1247,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, send_close)(MYSQLND_CONN_DATA * const conn) case CONN_READY: DBG_INF("Connection clean, sending COM_QUIT"); if (net_stream) { - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_QUIT, conn); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_QUIT, conn); vio->data->m.close_stream(vio, conn->stats, conn->error_info); } SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT); diff --git a/ext/mysqlnd/mysqlnd_driver.c b/ext/mysqlnd/mysqlnd_driver.c index 5ff8a0a235..73eca0ec3c 100644 --- a/ext/mysqlnd/mysqlnd_driver.c +++ b/ext/mysqlnd/mysqlnd_driver.c @@ -143,9 +143,9 @@ MYSQLND_METHOD(mysqlnd_object_factory, get_connection)(MYSQLND_CLASS_METHODS_TYP data->protocol_frame_codec = mysqlnd_pfc_init(persistent, factory, data->stats, data->error_info); data->vio = mysqlnd_vio_init(persistent, factory, data->stats, data->error_info); data->payload_decoder_factory = mysqlnd_protocol_payload_decoder_factory_init(data, persistent); - data->command_factory = mysqlnd_command_factory_get(); + data->run_command = mysqlnd_command_factory_get(); - if (!data->protocol_frame_codec || !data->vio || !data->payload_decoder_factory || !data->command_factory) { + if (!data->protocol_frame_codec || !data->vio || !data->payload_decoder_factory || !data->run_command) { new_object->m->dtor(new_object); DBG_RETURN(NULL); } diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.c b/ext/mysqlnd/mysqlnd_ext_plugin.c index 90c5ef9f5a..3ae14a73f5 100644 --- a/ext/mysqlnd/mysqlnd_ext_plugin.c +++ b/ext/mysqlnd/mysqlnd_ext_plugin.c @@ -362,19 +362,19 @@ _mysqlnd_vio_set_methods(MYSQLND_CLASS_METHODS_TYPE(mysqlnd_vio) * methods) /* {{{ mysqlnd_command_factory_get */ -static func_mysqlnd__command_factory +static func_mysqlnd__run_command _mysqlnd_command_factory_get() { - return mysqlnd_command_factory; + return mysqlnd_run_command; } /* }}} */ /* {{{ mysqlnd_command_factory_set */ static void -_mysqlnd_command_factory_set(func_mysqlnd__command_factory factory) +_mysqlnd_command_factory_set(func_mysqlnd__run_command run_command) { - mysqlnd_command_factory = factory; + mysqlnd_run_command = run_command; } /* }}} */ diff --git a/ext/mysqlnd/mysqlnd_ext_plugin.h b/ext/mysqlnd/mysqlnd_ext_plugin.h index 3a4c9dce41..99ebc49e1f 100644 --- a/ext/mysqlnd/mysqlnd_ext_plugin.h +++ b/ext/mysqlnd/mysqlnd_ext_plugin.h @@ -119,8 +119,8 @@ struct st_mysqlnd_plugin_methods_xetters struct st_mnd_command_factory_xetters { - func_mysqlnd__command_factory (*get)(); - void (*set)(func_mysqlnd__command_factory factory); + func_mysqlnd__run_command (*get)(); + void (*set)(func_mysqlnd__run_command factory); } command_factory; }; diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 9af36ac5b6..b41f125f6a 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -400,11 +400,8 @@ MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const { enum_func_status ret = FAIL; const MYSQLND_CSTRING query_string = {query, query_len}; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_STMT_PREPARE, conn, query_string); - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_STMT_PREPARE, conn, query_string); if (FAIL == ret) { goto fail; } @@ -713,12 +710,8 @@ MYSQLND_METHOD(mysqlnd_stmt, send_execute)(MYSQLND_STMT * const s, const enum_my ret = s->m->generate_execute_request(s, &request, &request_len, &free_request); if (ret == PASS) { const MYSQLND_CSTRING payload = {(const char*) request, request_len}; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_STMT_EXECUTE, conn, payload); - ret = FAIL; - if (command) { - ret = command->run(command); - command->free_command(command); - } + + ret = conn->run_command(COM_STMT_EXECUTE, conn, payload); } else { SET_CLIENT_ERROR(stmt->error_info, CR_UNKNOWN_ERROR, UNKNOWN_SQLSTATE, "Couldn't generate the request. Possibly OOM."); } @@ -1047,16 +1040,10 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, const unsigned { const MYSQLND_CSTRING payload = {(const char*) buf, sizeof(buf)}; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_STMT_FETCH, conn, payload); - ret = FAIL; - if (command) { - ret = command->run(command); - command->free_command(command); - if (ret == FAIL) { - COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); - } - } - if (FAIL == ret) { + + ret = conn->run_command(COM_STMT_FETCH, conn, payload); + if (ret == FAIL) { + COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); DBG_RETURN(FAIL); } @@ -1261,15 +1248,10 @@ MYSQLND_METHOD(mysqlnd_stmt, reset)(MYSQLND_STMT * const s) if (GET_CONNECTION_STATE(&conn->state) == CONN_READY) { size_t stmt_id = stmt->stmt_id; - struct st_mysqlnd_protocol_command * command = stmt->conn->command_factory(COM_STMT_RESET, stmt->conn, stmt_id); - ret = FAIL; - if (command) { - ret = command->run(command); - command->free_command(command); - if (ret == FAIL) { - COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); - } + ret = stmt->conn->run_command(COM_STMT_RESET, stmt->conn, stmt_id); + if (ret == FAIL) { + COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); } } *stmt->upsert_status = *conn->upsert_status; @@ -1372,14 +1354,10 @@ MYSQLND_METHOD(mysqlnd_stmt, send_long_data)(MYSQLND_STMT * const s, unsigned in /* COM_STMT_SEND_LONG_DATA doesn't acknowledge with an OK packet */ { const MYSQLND_CSTRING payload = {(const char *) cmd_buf, packet_len}; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_STMT_SEND_LONG_DATA, conn, payload); - ret = FAIL; - if (command) { - ret = command->run(command); - command->free_command(command); - if (ret == FAIL) { - COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); - } + + ret = conn->run_command(COM_STMT_SEND_LONG_DATA, conn, payload); + if (ret == FAIL) { + COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); } } @@ -2207,16 +2185,10 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, close_on_server)(MYSQLND_STMT * const s, ze if (GET_CONNECTION_STATE(&conn->state) == CONN_READY) { enum_func_status ret = FAIL; size_t stmt_id = stmt->stmt_id; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_STMT_CLOSE, conn, stmt_id); - if (command) { - ret = command->run(command); - command->free_command(command); - if (ret == FAIL) { - COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); - } - } + ret = conn->run_command(COM_STMT_CLOSE, conn, stmt_id); if (ret == FAIL) { + COPY_CLIENT_ERROR(stmt->error_info, *conn->error_info); DBG_RETURN(FAIL); } } diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 15b8f9a09a..094fdf9bed 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -845,13 +845,7 @@ struct st_mysqlnd_vio -struct st_mysqlnd_protocol_command -{ - enum_func_status (*run)(void *cmd); - void (*free_command)(void * cmd); -}; - -typedef struct st_mysqlnd_protocol_command * (*func_mysqlnd__command_factory)(enum php_mysqlnd_server_command command, ...); +typedef enum_func_status (*func_mysqlnd__run_command)(enum php_mysqlnd_server_command command, ...); @@ -939,7 +933,7 @@ struct st_mysqlnd_connection_data zend_bool in_async_err_cb; MYSQLND_CLASS_METHODS_TYPE(mysqlnd_object_factory) object_factory; - func_mysqlnd__command_factory command_factory; + func_mysqlnd__run_command run_command; MYSQLND_CLASS_METHODS_TYPE(mysqlnd_conn_data) * m; diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index 7b0c127117..b38fb32b42 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -619,12 +619,8 @@ size_t php_mysqlnd_auth_write(MYSQLND_CONN_DATA * conn, void * _packet) enum_func_status ret = FAIL; const MYSQLND_CSTRING payload = {(char*) buffer + MYSQLND_HEADER_SIZE, p - (buffer + MYSQLND_HEADER_SIZE)}; const unsigned int silent = packet->silent; - struct st_mysqlnd_protocol_command * command = conn->command_factory(COM_CHANGE_USER, conn, payload, silent); - if (command) { - ret = command->run(command); - command->free_command(command); - } + ret = conn->run_command(COM_CHANGE_USER, conn, payload, silent); DBG_RETURN(ret == PASS? (p - buffer - MYSQLND_HEADER_SIZE) : 0); } else { size_t sent = pfc->data->m.send(pfc, vio, buffer, p - buffer - MYSQLND_HEADER_SIZE, stats, error_info);