Improve performance in connection-tree

Author: uglide

src/modules/connections-tree/items/databaseitem.cpp

@@ -38,7 +38,7 @@ QString DatabaseItem::getDisplayName() const
     } else if (m_keys->isEmpty()) {
         return m_name;
     } else {
-        return QString("%1 (%2/%3)").arg(m_name).arg(childCount()).arg(m_keysCount);
+        return QString("%1 (%2/%3)").arg(m_name).arg(m_rawKeys.size()).arg(m_keysCount);
     }
 }
 
@@ -214,6 +214,8 @@ QSharedPointer<DatabaseKeys> DatabaseItem::KeysTreeRenderer::renderKeys(QSharedP
     keys.sort();
     qDebug() << "Keys sorted in: " << timer.elapsed() << " ms";
     QSharedPointer<QList<QSharedPointer<TreeItem>>> result(new QList<QSharedPointer<TreeItem>>());
+    QSharedPointer<QHash<QString, QSharedPointer<NamespaceItem>>> rootNamespaces(
+                new QHash<QString, QSharedPointer<NamespaceItem>>());
 
     //render
     timer.restart();
@@ -228,7 +230,8 @@ QSharedPointer<DatabaseKeys> DatabaseItem::KeysTreeRenderer::renderKeys(QSharedP
 
         renderNamaspacedKey(QSharedPointer<NamespaceItem>(),
                             rawKey, rawKey, operations,
-                            namespaceSeparator, result, parent);
+                            namespaceSeparator, result, parent,
+                            rootNamespaces);
     }
     qDebug() << "Tree builded in: " << timer.elapsed() << " ms";
     return result;
@@ -240,7 +243,8 @@ void DatabaseItem::KeysTreeRenderer::renderNamaspacedKey(QSharedPointer<Namespac
                                                          QSharedPointer<Operations> m_operations,
                                                          const QString& m_namespaceSeparator,
                                                          QSharedPointer<DatabaseKeys> m_result,
-                                                         QSharedPointer<DatabaseItem> db)
+                                                         QSharedPointer<DatabaseItem> db,
+                                                         QSharedPointer<QHash<QString, QSharedPointer<NamespaceItem> > > m_rootNamespaces)
 {
     QWeakPointer<TreeItem> currentParent = (currItem.isNull())? db.staticCast<TreeItem>().toWeakRef() :
                                                                 currItem.staticCast<TreeItem>().toWeakRef();
@@ -259,34 +263,25 @@ void DatabaseItem::KeysTreeRenderer::renderNamaspacedKey(QSharedPointer<Namespac
     }
 
     QString firstNamespaceName = notProcessedKeyPart.mid(0, indexOfNaspaceSeparator);
-
     QSharedPointer<NamespaceItem> namespaceItem;    
 
-    if (currItem.isNull()) {
-        int size = m_result->size();
-        QSharedPointer<TreeItem> child;
-
-        for (int i=0; i < size; ++i)
-        {
-            child = (*m_result)[i];
-            if (typeid(NamespaceItem)==typeid(*child)
-                    && child->getDisplayName() == firstNamespaceName) {
-                    namespaceItem =  qSharedPointerCast<NamespaceItem>(child);
-                    break;
-            }
-        }
-    } else {
+    if (currItem.isNull() && m_rootNamespaces->contains(firstNamespaceName)) {
+        namespaceItem = (*m_rootNamespaces)[firstNamespaceName];
+    } else if (!currItem.isNull()) {
         namespaceItem = currItem->findChildNamespace(firstNamespaceName);
     }
 
     if (namespaceItem.isNull()) {
         namespaceItem = QSharedPointer<NamespaceItem>(
                     new NamespaceItem(firstNamespaceName, m_operations, currentParent));
 
-        if (currItem.isNull()) m_result->push_back(namespaceItem);
+        if (currItem.isNull()) {
+            m_result->push_back(namespaceItem);
+            m_rootNamespaces->insert(namespaceItem->getDisplayName(), namespaceItem);
+        }
         else currItem->append(namespaceItem);
     }
 
     renderNamaspacedKey(namespaceItem, notProcessedKeyPart.mid(indexOfNaspaceSeparator+m_namespaceSeparator.length()),
-                        fullKey, m_operations, m_namespaceSeparator, m_result, db);
+                        fullKey, m_operations, m_namespaceSeparator, m_result, db, m_rootNamespaces);
 }

src/modules/connections-tree/items/databaseitem.h

@@ -66,8 +66,9 @@ protected slots:
                                           QSharedPointer<Operations> operations,
                                           const QString& namespaceSeparator,
                                           QSharedPointer<DatabaseKeys> m_result,
-                                          QSharedPointer<DatabaseItem>
-                                          );
+                                          QSharedPointer<DatabaseItem>,
+                                          QSharedPointer<QHash<QString, QSharedPointer<NamespaceItem>>> m_rootNamespaces
+                                          );         
     };
 private:
     QString m_name;

src/modules/connections-tree/items/namespaceitem.cpp

@@ -12,14 +12,12 @@ NamespaceItem::NamespaceItem(const QString &fullPath,
       m_parent(parent),
       m_locked(false)
 {
-
+    m_displayName = m_fullPath.mid(m_fullPath.lastIndexOf(m_operations->getNamespaceSeparator())+1);
 }
 
 QString NamespaceItem::getDisplayName() const
-{
-    int lastIndex = m_fullPath.lastIndexOf(m_operations->getNamespaceSeparator());
-
-    return m_fullPath.mid(lastIndex+1);
+{    
+    return m_displayName;
 }
 
 QIcon NamespaceItem::getIcon() const

src/modules/connections-tree/items/namespaceitem.h

@@ -28,6 +28,7 @@ namespace ConnectionsTree {
 
     private:
         QString m_fullPath;
+        QString m_displayName;
         QSharedPointer<Operations> m_operations;
         QWeakPointer<TreeItem> m_parent;
         bool m_locked;

tests/unit_tests/testcases/connections-tree/test_databaseitem.cpp

@@ -49,7 +49,7 @@ void TestDatabaseItem::testLoadKeys()
     QCOMPARE(spy.count(), 1);
     QCOMPARE(item->childCount(), (unsigned int)1000001);
     QCOMPARE(actualResult, true);
-    QCOMPARE(item->getDisplayName(), QString("test-db (1000001/55)"));
+    QCOMPARE(item->getDisplayName(), QString("test-db (1000002/55)"));
     QCOMPARE(item->getIcon().isNull(), false);
     QCOMPARE(item->getAllChilds().isEmpty(), false);
     QCOMPARE(item->isEnabled(), true);