diff options
author | ariel- <ariel-@users.noreply.github.com> | 2017-03-01 22:20:53 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-01 22:20:53 -0300 |
commit | affee140c6a8e1e9358be2aa0d0088ede218acaa (patch) | |
tree | 8725f6ac5a57566bde03465176d01cb00cdb72e0 /src/server/database/Database/PreparedStatement.cpp | |
parent | 7567cafec84080d26ea513242a1f540a823b8f9d (diff) |
Core/Database: Prepared statement parameter preallocation (#18999)
- Pass prepared statement size to the helper class to prevent runtime resizing.
- Rename CheckValidIndex -> AssertValidIndex
- Cached prepared size on the worker pool as it's shared among all connections
- Cached query data only for each connection, done lookup in map instead of possibly creating a new element
- Kill the prepared statement map, and store raw sql string on the MySQLPreparedStatement class
(This info is only used for logging, and there is no need of keeping a second container just for it)
Diffstat (limited to 'src/server/database/Database/PreparedStatement.cpp')
-rw-r--r-- | src/server/database/Database/PreparedStatement.cpp | 135 |
1 files changed, 52 insertions, 83 deletions
diff --git a/src/server/database/Database/PreparedStatement.cpp b/src/server/database/Database/PreparedStatement.cpp index 6e00da4e33f..a46a022df48 100644 --- a/src/server/database/Database/PreparedStatement.cpp +++ b/src/server/database/Database/PreparedStatement.cpp @@ -19,15 +19,15 @@ #include "MySQLConnection.h" #include "Log.h" -PreparedStatement::PreparedStatement(uint32 index) : -m_stmt(NULL), -m_index(index) { } +PreparedStatement::PreparedStatement(uint32 index, uint8 capacity) : +m_stmt(nullptr), m_index(index), statement_data(capacity) { } PreparedStatement::~PreparedStatement() { } -void PreparedStatement::BindParameters() +void PreparedStatement::BindParameters(MySQLPreparedStatement* stmt) { - ASSERT (m_stmt); + ASSERT(stmt); + m_stmt = stmt; uint8 i = 0; for (; i < statement_data.size(); i++) @@ -35,51 +35,51 @@ void PreparedStatement::BindParameters() switch (statement_data[i].type) { case TYPE_BOOL: - m_stmt->setBool(i, statement_data[i].data.boolean); + stmt->setBool(i, statement_data[i].data.boolean); break; case TYPE_UI8: - m_stmt->setUInt8(i, statement_data[i].data.ui8); + stmt->setUInt8(i, statement_data[i].data.ui8); break; case TYPE_UI16: - m_stmt->setUInt16(i, statement_data[i].data.ui16); + stmt->setUInt16(i, statement_data[i].data.ui16); break; case TYPE_UI32: - m_stmt->setUInt32(i, statement_data[i].data.ui32); + stmt->setUInt32(i, statement_data[i].data.ui32); break; case TYPE_I8: - m_stmt->setInt8(i, statement_data[i].data.i8); + stmt->setInt8(i, statement_data[i].data.i8); break; case TYPE_I16: - m_stmt->setInt16(i, statement_data[i].data.i16); + stmt->setInt16(i, statement_data[i].data.i16); break; case TYPE_I32: - m_stmt->setInt32(i, statement_data[i].data.i32); + stmt->setInt32(i, statement_data[i].data.i32); break; case TYPE_UI64: - m_stmt->setUInt64(i, statement_data[i].data.ui64); + stmt->setUInt64(i, statement_data[i].data.ui64); break; case TYPE_I64: - m_stmt->setInt64(i, statement_data[i].data.i64); + stmt->setInt64(i, statement_data[i].data.i64); break; case TYPE_FLOAT: - m_stmt->setFloat(i, statement_data[i].data.f); + stmt->setFloat(i, statement_data[i].data.f); break; case TYPE_DOUBLE: - m_stmt->setDouble(i, statement_data[i].data.d); + stmt->setDouble(i, statement_data[i].data.d); break; case TYPE_STRING: - m_stmt->setBinary(i, statement_data[i].binary, true); + stmt->setBinary(i, statement_data[i].binary, true); break; case TYPE_BINARY: - m_stmt->setBinary(i, statement_data[i].binary, false); + stmt->setBinary(i, statement_data[i].binary, false); break; case TYPE_NULL: - m_stmt->setNull(i); + stmt->setNull(i); break; } } #ifdef _DEBUG - if (i < m_stmt->m_paramCount) + if (i < stmt->m_paramCount) TC_LOG_WARN("sql.sql", "[WARNING]: BindParameters() for statement %u did not bind all allocated parameters", m_index); #endif } @@ -87,108 +87,84 @@ void PreparedStatement::BindParameters() //- Bind to buffer void PreparedStatement::setBool(const uint8 index, const bool value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.boolean = value; statement_data[index].type = TYPE_BOOL; } void PreparedStatement::setUInt8(const uint8 index, const uint8 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.ui8 = value; statement_data[index].type = TYPE_UI8; } void PreparedStatement::setUInt16(const uint8 index, const uint16 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.ui16 = value; statement_data[index].type = TYPE_UI16; } void PreparedStatement::setUInt32(const uint8 index, const uint32 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.ui32 = value; statement_data[index].type = TYPE_UI32; } void PreparedStatement::setUInt64(const uint8 index, const uint64 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.ui64 = value; statement_data[index].type = TYPE_UI64; } void PreparedStatement::setInt8(const uint8 index, const int8 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.i8 = value; statement_data[index].type = TYPE_I8; } void PreparedStatement::setInt16(const uint8 index, const int16 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.i16 = value; statement_data[index].type = TYPE_I16; } void PreparedStatement::setInt32(const uint8 index, const int32 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.i32 = value; statement_data[index].type = TYPE_I32; } void PreparedStatement::setInt64(const uint8 index, const int64 value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.i64 = value; statement_data[index].type = TYPE_I64; } void PreparedStatement::setFloat(const uint8 index, const float value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.f = value; statement_data[index].type = TYPE_FLOAT; } void PreparedStatement::setDouble(const uint8 index, const double value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].data.d = value; statement_data[index].type = TYPE_DOUBLE; } void PreparedStatement::setString(const uint8 index, const std::string& value) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].binary.resize(value.length() + 1); memcpy(statement_data[index].binary.data(), value.c_str(), value.length() + 1); statement_data[index].type = TYPE_STRING; @@ -196,25 +172,19 @@ void PreparedStatement::setString(const uint8 index, const std::string& value) void PreparedStatement::setBinary(const uint8 index, const std::vector<uint8>& value) { - if (index >= statement_data.size()) - statement_data.resize(index + 1); - + ASSERT(index < statement_data.size()); statement_data[index].binary = value; statement_data[index].type = TYPE_BINARY; } void PreparedStatement::setNull(const uint8 index) { - if (index >= statement_data.size()) - statement_data.resize(index+1); - + ASSERT(index < statement_data.size()); statement_data[index].type = TYPE_NULL; } -MySQLPreparedStatement::MySQLPreparedStatement(MYSQL_STMT* stmt) : -m_stmt(NULL), -m_Mstmt(stmt), -m_bind(NULL) +MySQLPreparedStatement::MySQLPreparedStatement(MYSQL_STMT* stmt, std::string queryString) : +m_stmt(nullptr), m_Mstmt(stmt), m_bind(nullptr), m_queryString(std::move(queryString)) { /// Initialize variable parameters m_paramCount = mysql_stmt_param_count(stmt); @@ -258,13 +228,12 @@ static bool ParamenterIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 para } //- Bind on mysql level -bool MySQLPreparedStatement::CheckValidIndex(uint8 index) +void MySQLPreparedStatement::AssertValidIndex(uint8 index) { ASSERT(index < m_paramCount || ParamenterIndexAssertFail(m_stmt->m_index, index, m_paramCount)); if (m_paramsSet[index]) - TC_LOG_WARN("sql.sql", "[WARNING] Prepared Statement (id: %u) trying to bind value on already bound index (%u).", m_stmt->m_index, index); - return true; + TC_LOG_ERROR("sql.sql", "[ERROR] Prepared Statement (id: %u) trying to bind value on already bound index (%u).", m_stmt->m_index, index); } void MySQLPreparedStatement::setBool(const uint8 index, const bool value) @@ -274,7 +243,7 @@ void MySQLPreparedStatement::setBool(const uint8 index, const bool value) void MySQLPreparedStatement::setUInt8(const uint8 index, const uint8 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_TINY, &value, sizeof(uint8), true); @@ -282,7 +251,7 @@ void MySQLPreparedStatement::setUInt8(const uint8 index, const uint8 value) void MySQLPreparedStatement::setUInt16(const uint8 index, const uint16 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_SHORT, &value, sizeof(uint16), true); @@ -290,7 +259,7 @@ void MySQLPreparedStatement::setUInt16(const uint8 index, const uint16 value) void MySQLPreparedStatement::setUInt32(const uint8 index, const uint32 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_LONG, &value, sizeof(uint32), true); @@ -298,7 +267,7 @@ void MySQLPreparedStatement::setUInt32(const uint8 index, const uint32 value) void MySQLPreparedStatement::setUInt64(const uint8 index, const uint64 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_LONGLONG, &value, sizeof(uint64), true); @@ -306,7 +275,7 @@ void MySQLPreparedStatement::setUInt64(const uint8 index, const uint64 value) void MySQLPreparedStatement::setInt8(const uint8 index, const int8 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_TINY, &value, sizeof(int8), false); @@ -314,7 +283,7 @@ void MySQLPreparedStatement::setInt8(const uint8 index, const int8 value) void MySQLPreparedStatement::setInt16(const uint8 index, const int16 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_SHORT, &value, sizeof(int16), false); @@ -322,7 +291,7 @@ void MySQLPreparedStatement::setInt16(const uint8 index, const int16 value) void MySQLPreparedStatement::setInt32(const uint8 index, const int32 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_LONG, &value, sizeof(int32), false); @@ -330,7 +299,7 @@ void MySQLPreparedStatement::setInt32(const uint8 index, const int32 value) void MySQLPreparedStatement::setInt64(const uint8 index, const int64 value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_LONGLONG, &value, sizeof(int64), false); @@ -338,7 +307,7 @@ void MySQLPreparedStatement::setInt64(const uint8 index, const int64 value) void MySQLPreparedStatement::setFloat(const uint8 index, const float value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_FLOAT, &value, sizeof(float), (value > 0.0f)); @@ -346,7 +315,7 @@ void MySQLPreparedStatement::setFloat(const uint8 index, const float value) void MySQLPreparedStatement::setDouble(const uint8 index, const double value) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; setValue(param, MYSQL_TYPE_DOUBLE, &value, sizeof(double), (value > 0.0f)); @@ -354,7 +323,7 @@ void MySQLPreparedStatement::setDouble(const uint8 index, const double value) void MySQLPreparedStatement::setBinary(const uint8 index, const std::vector<uint8>& value, bool isString) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; uint32 len = uint32(value.size()); @@ -376,7 +345,7 @@ void MySQLPreparedStatement::setBinary(const uint8 index, const std::vector<uint void MySQLPreparedStatement::setNull(const uint8 index) { - CheckValidIndex(index); + AssertValidIndex(index); m_paramsSet[index] = true; MYSQL_BIND* param = &m_bind[index]; param->buffer_type = MYSQL_TYPE_NULL; @@ -401,9 +370,9 @@ void MySQLPreparedStatement::setValue(MYSQL_BIND* param, enum_field_types type, memcpy(param->buffer, value, len); } -std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern) const +std::string MySQLPreparedStatement::getQueryString() const { - std::string queryString = sqlPattern; + std::string queryString(m_queryString); size_t pos = 0; for (uint32 i = 0; i < m_stmt->statement_data.size(); i++) |