libtransport.git Changeset - 9b5ec6eedb5a

Changeset - 9b5ec6eedb5a

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Vitaly Takmazov - 7 years ago 2018-09-17 08:17:26
vitalyster@gmail.com

MySQLBackend: prepared statement results buffering, fixes #183

* cleanup unused code
* use mysql error constants instead of magic numbers

2 files changed with 7 insertions and 49 deletions:

include/transport/MySQLBackend.h

libtransport/MySQLBackend.cpp

0 comments (0 inline, 0 general)

include/transport/MySQLBackend.h

➞

Show inline comments

@@ @@ -23,13 +23,14 @@ @@
 #ifdef WITH_MYSQL
 #include <string>
 #include <map>
 #include "transport/StorageBackend.h"
 #include "transport/Config.h"
 #include "mysql.h"
 #include <mysql/mysql.h>
 #include <mysql/errmsg.h>
 namespace Transport {
 /// Used to store transport data into SQLite3 database.
 class MySQLBackend : public StorageBackend
+{

libtransport/MySQLBackend.cpp

➞

Show inline comments

@@ @@ -22,64 +22,18 @@ @@
 #include "transport/MySQLBackend.h"
 #include "transport/Util.h"
 #include "transport/Logging.h"
 #include <boost/bind.hpp>
 #define MYSQL_DB_VERSION 2
 #define CHECK_DB_RESPONSE(stmt) \
 	if(stmt) { \
 		sqlite3_EXEC(m_db, "ROLLBACK;", NULL, NULL, NULL); \
 		return 0; \
+	}
 // Prepare the SQL statement
 #define PREP_STMT(sql, str) \
 	sql = mysql_stmt_init(&m_conn);\
 	if (mysql_stmt_prepare(sql, std::string(str).c_str(), std::string(str).size())) {\
 		LOG4CXX_ERROR(logger, str << " " << mysql_error(&m_conn)); \
 		return false; \
+	}
 // Finalize the prepared statement
 #define FINALIZE_STMT(prep) \
 	if(prep != NULL) { \
 		mysql_stmt_close(prep); \
+	}
 #define BEGIN(STATEMENT, SIZE) 	MYSQL_BIND STATEMENT##_bind[SIZE]; \
 							memset(STATEMENT##_bind, 0, sizeof(STATEMENT##_bind)); \
 							int STATEMENT##_id = 1;\
 							int STATEMENT##_id_get = 0;\
 							(void)STATEMENT##_id_get;
 #define BIND_INT(STATEMENT, VARIABLE) STATEMENT##_bind[STATEMENT##_id].buffer_type= MYSQL_TYPE_LONG;\
 							STATEMENT##_bind[STATEMENT##_id].buffer= (char *)&VARIABLE;\
 							STATEMENT##_bind[STATEMENT##_id].is_null= 0;\
 							STATEMENT##_bind[STATEMENT##_id++].length= 0;
 #define BIND_STR(STATEMENT, VARIABLE) STATEMENT##_bind[STATEMENT##_id].buffer_type= MYSQL_TYPE_STRING;\
 							STATEMENT##_bind[STATEMENT##_id].buffer= VARIABLE.c_str();\
 							STATEMENT##_bind[STATEMENT##_id].buffer_length= STRING_SIZE;\
 							STATEMENT##_bind[STATEMENT##_id].is_null= 0;\
 							STATEMENT##_bind[STATEMENT##_id++].length= VARIABLE.size();
 #define RESET_GET_COUNTER(STATEMENT)	STATEMENT##_id_get = 0;
 #define GET_INT(STATEMENT)	sqlite3_column_int(STATEMENT, STATEMENT##_id_get++)
 #define GET_STR(STATEMENT)	(const char *) sqlite3_column_text(STATEMENT, STATEMENT##_id_get++)
 #define EXECUTE_STATEMENT(STATEMENT, NAME) if (mysql_stmt_bind_param(STATEMENT, STATEMENT##_bind)) { \
 		LOG4CXX_ERROR(logger, NAME << " " << mysql_error(&m_conn)); \
 	} \
 	if (mysql_stmt_execute(STATEMENT)) { \
 		LOG4CXX_ERROR(logger, NAME << " " << mysql_error(&m_conn)); \
+	}
 #define EXEC(STMT, METHOD) \
 	{\
 	int ret = STMT->execute(); \
 	if (ret == 0) \
 		exec_ok = true; \
-	else if (ret == 2013) { \
+	else if (ret == CR_SERVER_LOST) { \
 		LOG4CXX_INFO(logger, "MySQL connection lost. Reconnecting...");\
 		disconnect(); \
 		connect(); \
 		return METHOD; \
 	} \
 	else \
@@ @@ -191,25 +145,28 @@ MySQLBackend::Statement::~Statement() { @@
 		free(m_params[i].length);
+	}
 	for (unsigned i = 0; i < m_results.size(); i++) {
 		free(m_results[i].buffer);
 		free(m_results[i].length);
+	}
 	FINALIZE_STMT(m_stmt);
 	if(m_stmt != NULL) {
 		mysql_stmt_close(m_stmt);
+	}
+}
 int MySQLBackend::Statement::execute() {
 	// If statement has some input and doesn't have any output, we have
 	// to clear the offset now, because operator>> will not be called.
 	m_offset = 0;
 	m_resultOffset = 0;
 	int ret;
 	if ((ret = mysql_stmt_execute(m_stmt)) != 0) {
 		LOG4CXX_ERROR(logger, m_string << " " << mysql_stmt_error(m_stmt) << "; " << mysql_error(m_conn));
 		return mysql_stmt_errno(m_stmt);
+	}
 	mysql_stmt_store_result(m_stmt);
 	return 0;
+}
 int MySQLBackend::Statement::fetch() {
 	return mysql_stmt_fetch(m_stmt);
+}

0 comments (0 inline, 0 general)