Changeset 30895

Timestamp:

Jan 19, 2015, 5:43:43 PM (9 years ago)

Author:

plg

Message:

speed improvement with the new persistent_cache (new in Piwigo 2.7)

File:

• extensions/AMenuManager/amm_pip.class.inc.php (modified) (5 diffs)

extensions/AMenuManager/amm_pip.class.inc.php

@@ -398 +398 @@
   private function getRandomPictures($num=25)
   {
-    global $user;
+    global $user, $persistent_cache, $conf;
 
     $returned=array();
@@ -407 +407 @@
     }
 
-    $sql=array();
-
-    // because ORDER BY RAND() can be very slow on a big database, let's
-    // make a first query with no join and by security take 5 times
-    // $num. We keep the result in session for 5 minutes.
-    if (!isset($_SESSION['amm_random_pics'])
-        or !isset($_SESSION['amm_random_pics_generated_on'])
-        or $_SESSION['amm_random_pics_generated_on'] < time() - 5*60) // 5 minutes ago
-    {
-      $query = '
+    $cache_key = $persistent_cache->make_key(
+      array(
+        'amm_random_pics',
+        $conf['order_by'],
+        $user['id'],
+        $user['cache_update_time'],
+        $this->config['amm_randompicture_selectMode']
+        )
+      );
+    
+    if ($persistent_cache->get($cache_key, $returned))
+    {
+      shuffle($returned);
+      return $returned;
+    }
+
+    $query = '
 SELECT id
   FROM '.IMAGES_TABLE.'
@@ -422 +429 @@
   ORDER BY RAND() LIMIT '.($num*5).'
 ;';
-      $_SESSION['amm_random_pics'] = query2array($query, null, 'id');
-      $_SESSION['amm_random_pics_generated_on'] = time();
-    }
-    
+    $image_ids = query2array($query, null, 'id');
+
+    $sql = array();
+
     $sql['select'] = '
 SELECT
@@ -445 +452 @@
     
     $sql['where'] = '
-  WHERE i.id IN ('.implode(',', $_SESSION['amm_random_pics']).')
+  WHERE i.id IN ('.implode(',', $image_ids).')
     AND i.level <= '.$user['level'].'
 ';
@@ -493 +500 @@
     }
 
+    if (count($returned) > 0)
+    {// cache the results only if not empty - otherwise it is useless
+      $persistent_cache->set($cache_key, $returned, 300);
+    }
+    
     return($returned);
   }