MySQL preprocessing is thread safe; DB interface consistency

Author: unknown

src/db/DBThreadPool.cpp

@@ -25,8 +25,8 @@ void DBTask::dbi(DB_Interface * dbi)
 
 //------------------------------------------------
 
-DBSqlTask::DBSqlTask(std::shared_ptr<SqlPrepare> pre):
-	_pre(pre)
+DBSqlTask::DBSqlTask(std::shared_ptr<SqlPrepare> pre, std::shared_ptr <SqlResultSet> result):
+	_pre(pre), _result(result)
 {
 
 }
@@ -39,7 +39,8 @@ DBSqlTask::~DBSqlTask()
 void DBSqlTask::process()
 {
 	_ret = _pre->prepare(static_cast<DBInterfaceMysql *>(_dbi)->mysql());
-	if (_ret >= 0) _ret = _pre->execute();
+	DBResult* result = (DBResult*)(_result.get());
+	if (_ret >= 0) _ret = _pre->execute(result);
 	if (_ret < 0)
 	{
 		_errno = _dbi->getErrno();
@@ -53,7 +54,7 @@ void DBSqlTask::complete()
 	if (_ret < 0) str = _error.c_str();
 	if (backfunc)
 	{
-		backfunc(_errno, str, _pre);
+		backfunc(_errno, str, _result);
 		backfunc = nullptr;
 	}
 }

src/db/DBThreadPool.h

@@ -25,6 +25,7 @@ class DB_Interface;
 class RedisCommand;
 class RedisResult;
 class SqlPrepare;
+class SqlResultSet;
 
 class DBTask : public Task
 {
@@ -44,15 +45,16 @@ class DBTask : public Task
 class DBSqlTask : public DBTask
 {
 public:
-	DBSqlTask(std::shared_ptr<SqlPrepare> pre);
+	DBSqlTask(std::shared_ptr<SqlPrepare> pre, std::shared_ptr <SqlResultSet> result);
 	~DBSqlTask();
 
 	virtual void process();
 	virtual void complete();
 public:
-	std::function<void(int32, const char*, std::shared_ptr<SqlPrepare>)> backfunc;
+	std::function<void(int32, const char*, std::shared_ptr<SqlResultSet>)> backfunc;
 private:
 	std::shared_ptr<SqlPrepare> _pre;
+	std::shared_ptr <SqlResultSet> _result;
 };
 
 class DBRedisTask : public DBTask

src/db/DB_Interface_mysql.cpp

@@ -111,4 +111,25 @@ bool DBInterfaceMysql::ping() {
 
 MYSQL * DBInterfaceMysql::mysql() {
 	return &mMysql_;
-}
+}
+
+
+namespace MySQL
+{
+	int threadSafe()
+	{
+		return mysql_thread_safe();
+	}
+	void libraryInit()
+	{
+		mysql_library_init(-1, nullptr, nullptr);
+	}
+	void libraryEnd()
+	{
+		mysql_library_end();
+	}
+	char const* getLibraryVersion()
+	{
+		return MYSQL_SERVER_VERSION;
+	}
+};

src/db/DB_Interface_mysql.h

@@ -29,4 +29,12 @@ class DBInterfaceMysql : public DB_Interface
 	std::string m_pswd;
 };
 
+namespace MySQL
+{
+	int threadSafe();
+	void libraryInit();
+	void libraryEnd();
+	char const* getLibraryVersion();
+};
+
 #endif