More code testing

Added test that verifies a variety of things:
- the following queries run as expected:
  * SELECT LAST_INSERT_ID()
  * SELECT LAST_INSERT_ID() LIMIT 1
  * SELECT @@IDENTITY
  * SELECT CONNECTION_ID()
- that killing backend connections works

Author: renecannao

test/tap/tap/utils.cpp

@@ -157,6 +157,55 @@ int read_pipe(int pipe_fd, std::string& sbuffer) {
 	return res;
 }
 
+int add_more_rows_test_sbtest1(int num_rows, MYSQL *mysql) {
+	std::random_device rd;
+	std::mt19937 mt(rd());
+	std::uniform_int_distribution<int> dist(0.0, 9.0);
+
+	diag("Creating %d rows in sbtest1", num_rows);
+	while (num_rows) {
+		std::stringstream q;
+
+		q << "INSERT INTO test.sbtest1 (k, c, pad) values ";
+		bool put_comma = false;
+		int i=0;
+		for (i=0; i<num_rows && i<20+rand()%50 ; ++i) {
+			num_rows--;
+			int k = dist(mt);
+			std::stringstream c;
+			for (int j=0; j<10; j++) {
+				for (int k=0; k<11; k++) {
+					c << dist(mt);
+				}
+				if (j<9)
+					c << "-";
+			}
+			std::stringstream pad;
+			for (int j=0; j<5; j++) {
+				for (int k=0; k<11; k++) {
+					pad << dist(mt);
+				}
+				if (j<4)
+					pad << "-";
+			}
+			if (put_comma) q << ",";
+			if (!put_comma) put_comma=true;
+			q << "(" << k << ",'" << c.str() << "','" << pad.str() << "')";
+		}
+		MYSQL_QUERY(mysql, q.str().c_str());
+		diag("Inserted %d rows ...", i);
+	}
+	diag("Done!");
+	return 0;
+}
+int create_table_test_sbtest1(int num_rows, MYSQL *mysql) {
+	MYSQL_QUERY(mysql, "CREATE DATABASE IF NOT EXISTS test");
+	MYSQL_QUERY(mysql, "DROP TABLE IF EXISTS test.sbtest1");
+	MYSQL_QUERY(mysql, "CREATE TABLE if not exists test.sbtest1 (`id` int(10) unsigned NOT NULL AUTO_INCREMENT, `k` int(10) unsigned NOT NULL DEFAULT '0', `c` char(120) NOT NULL DEFAULT '', `pad` char(60) NOT NULL DEFAULT '',  PRIMARY KEY (`id`), KEY `k_1` (`k`))");
+
+	return add_more_rows_test_sbtest1(num_rows, mysql);
+}
+
 int wexecvp(const std::string& file, const std::vector<const char*>& argv, const to_opts* opts, std::string& s_stdout, std::string& s_stderr) {
 	// Pipes definition
 	constexpr uint8_t NUM_PIPES = 3;

test/tap/tap/utils.h

@@ -3,6 +3,8 @@
 
 #include <mysql.h>
 #include <string>
+#include <random>
+#include <sstream>
 #include <vector>
 
 #define MYSQL_QUERY(mysql, query) \
@@ -66,4 +68,8 @@ int execvp(const std::string& file, const std::vector<const char*>& argv, std::s
  */
 int exec(const std::string& cmd, std::string& result);
 
+// create table test.sbtest1 with num_rows rows
+int create_table_test_sbtest1(int num_rows, MYSQL *mysql);
+int add_more_rows_test_sbtest1(int num_rows, MYSQL *mysql);
+
 #endif // #define UTILS_H

test/tap/tests/kill_connection-t.cpp

@@ -0,0 +1,133 @@
+#include <vector>
+#include <string>
+#include <stdio.h>
+#include <cstring>
+#include <unistd.h>
+#include <mysql.h>
+
+#include "tap.h"
+#include "command_line.h"
+#include "utils.h"
+
+
+/*
+This test verifies a variety of things:
+- the following queries run as expected:
+  * SELECT LAST_INSERT_ID()
+  * SELECT LAST_INSERT_ID() LIMIT 1
+  * SELECT @@IDENTITY
+  * SELECT CONNECTION_ID()
+- that killing backend connections works
+*/
+
+const int NUM_CONNS = 5;
+
+int run_q(MYSQL *mysql, const char *q) {
+	MYSQL_QUERY(mysql,q);
+	return 0;
+}
+
+int main(int argc, char** argv) {
+	CommandLine cl;
+
+	int np = NUM_CONNS ; // for last insert id
+	np += NUM_CONNS -1 ;	// to compare all last insert id
+	np += NUM_CONNS ;	// to get connection id
+	np += NUM_CONNS -1 ;	// failed query on killed connection
+
+	plan(np);
+
+	if (cl.getEnv()) {
+		diag("Failed to get the required environmental variables.");
+		return -1;
+	}
+
+	MYSQL * conns[NUM_CONNS];
+	unsigned long long last_id[NUM_CONNS];
+	unsigned long mythreadid[NUM_CONNS];
+	for (int i = 0; i < NUM_CONNS ; i++) {
+		MYSQL * mysql = mysql_init(NULL);
+		if (!mysql) {
+			fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(mysql));
+			return exit_status();
+		}
+
+		if (!mysql_real_connect(mysql, cl.host, cl.username, cl.password, NULL, cl.port, NULL, 0)) {
+			fprintf(stderr, "File %s, line %d, Error: %s\n", __FILE__, __LINE__, mysql_error(mysql));
+			return exit_status();
+		}
+		conns[i] = mysql;
+	}
+
+	for (int i = 0; i < NUM_CONNS ; i++) {
+		MYSQL * mysql = conns[i];
+		if (i == 0) {
+			if (create_table_test_sbtest1(100,mysql)) {
+				fprintf(stderr, "File %s, line %d, Error: create_table_test_sbtest1() failed\n", __FILE__, __LINE__);
+				return exit_status();
+			}
+		} else {
+			if (add_more_rows_test_sbtest1(100,mysql)) {
+				fprintf(stderr, "File %s, line %d, Error: add_more_rows_sbtest1() failed\n", __FILE__, __LINE__);
+				return exit_status();
+			}
+		}
+		unsigned long long a, b, c;
+		unsigned long tid;
+		MYSQL_ROW row;
+		MYSQL_QUERY(mysql, "SELECT LAST_INSERT_ID()");
+		MYSQL_RES* proxy_res = mysql_store_result(mysql);
+		while ((row = mysql_fetch_row(proxy_res))) {
+			a = atoll(row[0]);
+		}
+		mysql_free_result(proxy_res);
+		MYSQL_QUERY(mysql, "SELECT LAST_INSERT_ID() LIMIT 1");
+		proxy_res = mysql_store_result(mysql);
+		while ((row = mysql_fetch_row(proxy_res))) {
+			b = atoll(row[0]);
+		}
+		mysql_free_result(proxy_res);
+		MYSQL_QUERY(mysql, "SELECT @@IDENTITY");
+		proxy_res = mysql_store_result(mysql);
+		while ((row = mysql_fetch_row(proxy_res))) {
+			c = atoll(row[0]);
+		}
+		mysql_free_result(proxy_res);
+		// the 3 queries above should all return the same result
+		ok(a > 0 && a == b && b == c && a == mysql_insert_id(mysql), "LAST_INSERT_ID: %llu , LAST_INSERT_ID_LIMIT1: %llu , IDENTITY: %llu , mysql_insert_id: %llu", a, b, c, mysql_insert_id(mysql));
+		last_id[i] = a;
+	}
+
+	for (int i = 1; i < NUM_CONNS ; i++) {
+		ok(last_id[i-1] < last_id[i], "%llu < %llu" , last_id[i-1] , last_id[i]);
+	}
+
+	for (int i = 0; i < NUM_CONNS ; i++) {
+		MYSQL * mysql = conns[i];
+		unsigned long tid;
+		MYSQL_ROW row;
+		MYSQL_QUERY(mysql, "SELECT CONNECTION_ID()");
+		MYSQL_RES * proxy_res = mysql_store_result(mysql);
+		while ((row = mysql_fetch_row(proxy_res))) {
+			tid = atoll(row[0]);
+		}
+		mysql_free_result(proxy_res);
+		ok(tid == mysql_thread_id(mysql), "tid: %lu, mysql_thread_id(): %lu", tid, mysql_thread_id(mysql));
+		mythreadid[i] = tid;
+	}
+	for (int i = 0; i < NUM_CONNS ; i++) {
+		MYSQL * mysql = conns[i];
+		if (i == 0) {
+			for (int j = 1 ; j < NUM_CONNS; j++) {
+				std::string s = "KILL CONNECTION " + std::to_string(mythreadid[j]);
+				diag("Running: %s", s.c_str());
+				MYSQL_QUERY(mysql, s.c_str());
+			}
+		} else {
+			int rc = run_q(mysql, "DO 1");
+			ok(rc != 0, "Connection killed");
+		}
+	}
+
+	return exit_status();
+}