Merge lp:~phablet-team/history-service/improve_roles_management into lp:history-service/staging

[Tiago Salem Herrmann]

Improve Roles management performance by caching the retrieved data.

Improve Roles management performance by caching the retrieved data.

[lp:~phablet-team/history-service/improve_roles_management]

257. By Tiago Salem Herrmann on 2017-02-15

merge parent branch

258. By Tiago Salem Herrmann on 2017-02-21

merge parent branch

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'Ubuntu/History/historyeventmodel.cpp'
--- Ubuntu/History/historyeventmodel.cpp	2017-02-21 15:16:23 +0000
+++ Ubuntu/History/historyeventmodel.cpp	2017-02-21 15:16:23 +0000
@@ -98,7 +98,14 @@
         result = History::ContactMatcher::normalizeId(event.senderId());
         break;
     case SenderRole:
-        result = History::ContactMatcher::instance()->contactInfo(event.accountId(), event.senderId());
+        if (mMatchContacts) {
+            result = History::ContactMatcher::instance()->contactInfo(event.accountId(), event.senderId());
+        } else {
+            QVariantMap map;
+            map[History::FieldIdentifier] = event.senderId();
+            map[History::FieldAccountId] = event.accountId();
+            result = map;
+        }
         break;
     case TimestampRole:
         result = event.timestamp();
@@ -173,12 +180,16 @@
         break;
     case SubjectAsAliasRole:
         if (!textEvent.isNull()) {
-            QVariantMap contactInfo = History::ContactMatcher::instance()->contactInfo(event.accountId(), textEvent.subject());
-            QString returnValue = contactInfo[History::FieldAlias].toString();
-            if (returnValue.isEmpty()) {
-                returnValue = contactInfo[History::FieldIdentifier].toString();
+            if (mMatchContacts) {
+                QVariantMap contactInfo = History::ContactMatcher::instance()->contactInfo(event.accountId(), textEvent.subject());
+                QString returnValue = contactInfo[History::FieldAlias].toString();
+                if (returnValue.isEmpty()) {
+                    returnValue = contactInfo[History::FieldIdentifier].toString();
+                }
+                return returnValue;
+
             }
-            return returnValue;
+            return textEvent.subject();
         }
         break;
     }

=== modified file 'daemon/historydaemon.cpp'
--- daemon/historydaemon.cpp	2017-02-21 15:16:23 +0000
+++ daemon/historydaemon.cpp	2017-02-21 15:16:23 +0000
@@ -145,6 +145,9 @@
     connect(&mTextObserver,
             SIGNAL(channelAvailable(Tp::TextChannelPtr)),
             SLOT(onTextChannelAvailable(Tp::TextChannelPtr)));
+    connect(&mTextObserver,
+            SIGNAL(textChannelInvalidated(Tp::TextChannelPtr)),
+            SLOT(onTextChannelInvalidated(Tp::TextChannelPtr)));
 
     // FIXME: we need to do this in a better way, but for now this should do
     mProtocolFlags["ofono"] = History::MatchPhoneNumber;
@@ -163,23 +166,39 @@
 
 void HistoryDaemon::onRolesChanged(const HandleRolesMap &added, const HandleRolesMap &removed)
 {
-    Q_UNUSED(added);
-    Q_UNUSED(removed);
-
     ChannelInterfaceRolesInterface *roles_interface = qobject_cast<ChannelInterfaceRolesInterface*>(sender());
-    RolesMap roles = roles_interface->getRoles();
-
     Tp::TextChannelPtr channel(qobject_cast<Tp::TextChannel*>(sender()->parent()));
+    RolesMap rolesMap;
+    if (!mRolesMap.contains(channel->objectPath())) {
+        rolesMap = roles_interface->getRoles();
+    } else {
+        rolesMap = mRolesMap[channel->objectPath()];
+    }
+
+    QMapIterator<uint, uint> it(removed);
+    while (it.hasNext()) {
+        it.next();
+        rolesMap.remove(it.key());
+    }
+
+    QMapIterator<uint, uint> it2(added);
+    while (it2.hasNext()) {
+        it2.next();
+        rolesMap[it2.key()] = it2.value();
+    }
+        
+    mRolesMap[channel->objectPath()] = rolesMap;
+
     QVariantMap properties = propertiesFromChannel(channel);
     QVariantMap thread = threadForProperties(channel->property(History::FieldAccountId).toString(),
                                              History::EventTypeText,
                                              properties,
                                              matchFlagsForChannel(channel),
                                              false);
-
-    writeRolesInformationEvents(thread, channel, roles);
-
-    updateRoomRoles(channel, roles);
+    if (!thread.isEmpty()) {
+        writeRolesInformationEvents(thread, channel, rolesMap);
+        updateRoomRoles(channel, rolesMap);
+    }
 }
 
 QVariantMap HistoryDaemon::propertiesFromChannel(const Tp::ChannelPtr &textChannel)
