AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize QHash when using QHashDummyValue

Browse Source 
This is used by QSet to avoid storing extra data for the value
in the Hash. Re-implement the optimization after the changes to QHash.

Change-Id: Ic7eba53d1c0398399ed5b25fef589ad62567445f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-01-22 15:05:38 +01:00
parent e1e573cee8
commit 3b46627942
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/corelib/tools/qhash.h
View File

@ -107,6 +107,31 @@ struct Node
{
return std::move(value);
}
bool valuesEqual(const Node *other) const { return value == other->value; }
};
template <typename Key>
struct Node<Key, QHashDummyValue> {
using KeyType = Key;
using ValueType = QHashDummyValue;
Key key;
static Node create(Key &&k, ValueType &&)
{
return Node{ std::move(k) };
}
static Node create(const Key &k, const ValueType &)
{
return Node{ k };
}
void replace(const ValueType &)
{
}
void replace(ValueType &&)
{
}
ValueType takeValue() { return QHashDummyValue(); }
bool valuesEqual(const Node *) const { return true; }
};
template <typename T>
@ -844,7 +869,7 @@ public:
for (const_iterator it = other.begin(); it != other.end(); ++it) {
const_iterator i = find(it.key());
if (i == end() || !(i.value() == it.value()))
if (i == end() || !i.i.node()->valuesEqual(it.i.node()))
return false;
}
// all values must be the same as size is the same
@ -1156,7 +1181,7 @@ public:
{
detach();
auto i = d->insert(Node{key, value});
auto i = d->insert(Node::create(key, value));
return iterator(i);
}
void insert(const QHash &hash)