Fixed issue ##19589: Multiple call of Survey->find a lot of time

SondagesPro · Jun 26, 2024 · 1058634 · 1058634
1 parent ec62bea
commit 1058634
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 8 deletions.
diff --git a/application/models/Question.php b/application/models/Question.php
@@ -135,6 +135,18 @@ public function relations()
         );
     }
 
+    /**
+     * @inheritdoc
+     * replace under condition $oQuestion->survey to use Survey::$findByPkCache
+     */
+    public function getRelated($name, $refresh = false, $params = array())
+    {
+        if ($name == 'survey' && !$refresh && empty($params)) {
+            return Survey::model()->findByPk($this->sid);
+        }
+        return parent::getRelated($name, $refresh, $params);
+    }
+
     /**
      * @inheritdoc
      * TODO: make it easy to read (if possible)

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -158,7 +158,7 @@ class Survey extends LSActiveRecord implements PermissionInterface
      *
      * @var array $findByPkCache
      */
-    protected $findByPkCache = array();
+    protected static $findByPkCache;
 
 
     // survey options
@@ -348,9 +348,7 @@ public function delete($recursive = true)
         }
 
         // Remove from cache
-        if (array_key_exists($this->sid, $this->findByPkCache)) {
-            unset($this->findByPkCache[$this->sid]);
-        }
+        $this->unsetFromStaticPkCache();
 
         return true;
     }
@@ -1002,12 +1000,12 @@ public function findByPk($pk, $condition = '', $params = array())
     {
         /** @var self $model */
         if (empty($condition) && empty($params)) {
-            if (array_key_exists($pk, $this->findByPkCache)) {
-                return $this->findByPkCache[$pk];
+            if (isset(self::$findByPkCache[$pk])) {
+                return self::$findByPkCache[$pk];
             } else {
                 $model = parent::findByPk($pk, $condition, $params);
                 if (!is_null($model)) {
-                    $this->findByPkCache[$pk] = $model;
+                    self::$findByPkCache[$pk] = $model;
                 }
                 return $model;
             }
@@ -1016,12 +1014,23 @@ public function findByPk($pk, $condition = '', $params = array())
         return $model;
     }
 
+    /**
+     * Delete from static $findByPkCache
+     * return void
+     */
+    public function unsetFromStaticPkCache()
+    {
+        if (isset(self::$findByPkCache[$this->sid])) {
+            unset(self::$findByPkCache[$this->sid]);
+        }
+    }
+
     /**
      * findByPk uses a cache to store a result. Use this method to force clearing that cache.
      */
     public function resetCache()
     {
-        $this->findByPkCache = array();
+        self::$findByPkCache = array();
     }
 
     /**