refactor: optimize expired notification cleanup implementation

panels/notification/center/notificationcenterpanel.cpp

@@ -102,6 +102,13 @@ void NotificationCenterPanel::setVisible(bool newVisible)
     if (m_visible == newVisible)
         return;
     m_visible = newVisible;
+    if (m_visible) {
+        qDebug(notifyLog) << "Try to remove expired notifications.";
+        DAppletBridge bridge("org.deepin.ds.notificationserver");
+        if (auto applet = bridge.applet()) {
+            QMetaObject::invokeMethod(applet, "removeExpiredNotifications", Qt::DirectConnection);
+        }
+    }
     notifycenter::NotifyAccessor::instance()->setEnabled(m_visible);
     setBubblePanelEnabled(!m_visible);
     emit visibleChanged();

panels/notification/common/dataaccessor.h

@@ -34,8 +34,11 @@ class DataAccessor
     virtual NotifyEntity fetchEntity(qint64 id) { Q_UNUSED(id); return {}; }
     virtual int fetchEntityCount(const QString &appName, int processedType) const { Q_UNUSED(appName); Q_UNUSED(processedType); return 0; }
     virtual NotifyEntity fetchLastEntity(const QString &appName, int processedType) { Q_UNUSED(appName); Q_UNUSED(processedType); return {}; }