@@ -192,7 +211,9 @@
     ChannelInterfaceRolesInterface *roles_interface = textChannel->optionalInterface<ChannelInterfaceRolesInterface>();
     RolesMap roles;
     if (roles_interface) {
-        roles = roles_interface->getRoles();
+        if (mRolesMap.contains(textChannel->objectPath())) {
+            roles = mRolesMap[textChannel->objectPath()];
+        }
     }
 
     Q_FOREACH(const Tp::ContactPtr contact, textChannel->groupContacts(false)) {
@@ -642,6 +663,11 @@
     writeEvents(QList<QVariantMap>() << event, properties);
 }
 
+void HistoryDaemon::onTextChannelInvalidated(const Tp::TextChannelPtr channel)
+{
+    mRolesMap.remove(channel->objectPath());
+}
+
 void HistoryDaemon::onTextChannelAvailable(const Tp::TextChannelPtr channel)
 {
     // for Rooms we need to explicitly create the thread to allow users to send messages to groups even
@@ -828,8 +854,14 @@
 
     ChannelInterfaceRolesInterface *roles_interface = channel->optionalInterface<ChannelInterfaceRolesInterface>();
     RolesMap roles;
+
     if (roles_interface) {
-        roles = roles_interface->getRoles();
+        if (!mRolesMap.contains(channel->objectPath())) {
+            roles = roles_interface->getRoles();
+            mRolesMap[channel->objectPath()] = roles;
+        } else {
+            roles = mRolesMap[channel->objectPath()];
+        }
     }
 
     Q_FOREACH(const Tp::ContactPtr contact, channel->groupRemotePendingContacts(false)) {

=== modified file 'daemon/historydaemon.h'
--- daemon/historydaemon.h	2017-02-21 15:16:23 +0000
+++ daemon/historydaemon.h	2017-02-21 15:16:23 +0000
@@ -42,7 +42,7 @@
 
     static HistoryDaemon *instance();
 
-    static QVariantMap propertiesFromChannel(const Tp::ChannelPtr &textChannel);
+    QVariantMap propertiesFromChannel(const Tp::ChannelPtr &textChannel);
     QVariantMap threadForProperties(const QString &accountId,
                                     History::EventType type,
                                     const QVariantMap &properties,
@@ -70,6 +70,7 @@
     void onMessageRead(const Tp::TextChannelPtr textChannel, const Tp::ReceivedMessage &message);
     void onMessageSent(const Tp::TextChannelPtr textChannel, const Tp::Message &message, const QString &messageToken);
     void onTextChannelAvailable(const Tp::TextChannelPtr channel);
+    void onTextChannelInvalidated(const Tp::TextChannelPtr channel);
     void onRoomPropertiesChanged(const QVariantMap &properties,const QStringList &invalidated);
     void onGroupMembersChanged(const Tp::Contacts &groupMembersAdded, const Tp::Contacts &groupLocalPendingMembersAdded,
                                const Tp::Contacts &groupRemotePendingMembersAdded, const Tp::Contacts &groupMembersRemoved,
@@ -98,6 +99,7 @@
     QMap<QString, History::MatchFlags> mProtocolFlags;
     History::PluginPtr mBackend;
     HistoryServiceDBus mDBus;
+    QMap<QString, RolesMap> mRolesMap;
 };
 
 #endif

=== modified file 'daemon/textchannelobserver.cpp'
--- daemon/textchannelobserver.cpp	2016-08-26 14:10:25 +0000
+++ daemon/textchannelobserver.cpp	2017-02-21 15:16:23 +0000
@@ -57,6 +57,7 @@
 {
     Tp::TextChannelPtr textChannel(qobject_cast<Tp::TextChannel*>(sender()));
     mChannels.removeAll(textChannel);
+    Q_EMIT textChannelInvalidated(textChannel);
 }
 
 void TextChannelObserver::onMessageReceived(const Tp::ReceivedMessage &message)

=== modified file 'daemon/textchannelobserver.h'
--- daemon/textchannelobserver.h	2016-08-26 14:10:25 +0000
+++ daemon/textchannelobserver.h	2017-02-21 15:16:23 +0000
@@ -37,6 +37,7 @@
 
 Q_SIGNALS:
     void channelAvailable(const Tp::TextChannelPtr textChannel);
+    void textChannelInvalidated(const Tp::TextChannelPtr textChannel);
     void messageReceived(const Tp::TextChannelPtr textChannel, const Tp::ReceivedMessage &message);
     void messageRead(const Tp::TextChannelPtr textChannel, const Tp::ReceivedMessage &message);
     void messageSent(const Tp::TextChannelPtr textChannel, const Tp::Message &message, const QString &messageToken);