mirror/TinyORM
1
0
Fork 0
mirror of https://github.com/silverqx/TinyORM.git synced 2025-12-30 15:29:36 -06:00
Code Issues Packages Projects Releases Wiki Activity

drivers mysql removed memset() to 0

Browse Source
This commit is contained in:
silverqx
2024-07-26 13:59:08 +02:00
parent 9b63cc9f1f
commit d540bd4c53
2 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mysql/include_private/orm/drivers/mysql/mysqlresult_p.hpp
View File

@@ -131,9 +131,6 @@ namespace Orm::Drivers::MySql
static bool wasAllFieldsFetched(uint fieldsCount, uint lastIndex,
QLatin1StringView method);
/*! Allocate memory for prepared bindings that will be sent to the database. */
static void allocateMemoryForBindings(std::unique_ptr<MYSQL_BIND[]> &binds, // NOLINT(modernize-avoid-c-arrays)
std::size_t count) noexcept;
/*! Reserve all vectors for prepared bindings buffer data. */
void reserveVectorsForBindings(
QList<my_bool> &nullVector, QList<QByteArray> &stringVector,

32
drivers/mysql/src/orm/drivers/mysql/mysqlresult_p.cpp
View File

@@ -62,6 +62,12 @@ bool MySqlResultPrivate::populateFields(MYSQL *const mysql)
/* Prepared queries */
/* All these modernize-avoid-c-arrays suppressions are correct as we only need to allocate
buffers on the heap, nothing else, we don't need access, modify, iterate over, or
anything else, just simple buffers and C arrays are perfect for this.
The std::array can't be used here as we don't know the size and std::vector is too
much. */
bool MySqlResultPrivate::bindResultValues()
{
// Obtain the Result Set metadata (nothing to do if no metadata)
@@ -80,8 +86,9 @@ bool MySqlResultPrivate::bindResultValues()
/* Prepared queries don't use metadata the same way as normal queries,
it's always RESULTSET_METADATA_NONE. */
// Allocate memory for result sets that will be obtained from the database
allocateMemoryForBindings(resultBinds, fieldsCount);
/* Allocate memory for result sets that will be obtained from the database,
memset() to 0-s isn't needed, std::make_unique<> 0 initializes it. */
resultBinds = std::make_unique<MYSQL_BIND[]>(fieldsCount); // NOLINT(modernize-avoid-c-arrays)
uint index = 0;
const MYSQL_FIELD *fieldInfo = nullptr;
@@ -184,9 +191,10 @@ void MySqlResultPrivate::bindPreparedBindings(
{
// Reserve all vectors for prepared bindings buffer data
reserveVectorsForBindings(nullVector, stringVector, timeVector);
// Allocate memory for prepared bindings that will be sent to the database
allocateMemoryForBindings(preparedBinds,
static_cast<std::size_t>(boundValues.size()));
/* Allocate memory for prepared bindings that will be sent to the database,
memset() to 0-s isn't needed, std::make_unique<> 0 initializes it. */
preparedBinds = std::make_unique<MYSQL_BIND[]>( // NOLINT(modernize-avoid-c-arrays)
static_cast<std::size_t>(boundValues.size()));
/*! Alias for bound values size type. */
using BoundValuesSizeType = decltype (boundValues)::size_type;
@@ -419,20 +427,6 @@ bool MySqlResultPrivate::wasAllFieldsFetched(
return false;
}
/* All these modernize-avoid-c-arrays suppressions are correct as we only need to allocate
buffers on the heap, nothing else, we don't need access, modify, iterate over, or
anything else, just simple buffers and C arrays are perfect for this.
The std::array can't be used here as we don't know the size and std::vector is too
much. */
void MySqlResultPrivate::allocateMemoryForBindings(std::unique_ptr<MYSQL_BIND[]> &binds, // NOLINT(modernize-avoid-c-arrays)
const std::size_t count) noexcept
{
binds = std::make_unique<MYSQL_BIND[]>(count); // NOLINT(modernize-avoid-c-arrays)
// Zero the memory storage
memset(binds.get(), 0, sizeof (MYSQL_BIND) * count);
}
void MySqlResultPrivate::reserveVectorsForBindings(
QList<my_bool> &nullVector, QList<QByteArray> &stringVector,
QList<MYSQL_TIME> &timeVector) const