-    virtual NotifyEntity fetchLastEntity(uint notifyId) { Q_UNUSED(notifyId); return {}; }
-    virtual QList<NotifyEntity> fetchExpiredEntities(qint64 expiredTime) { Q_UNUSED(expiredTime); return {}; }
+    virtual NotifyEntity fetchLastEntity(uint notifyId)
+    {
+        Q_UNUSED(notifyId);
+        return {};
+    }
     virtual QList<NotifyEntity> fetchEntities(const QString &appName, int processedType, int maxCount)
     {
         Q_UNUSED(appName)
@@ -47,6 +50,10 @@ class DataAccessor
 
     virtual void removeEntity(qint64 id) { Q_UNUSED(id); }
     virtual void removeEntityByApp(const QString &appName) { Q_UNUSED(appName); }
+    virtual void removeEntitiesByExpiredTime(qint64 expiredTime)
+    {
+        Q_UNUSED(expiredTime);
+    }
     virtual void clear() {}
     inline static QString AllApp()
     {

panels/notification/common/dataaccessorproxy.cpp

@@ -116,11 +116,6 @@ NotifyEntity DataAccessorProxy::fetchLastEntity(uint notifyId)
     return m_source->fetchLastEntity(notifyId);
 }
 
-QList<NotifyEntity> DataAccessorProxy::fetchExpiredEntities(qint64 expiredTime)
-{
-    return m_source->fetchExpiredEntities(expiredTime);
-}
-
 QList<NotifyEntity> DataAccessorProxy::fetchEntities(const QString &appName, int processedType, int maxCount)
 {
     if (processedType == NotifyEntity::NotProcessed) {
@@ -149,6 +144,11 @@ void DataAccessorProxy::removeEntityByApp(const QString &appName)
     m_source->removeEntityByApp(appName);
 }
 
+void DataAccessorProxy::removeEntitiesByExpiredTime(qint64 expiredTime)
+{
+    m_source->removeEntitiesByExpiredTime(expiredTime);
+}
+
 void DataAccessorProxy::clear()
 {
     m_source->clear();

panels/notification/common/dataaccessorproxy.h

@@ -31,12 +31,12 @@ class DataAccessorProxy : public DataAccessor
     virtual int fetchEntityCount(const QString &appName, int processedType) const override;
     virtual NotifyEntity fetchLastEntity(const QString &appName, int processedType) override;
     virtual NotifyEntity fetchLastEntity(uint notifyId) override;
-    virtual QList<NotifyEntity> fetchExpiredEntities(qint64 expiredTime) override;
     virtual QList<NotifyEntity> fetchEntities(const QString &appName, int processedType, int maxCount) override;
     virtual QList<QString> fetchApps(int maxCount) const override;
 
     virtual void removeEntity(qint64 id) override;
     virtual void removeEntityByApp(const QString &appName) override;
+    virtual void removeEntitiesByExpiredTime(qint64 expiredTime) override;
     virtual void clear() override;
 
 private:

panels/notification/common/dbaccessor.cpp

@@ -443,32 +443,6 @@ NotifyEntity DBAccessor::fetchLastEntity(uint notifyId)
     return {};
 }
 
-QList<NotifyEntity> DBAccessor::fetchExpiredEntities(qint64 expiredTime)
-{
-    BENCHMARK();
-
-    QMutexLocker locker(&m_mutex);
-    QSqlQuery query(m_connection);
-
-    QString cmd = QString("SELECT %1 FROM notifications2 WHERE CTime < :expiredTime ORDER BY CTime ASC").arg(EntityFields.join(","));
-    query.prepare(cmd);
-    query.bindValue(":expiredTime", expiredTime);
-
-    if (!query.exec()) {
-        qWarning(notifyDBLog) << "Query execution error:" << query.lastError().text();
-        return {};
-    }
-
-    QList<NotifyEntity> expiredEntities;
-    while (query.next()) {
-        auto entity = parseEntity(query);
-        if (entity.isValid()) {
-            expiredEntities.append(entity);
-        }
-    }
-    return expiredEntities;
-}
-
 QList<QString> DBAccessor::fetchApps(int maxCount) const
 {
     BENCHMARK();
@@ -538,6 +512,25 @@ void DBAccessor::removeEntityByApp(const QString &appName)
     qDebug(notifyDBLog) << "Delete notify count" << query.numRowsAffected();
 }
 
+void DBAccessor::removeEntitiesByExpiredTime(qint64 expiredTime)
+{
+    BENCHMARK();
+
+    QMutexLocker locker(&m_mutex);
+    QSqlQuery query(m_connection);
+
+    QString cmd("DELETE FROM notifications2 WHERE CTime < :expiredTime");
+    query.prepare(cmd);
+    query.bindValue(":expiredTime", expiredTime);
+
+    if (!query.exec()) {
+        qWarning(notifyDBLog) << "Query execution error:" << query.lastError().text();
+        return;
+    }
+
+    qDebug(notifyDBLog) << "Delete notify count" << query.numRowsAffected();
+}
+
 void DBAccessor::clear()
 {
     BENCHMARK();

panels/notification/common/dbaccessor.h

@@ -37,11 +37,11 @@ class DBAccessor : public DataAccessor
     NotifyEntity fetchLastEntity(const QString &appName, int processedType) override;
     QList<NotifyEntity> fetchEntities(const QString &appName, int processedType, int maxCount) override;
     NotifyEntity fetchLastEntity(uint notifyId) override;
-    QList<NotifyEntity> fetchExpiredEntities(qint64 expiredTime) override;
     QList<QString> fetchApps(int maxCount) const override;
 
     void removeEntity(qint64 id) override;
     void removeEntityByApp(const QString &appName) override;
+    void removeEntitiesByExpiredTime(qint64 expiredTime) override;
     void clear() override;
 
 private:

panels/notification/common/memoryaccessor.cpp

@@ -103,24 +103,6 @@ NotifyEntity MemoryAccessor::fetchLastEntity(uint notifyId)
     return {};
 }
 
-QList<NotifyEntity> MemoryAccessor::fetchExpiredEntities(qint64 expiredTime)
-{
-    QMutexLocker locker(&m_mutex);
-    QList<NotifyEntity> expiredEntities;
-
-    for (const auto &entity : m_entities) {
-        if (entity.cTime() < expiredTime) {
-            expiredEntities.append(entity);
-        }
-    }
-
-    std::sort(expiredEntities.begin(), expiredEntities.end(), [](const NotifyEntity &a, const NotifyEntity &b) {
-        return a.cTime() < b.cTime();
-    });
-
-    return expiredEntities;
-}
-
 QList<NotifyEntity> MemoryAccessor::fetchEntities(const QString &appName, int processedType, int maxCount)
 {
     QMutexLocker locker(&m_mutex);
@@ -165,6 +147,14 @@ void MemoryAccessor::removeEntityByApp(const QString &appName)
     });
 }
 
