MOBILE-1966 glossary: Performance improvements on cache invalidation

Author: crazyserver

www/addons/mod/glossary/services/glossary.js

@@ -607,11 +607,28 @@ angular.module('mm.addons.mod_glossary')
      */
     self.invalidateEntry = function(entryId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            var key = self._getEntryCacheKey(entryId);
-            return site.invalidateWsCacheForKey(key);
+            return site.invalidateWsCacheForKey(self._getEntryCacheKey(entryId));
         });
     };
 
+    /**
+     * Invalidate cache of all entries in the array.
+     *
+     * @param  {Array}  entries         Entry objects to invalidate.
+     * @param  {String} [siteId]        Site ID. If not defined, current site.
+     * @return {Promise}                Resolved when data is invalidated.
+     */
+    function invalidateEntries(entries, siteId) {
+        var keys = [];
+        angular.forEach(entries, function(entry) {
+            keys.push(self._getEntryCacheKey(entry.id));
+        });
+
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateMultipleWsCacheForKey(keys);
+        });
+    }
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModGlossary#invalidateFiles.
@@ -641,37 +658,38 @@ angular.module('mm.addons.mod_glossary')
      * @module mm.addons.mod_glossary
      * @ngdoc method
      * @name $mmaModGlossary#invalidateGlossaryEntries
-     * @param {Object} glossary     The glossary object.
-     * @return {Promise}            Promise resolved when data is invalidated.
+     * @param {Object} glossary         The glossary object.
+     * @param {Object} onlyEntriesList  If true, entries won't be invalidated.
+     * @return {Promise}                Promise resolved when data is invalidated.
      */
-    self.invalidateGlossaryEntries = function(glossary) {
-        return self.fetchAllEntries(self.getEntriesByLetter, [glossary.id, 'ALL'], true).then(function(entries) {
-            var promises = [];
+    self.invalidateGlossaryEntries = function(glossary, onlyEntriesList) {
+        var promises = [];
 
-            angular.forEach(entries, function(entry) {
-                promises.push(self.invalidateEntry(entry.id));
-            });
-
-            angular.forEach(glossary.browsemodes, function(mode) {
-                switch(mode) {
-                    case 'letter':
-                        promises.push(self.invalidateEntriesByLetter(glossary.id, 'ALL'));
-                        break;
-                    case 'cat':
-                        promises.push(self.invalidateEntriesByCategory(glossary.id, mmaModGlossaryShowAllCategories));
-                        break;
-                    case 'date':
-                        promises.push(self.invalidateEntriesByDate(glossary.id, 'CREATION', 'DESC'));
-                        promises.push(self.invalidateEntriesByDate(glossary.id, 'UPDATE', 'DESC'));
-                        break;
-                    case 'author':
-                        promises.push(self.invalidateEntriesByAuthor(glossary.id, 'ALL', 'LASTNAME', 'ASC'));
-                        break;
-                }
-            });
+        if (!onlyEntriesList) {
+            promises.push(self.fetchAllEntries(self.getEntriesByLetter, [glossary.id, 'ALL'], true).then(function(entries) {
+                return invalidateEntries(entries);
+            }));
+        }
 
-            return $q.all(promises);
+        angular.forEach(glossary.browsemodes, function(mode) {
+            switch(mode) {
+                case 'letter':
+                    promises.push(self.invalidateEntriesByLetter(glossary.id, 'ALL'));
+                    break;
+                case 'cat':
+                    promises.push(self.invalidateEntriesByCategory(glossary.id, mmaModGlossaryShowAllCategories));
+                    break;
+                case 'date':
+                    promises.push(self.invalidateEntriesByDate(glossary.id, 'CREATION', 'DESC'));
+                    promises.push(self.invalidateEntriesByDate(glossary.id, 'UPDATE', 'DESC'));
+                    break;
+                case 'author':
+                    promises.push(self.invalidateEntriesByAuthor(glossary.id, 'ALL', 'LASTNAME', 'ASC'));
+                    break;
+            }
         });
+
+        return $q.all(promises);
     };
 
     /**

www/addons/mod/glossary/services/glossary_sync.js

@@ -192,7 +192,7 @@ angular.module('mm.addons.mod_glossary')
                             // Responses deleted, add a warning.
                             result.warnings.push($translate.instant('mm.core.warningofflinedatadeleted', {
                                 component: $mmCourse.translateModuleName('glossary'),
-                                name: data.name,
+                                name: data.concept,
                                 error: error.error
                             }));
                         });
@@ -208,7 +208,7 @@ angular.module('mm.addons.mod_glossary')
             if (result.updated && courseId) {
                 // Data has been sent to server. Now invalidate the WS calls.
                 return $mmaModGlossary.getGlossaryById(courseId, glossaryId).then(function(glossary) {
-                    return $mmaModGlossary.invalidateGlossaryEntries(glossary);
+                    return $mmaModGlossary.invalidateGlossaryEntries(glossary, true);
                 }).catch(function() {
                     // Ignore errors.
                 });

www/core/lib/sitesfactory.js

@@ -816,6 +816,37 @@ angular.module('mm.core')
             });
         };
 
+        /**
+         * Invalidates all the cache entries with for an array of keys.
+         *
+         * @param  {Array} keys Keys to search.
+         * @return {Promise}    Promise resolved when the cache entries are invalidated.
+         */
+        Site.prototype.invalidateMultipleWsCacheForKey = function(keys) {
+            var db = this.db;
+            if (!db) {
+                return $q.reject();
+            }
+
+            var allEntries = [],
+                promises = [];
+
+            $log.debug('Invalidating multiple cache keys');
+            angular.forEach(keys, function(key) {
+                if (key) {
+                    promises.push(db.whereEqual(mmCoreWSCacheStore, 'key', key).then(function(entries) {
+                        if (entries && entries.length > 0) {
+                            allEntries.concat(entries);
+                        }
+                    }));
+                }
+            });
+
+            return $q.all(promises).then(function() {
+                return invalidateWsCacheEntries(db, allEntries);
+            });
+        };
+
         /**
          * Invalidates all the cache entries whose key starts with a certain value.
          *
@@ -1263,9 +1294,10 @@ angular.module('mm.core')
         function invalidateWsCacheEntries(db, entries) {
             var promises = [];
             angular.forEach(entries, function(entry) {
-                entry.expirationtime = 0;
-                var promise = db.insert(mmCoreWSCacheStore, entry);
-                promises.push(promise);
+                if (entry.expirationtime > 0) {
+                    entry.expirationtime = 0;
+                    promises.push(db.insert(mmCoreWSCacheStore, entry));
+                }
             });
             return $q.all(promises);
         }