Merge lp:~xavier+ubuntu/mydumper/mydumper into lp:mydumper

[Xavier G.]

A few months ago, I needed to specify the wait_timeout parameter when loading a database (mydumper enforces it but myloader does not). That day, I simply patched and recompiled myloader so it works for me and took note that I should report a fix for that issue.
Initially, I wanted to implement a --wait-timeout option but it quickly occurred to me that it would be more practical to enable users to insert their own SQL statements after connection to database is established. That is why I have implemented a --init-command switch, which can be used to insert one or several custom commands before mydumper and myloader actually perform their job.

Example: myloader -o -h mysqlserver -u me -p $password -B dbname -d dbname/ \
           --init-command='SET SESSION net_write_timeout = 2147483' \
           --init-command='SET GLOBAL SESSION wait_timeout = 2147483'

Unmerged revisions

171. By Xavier G. <email address hidden> on 2015-03-18

Add the "--init-command" option.

=== modified file 'common.h'
--- common.h	2011-05-16 13:52:26 +0000
+++ common.h	2015-03-18 12:25:28 +0000
@@ -17,6 +17,7 @@
 #ifndef _common_h
 #define _common_h
 
+char **init_commands=NULL;
 char *hostname=NULL;
 char *username=NULL;
 char *password=NULL;
@@ -30,6 +31,7 @@
 
 GOptionEntry common_entries[] =
 {
+        { "init-command", 0, 0, G_OPTION_ARG_STRING_ARRAY, &init_commands, "Custom initial command; may appear more than once on the command line", NULL },
         { "host", 'h', 0, G_OPTION_ARG_STRING, &hostname, "The host to connect to", NULL },
         { "user", 'u', 0, G_OPTION_ARG_STRING, &username, "Username with privileges to run the dump", NULL },
         { "password", 'p', 0, G_OPTION_ARG_STRING, &password, "User password", NULL },

=== modified file 'docs/mydumper_usage.rst'
--- docs/mydumper_usage.rst	2015-03-13 15:03:16 +0000
+++ docs/mydumper_usage.rst	2015-03-18 12:25:28 +0000
@@ -56,6 +56,11 @@
 
    The UNIX domain socket file to use for the connection
 
+.. option:: --init-command
+
+   Run the given SQL query after connection was established. May appear more
+   than once on the command line.
+
 .. option:: --database, -B
 
    Database to dump

=== modified file 'docs/myloader_usage.rst'
--- docs/myloader_usage.rst	2015-03-13 15:03:16 +0000
+++ docs/myloader_usage.rst	2015-03-18 12:25:28 +0000
@@ -49,6 +49,11 @@
 
    The UNIX domain socket file to use for the connection
 
+.. option:: --init-command
+
+   Run the given SQL query after connection was established. May appear more
+   than once on the command line.
+
 .. option:: --threads, -t
 
    The number of threads to use for restoring data, default is 4

=== modified file 'mydumper.c'
--- mydumper.c	2015-03-16 19:04:52 +0000
+++ mydumper.c	2015-03-18 12:25:28 +0000
@@ -191,6 +191,7 @@
 MYSQL *create_main_connection();
 void *exec_thread(void *data);
 void write_log_file(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
+void run_init_commands(MYSQL *c);
 
 void no_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data) {
 	(void) log_domain;
@@ -409,6 +410,8 @@
 	}
 	mysql_query(thrconn, "/*!40101 SET NAMES binary*/");
 
+	run_init_commands(thrconn);
+
 	g_async_queue_push(conf->ready,GINT_TO_POINTER(1));
 
 	struct job* job= NULL;
@@ -584,6 +587,8 @@
 	}
 	mysql_query(thrconn, "/*!40101 SET NAMES binary*/");
 
+	run_init_commands(thrconn);
+
 	g_async_queue_push(conf->ready_less_locking,GINT_TO_POINTER(1));
 
 	struct job* job= NULL;
@@ -894,6 +899,17 @@
 	exit(errors ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
+void run_init_commands(MYSQL *c) {
+	int i;
+	if (init_commands == NULL) {
+		return;
+	}
+
+	for (i = 0; init_commands[i]; i++) {
+		mysql_query(c, init_commands[i]);
+	}
+}
+
 MYSQL *create_main_connection()
 {
 	MYSQL *conn;
@@ -914,6 +930,8 @@
 		g_warning("Failed to increase net_write_timeout: %s", mysql_error(conn));
 	}
 
+	run_init_commands(conn);
+
 	switch (detected_server) {
 		case SERVER_TYPE_MYSQL:
 			g_message("Connected to a MySQL server");
@@ -973,6 +991,8 @@
 		exit(EXIT_FAILURE);
 	}
 
+	run_init_commands(conn);
+
 	mysql_query(conn,"SHOW MASTER STATUS");
 	master= mysql_store_result(conn);
 	if (master && (row= mysql_fetch_row(master))) {

=== modified file 'myloader.c'
--- myloader.c	2015-03-16 19:52:34 +0000
+++ myloader.c	2015-03-18 12:25:28 +0000
@@ -53,6 +53,7 @@
 void no_log(const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
 void set_verbose(guint verbosity);
 void create_database(MYSQL *conn, gchar *database);
+void run_init_commands(MYSQL *c);
 
 static GOptionEntry entries[] =
 {
@@ -143,6 +144,9 @@
 		mysql_query(conn, "SET SQL_LOG_BIN=0");
 
 	mysql_query(conn, "/*!40014 SET FOREIGN_KEY_CHECKS=0*/");
+
+	run_init_commands(conn);
+
 	conf.queue= g_async_queue_new();
 	conf.ready= g_async_queue_new();
 
@@ -336,6 +340,17 @@
 	return;
 }
 
+void run_init_commands(MYSQL *c) {
+	int i;
+	if (init_commands == NULL) {
+		return;
+	}
+
+	for (i = 0; init_commands[i]; i++) {
+		mysql_query(c, init_commands[i]);
+	}
+}
+
 void add_schema(const gchar* filename, MYSQL *conn) {
 	// 0 is database, 1 is table with -schema on the end
 	gchar** split_file= g_strsplit(filename, ".", 0);
@@ -413,6 +428,8 @@
 	mysql_query(thrconn, "/*!40014 SET UNIQUE_CHECKS=0 */");
 	mysql_query(thrconn, "SET autocommit=0");
 
+	run_init_commands(thrconn);
+
 	g_async_queue_push(conf->ready, GINT_TO_POINTER(1));
 
 	struct job* job= NULL;