test/hikyuu2
1
0
Fork 0
mirror of https://gitee.com/fasiondog/hikyuu.git synced 2024-12-03 12:27:48 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

mysql 8.0.34后废弃自动重连，优化自行处理重连

Browse Source
This commit is contained in:
fasiondog 2023-12-05 01:56:47 +08:00
parent 9183cece1b
commit a3be8706d6
5 changed files with 79 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hikyuu_cpp/hikyuu/utilities/db_connect/DBConnectBase.h
View File

@ -44,10 +44,10 @@ class HKU_API DBConnectBase : public std::enable_shared_from_this<DBConnectBase>
virtual bool ping() = 0;
/** 开始事务 */
virtual void transaction() = 0;
virtual void transaction() noexcept = 0;
/** 提交事务 */
virtual void commit() = 0;
virtual void commit() noexcept = 0;
/** 回滚事务 */
virtual void rollback() noexcept = 0;

76
hikyuu_cpp/hikyuu/utilities/db_connect/mysql/MySQLConnect.cpp
View File

@ -17,18 +17,38 @@
namespace hku {
MySQLConnect::MySQLConnect(const Parameter& param) : DBConnectBase(param), m_mysql(nullptr) {
close();
connect();
}
MySQLConnect::~MySQLConnect() {
close();
}
bool MySQLConnect::tryConnect() noexcept {
bool success = false;
try {
connect();
success = true;
} catch (const std::exception& e) {
HKU_WARN(e.what());
}
return success;
}
void MySQLConnect::connect() {
try {
m_mysql = new MYSQL;
HKU_CHECK(mysql_init(m_mysql) != NULL, "Initial MySQL handle error!");
string host = getParamFromOther<string>(param, "host", "127.0.0.1");
string usr = getParamFromOther<string>(param, "usr", "root");
string pwd = getParamFromOther<string>(param, "pwd", "");
string database = getParamFromOther<string>(param, "db", "");
unsigned int port = getParamFromOther<int>(param, "port", 3306);
HKU_TRACE("MYSQL host: {}", host);
HKU_TRACE("MYSQL port: {}", port);
HKU_TRACE("MYSQL database: {}", database);
std::string host = tryGetParam<std::string>("host", "127.0.0.1");
std::string usr = tryGetParam<std::string>("usr", "root");
std::string pwd = tryGetParam<std::string>("pwd", "");
std::string database = tryGetParam<std::string>("db", "");
unsigned int port = tryGetParam<int>("port", 3306);
// HKU_TRACE("MYSQL host: {}", host);
// HKU_TRACE("MYSQL port: {}", port);
// HKU_TRACE("MYSQL database: {}", database);
my_bool reconnect = 1;
SQL_CHECK(mysql_options(m_mysql, MYSQL_OPT_RECONNECT, &reconnect) == 0,
@ -45,8 +65,8 @@ MySQLConnect::MySQLConnect(const Parameter& param) : DBConnectBase(param), m_mys
SQL_CHECK(mysql_set_character_set(m_mysql, "utf8") == 0, mysql_errno(m_mysql),
"mysql_set_character_set error! {}", mysql_error(m_mysql));
} catch (const std::bad_alloc& e) {
HKU_THROW("Failed allocate MySQLConnect! {}", e.what());
} catch (std::bad_alloc& e) {
HKU_THROW("Failed alloc MySQLConnect! {}", e.what());
} catch (const hku::exception& e) {
close();
@ -62,10 +82,6 @@ MySQLConnect::MySQLConnect(const Parameter& param) : DBConnectBase(param), m_mys
}
}
MySQLConnect::~MySQLConnect() {
close();
}
void MySQLConnect::close() {
if (m_mysql) {
mysql_close(m_mysql);
@ -75,9 +91,9 @@ void MySQLConnect::close() {
}
bool MySQLConnect::ping() {
HKU_IF_RETURN(!m_mysql, false);
HKU_ERROR_IF_RETURN(!m_mysql && !tryConnect(), false, "Failed connect to mysql!");
auto ret = mysql_ping(m_mysql);
HKU_ERROR_IF_RETURN(ret, false, "mysql_ping error code: {}, msg: {}", ret,
HKU_ERROR_IF_RETURN(ret && !tryConnect(), false, "mysql_ping error code: {}, msg: {}", ret,
mysql_error(m_mysql));
return true;
}
@ -86,6 +102,10 @@ int64_t MySQLConnect::exec(const std::string& sql_string) {
#ifdef HKU_SQL_TRACE
HKU_DEBUG(sql_string);
#endif
if (!m_mysql) {
HKU_CHECK(!tryConnect(), "Failed connect to mysql!");
}
int ret = mysql_query(m_mysql, sql_string.c_str());
if (ret) {
// 尝试重新连接
@ -149,21 +169,33 @@ void MySQLConnect::resetAutoIncrement(const std::string& tablename) {
exec(fmt::format("alter {} auto_increment=1", tablename));
}
void MySQLConnect::transaction() {
exec("BEGIN");
void MySQLConnect::transaction() noexcept {
try {
exec("BEGIN");
} catch (const std::exception& e) {
HKU_ERROR("Failed transaction! {}", e.what());
} catch (...) {
HKU_ERROR("Unknown error!");
}
}
void MySQLConnect::commit() {
exec("COMMIT");
void MySQLConnect::commit() noexcept {
try {
exec("COMMIT");
} catch (const std::exception& e) {
HKU_ERROR("Failed transaction! {}", e.what());
} catch (...) {
HKU_ERROR("Unknown error!");
}
}
void MySQLConnect::rollback() noexcept {
try {
exec("ROLLBACK");
} catch (const std::exception& e) {
HKU_ERROR("rollback failed! {}", e.what());
HKU_ERROR("Failed transaction! {}", e.what());
} catch (...) {
HKU_ERROR("Unknonw error!");
HKU_ERROR("Unknown error!");
}
}

6
hikyuu_cpp/hikyuu/utilities/db_connect/mysql/MySQLConnect.h
View File

@ -37,11 +37,13 @@ public:
virtual bool tableExist(const std::string& tablename) override;
virtual void resetAutoIncrement(const std::string& tablename) override;
virtual void transaction() override;
virtual void commit() override;
virtual void transaction() noexcept override;
virtual void commit() noexcept override;
virtual void rollback() noexcept override;
private:
bool tryConnect() noexcept;
void connect();
void close();
private:

22
hikyuu_cpp/hikyuu/utilities/db_connect/sqlite/SQLiteConnect.cpp
View File

@ -100,19 +100,31 @@ int64_t SQLiteConnect::exec(const std::string &sql_string) {
return affect_rows < 0 ? 0 : affect_rows;
}
void SQLiteConnect::transaction() {
exec("BEGIN IMMEDIATE");
void SQLiteConnect::transaction() noexcept {
try {
exec("BEGIN IMMEDIATE");
} catch (const std::exception &e) {
HKU_ERROR("Failed transaction! {}", e.what());
} catch (...) {
HKU_ERROR("Unknown error!");
}
}
void SQLiteConnect::commit() {
exec("COMMIT TRANSACTION");
void SQLiteConnect::commit() noexcept {
try {
exec("COMMIT TRANSACTION");
} catch (const std::exception &e) {
HKU_ERROR("Failed commit! {}", e.what());
} catch (...) {
HKU_ERROR("Unknown error!");
}
}
void SQLiteConnect::rollback() noexcept {
try {
exec("ROLLBACK TRANSACTION");
} catch (const std::exception &e) {
HKU_ERROR("rollback failed! {}", e.what());
HKU_ERROR("Failed rollback! {}", e.what());
} catch (...) {
HKU_ERROR("Unknown error!");
}

4
hikyuu_cpp/hikyuu/utilities/db_connect/sqlite/SQLiteConnect.h
View File

@ -45,8 +45,8 @@ public:
/** 如果 sqlite 文件无效，返回false */
virtual bool ping() override;
virtual void transaction() override;
virtual void commit() override;
virtual void transaction() noexcept override;
virtual void commit() noexcept override;
virtual void rollback() noexcept override;
virtual int64_t exec(const std::string &sql_string) override;
virtual SQLStatementPtr getStatement(const std::string &sql_statement) override;