1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QSqlResult: use QVector<int> instead QList<int> for indexes value

Browse Source 
Minor tweak: QList<int> is taking 64bit per entry, QVector<int>
only 32bit - this should reduce memory usage a little bit.

Change-Id: I3e17269feb4840343f5cecfc71f8fccd70edc80f
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Christian Ehrlicher 2018-03-04 20:29:21 +01:00 committed by Edward Welbourne
parent 25956a1e7c
commit 69948f4899
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp
View File

@ -471,7 +471,7 @@ bool QSQLiteResult::exec()
// can end up in a case where for virtual tables it returns 0 even though it // can end up in a case where for virtual tables it returns 0 even though it
// has parameters // has parameters
if (paramCount > 1 && paramCount < values.count()) { if (paramCount > 1 && paramCount < values.count()) {
const auto countIndexes = [](int counter, const QList<int>& indexList) { const auto countIndexes = [](int counter, const QVector<int> &indexList) {
return counter + indexList.length(); return counter + indexList.length();
}; };
@ -485,13 +485,14 @@ bool QSQLiteResult::exec()
// placeholders. So we need to ensure the QVector has only one instance of // placeholders. So we need to ensure the QVector has only one instance of
// each value as SQLite will do the rest for us. // each value as SQLite will do the rest for us.
QVector<QVariant> prunedValues; QVector<QVariant> prunedValues;
QList<int> handledIndexes; QVector<int> handledIndexes;
for (int i = 0, currentIndex = 0; i < values.size(); ++i) { for (int i = 0, currentIndex = 0; i < values.size(); ++i) {
if (handledIndexes.contains(i)) if (handledIndexes.contains(i))
continue; continue;
const auto placeHolder = QString::fromUtf8(sqlite3_bind_parameter_name(d->stmt, currentIndex + 1)); const auto placeHolder = QString::fromUtf8(sqlite3_bind_parameter_name(d->stmt, currentIndex + 1));
handledIndexes << d->indexes[placeHolder]; const auto &indexes = d->indexes.value(placeHolder);
prunedValues << values.at(d->indexes[placeHolder].first()); handledIndexes << indexes;
prunedValues << values.at(indexes.first());
++currentIndex; ++currentIndex;
} }
values = prunedValues; values = prunedValues;

6
src/sql/kernel/qsqlresult.cpp
View File

@ -690,7 +690,7 @@ void QSqlResult::bindValue(int index, const QVariant& val, QSql::ParamType param
{ {
Q_D(QSqlResult); Q_D(QSqlResult);
d->binds = PositionalBinding; d->binds = PositionalBinding;
QList<int>& indexes = d->indexes[d->fieldSerial(index)]; QVector<int> &indexes = d->indexes[d->fieldSerial(index)];
if (!indexes.contains(index)) if (!indexes.contains(index))
indexes.append(index); indexes.append(index);
if (d->values.count() <= index) if (d->values.count() <= index)
@ -717,7 +717,7 @@ void QSqlResult::bindValue(const QString& placeholder, const QVariant& val,
d->binds = NamedBinding; d->binds = NamedBinding;
// if the index has already been set when doing emulated named // if the index has already been set when doing emulated named
// bindings - don't reset it // bindings - don't reset it
const QList<int> indexes = d->indexes.value(placeholder); const QVector<int> indexes = d->indexes.value(placeholder);
for (int idx : indexes) { for (int idx : indexes) {
if (d->values.count() <= idx) if (d->values.count() <= idx)
d->values.resize(idx + 1); d->values.resize(idx + 1);
@ -764,7 +764,7 @@ QVariant QSqlResult::boundValue(int index) const
QVariant QSqlResult::boundValue(const QString& placeholder) const QVariant QSqlResult::boundValue(const QString& placeholder) const
{ {
Q_D(const QSqlResult); Q_D(const QSqlResult);
QList<int> indexes = d->indexes.value(placeholder); const QVector<int> indexes = d->indexes.value(placeholder);
return d->values.value(indexes.value(0,-1)); return d->values.value(indexes.value(0,-1));
} }

2
src/sql/kernel/qsqlresult_p.h
View File

@ -135,7 +135,7 @@ public:
QString executedQuery; QString executedQuery;
QHash<int, QSql::ParamType> types; QHash<int, QSql::ParamType> types;
QVector<QVariant> values; QVector<QVariant> values;
typedef QHash<QString, QList<int> > IndexMap; typedef QHash<QString, QVector<int> > IndexMap;
IndexMap indexes; IndexMap indexes;
typedef QVector<QHolder> QHolderVector; typedef QVector<QHolder> QHolderVector;