mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Sort in items in two stages to speed up natural sorting
Sort the items in a folder first according to their name, without doing a natural/locale-aware sorting. This is very fast, but the order of the items is then already close to the final order in most cases. The number of expensive natural comparisons required to sort the items is thus greatly reduced. In my experiments with a folder with 100,000 items, the time required to sort the files was reduced by 63% with this patch. REVIEW: 113485
This commit is contained in:
parent
dcfed0028c
commit
0e9f4a3987
|
@ -1036,6 +1036,14 @@ void KFileItemModel::insertItems(QList<ItemData*>& newItems)
|
|||
|
||||
m_groups.clear();
|
||||
|
||||
if (m_naturalSorting) {
|
||||
// Natural sorting of items can be very slow. However, it becomes much
|
||||
// faster if the input sequence is already mostly sorted. Therefore, we
|
||||
// first sort 'newItems' according to the QStrings returned by
|
||||
// KFileItem::text() using QString::operator<(), which is quite fast.
|
||||
parallelMergeSort(newItems.begin(), newItems.end(), nameLessThan, QThread::idealThreadCount());
|
||||
}
|
||||
|
||||
sort(newItems.begin(), newItems.end());
|
||||
|
||||
#ifdef KFILEITEMMODEL_DEBUG
|
||||
|
|
|
@ -349,6 +349,12 @@ private:
|
|||
|
||||
QHash<QByteArray, QVariant> retrieveData(const KFileItem& item, const ItemData* parent) const;
|
||||
|
||||
/**
|
||||
* @return True if \a a has a KFileItem whose text is 'less than' the one
|
||||
* of \a b according to QString::operator<(const QString&).
|
||||
*/
|
||||
static bool nameLessThan(const ItemData* a, const ItemData* b);
|
||||
|
||||
/**
|
||||
* @return True if the item-data \a a should be ordered before the item-data
|
||||
* \b. The item-data may have different parent-items.
|
||||
|
@ -485,6 +491,12 @@ private:
|
|||
friend class DolphinPart; // Accesses m_dirLister
|
||||
};
|
||||
|
||||
inline bool KFileItemModel::nameLessThan(const ItemData* a, const ItemData* b)
|
||||
{
|
||||
return a->item.text() < b->item.text();
|
||||
}
|
||||
|
||||
|
||||
inline bool KFileItemModel::isChildItem(int index) const
|
||||
{
|
||||
if (m_itemData.at(index)->parent) {
|
||||
|
|
Loading…
Reference in a new issue