+void MemoryAccessor::removeEntitiesByExpiredTime(qint64 expiredTime)
+{
+    QMutexLocker locker(&m_mutex);
+    m_entities.removeIf([expiredTime](const NotifyEntity &entity) {
+        return entity.cTime() < expiredTime;
+    });
+}
+
 void MemoryAccessor::clear()
 {
     QMutexLocker locker(&m_mutex);

panels/notification/common/memoryaccessor.h

@@ -27,12 +27,12 @@ class MemoryAccessor : public DataAccessor
     virtual int fetchEntityCount(const QString &appName, int processedType) const override;
     virtual NotifyEntity fetchLastEntity(const QString &appName, int processedType) override;
     virtual NotifyEntity fetchLastEntity(uint notifyId) override;
-    virtual QList<NotifyEntity> fetchExpiredEntities(qint64 expiredTime) override;
     virtual QList<NotifyEntity> fetchEntities(const QString &appName, int processedType, int maxCount) override;
     virtual QList<QString> fetchApps(int maxCount) const override;
 
     virtual void removeEntity(qint64 id) override;
     virtual void removeEntityByApp(const QString &appName) override;
+    virtual void removeEntitiesByExpiredTime(qint64 expiredTime) override;
     virtual void clear() override;
 
 private:

panels/notification/server/notificationmanager.cpp

@@ -49,14 +49,9 @@ NotificationManager::NotificationManager(QObject *parent)
     , m_persistence(DataAccessorProxy::instance())
     , m_setting(new NotificationSetting(this))
     , m_pendingTimeout(new QTimer(this))
-    , m_cleanupTimer(new QTimer(this))
 {
     m_pendingTimeout->setSingleShot(true);
     connect(m_pendingTimeout, &QTimer::timeout, this, &NotificationManager::onHandingPendingEntities);
-
-    m_cleanupTimer->setInterval(1000); 
-    connect(m_cleanupTimer, &QTimer::timeout, this, &NotificationManager::onCleanupExpiredNotifications);
-    m_cleanupTimer->start();
 
     DataAccessorProxy::instance()->setSource(DBAccessor::instance());
 
@@ -175,6 +170,15 @@ void NotificationManager::removeNotifications()
     emitRecordCountChanged();
 }
 
+void NotificationManager::removeExpiredNotifications()
+{
+    qDebug(notifyLog) << "Remove expired notifications.";
+    const qint64 cutoffTime = QDateTime::currentDateTime().addDays(-m_cleanupDays).toMSecsSinceEpoch();
+    m_persistence->removeEntitiesByExpiredTime(cutoffTime);
+
+    emitRecordCountChanged();
+}
+
 QStringList NotificationManager::GetCapabilities()
 {
     QStringList result;
@@ -684,14 +688,4 @@ void NotificationManager::onScreenLockedChanged(bool screenLocked)
     m_screenLocked = screenLocked;
 }
 
-void NotificationManager::onCleanupExpiredNotifications()
-{    
-    const qint64 cutoffTime = QDateTime::currentDateTime().addDays(-m_cleanupDays).toMSecsSinceEpoch();
-    auto expiredEntities = m_persistence->fetchExpiredEntities(cutoffTime);
-
-    for (const auto &entity : expiredEntities) {
-        notificationClosed(entity.id(), entity.bubbleId(), NotifyEntity::Timeout);
-    }
-}
-
 } // notification

panels/notification/server/notificationmanager.h

@@ -34,6 +34,7 @@ class NotificationManager : public QObject, public QDBusContext
     void removeNotification(qint64 id);
     void removeNotifications(const QString &appName);
     void removeNotifications();
+    void removeExpiredNotifications();
 
 Q_SIGNALS:
     // Standard Notifications dbus implementation
@@ -83,7 +84,6 @@ private slots:
     void onHandingPendingEntities();
     void removePendingEntity(const NotifyEntity &entity);
     void onScreenLockedChanged(bool);
-    void onCleanupExpiredNotifications();
 
 private:
     uint m_replacesCount = 0;
@@ -92,7 +92,6 @@ private slots:
     DataAccessor *m_persistence = nullptr;
     NotificationSetting *m_setting = nullptr;
     QTimer *m_pendingTimeout = nullptr;
-    QTimer *m_cleanupTimer = nullptr;
     qint64 m_lastTimeoutPoint = std::numeric_limits<qint64>::max();
     QMultiHash<qint64, NotifyEntity> m_pendingTimeoutEntities;
     QStringList m_systemApps;

panels/notification/server/notifyserverapplet.cpp

@@ -56,6 +56,8 @@ bool NotifyServerApplet::init()
 
     connect(m_manager, &NotificationManager::NotificationStateChanged, this, &NotifyServerApplet::notificationStateChanged);
 
+    removeExpiredNotifications();
+
     m_worker = new QThread();
     m_manager->moveToThread(m_worker);
     m_worker->start();
@@ -97,6 +99,11 @@ void NotifyServerApplet::removeNotifications()
     m_manager->removeNotifications();
 }
 
+void NotifyServerApplet::removeExpiredNotifications()
+{
+    m_manager->removeExpiredNotifications();
+}
+
 D_APPLET_CLASS(NotifyServerApplet)
 
 }

panels/notification/server/notifyserverapplet.h

@@ -30,6 +30,7 @@ public Q_SLOTS:
     void removeNotification(qint64 id);
     void removeNotifications(const QString &appName);
     void removeNotifications();
+    void removeExpiredNotifications();
 
 private:
     NotificationManager *m_manager = nullptr;