Remove external dependency ArrayCache

yiisoft · Jun 1, 2024 · b81bade · b81bade
1 parent 834e151
commit b81bade
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 32 deletions.
diff --git a/framework/data/ActiveDataProvider.php b/framework/data/ActiveDataProvider.php
@@ -9,7 +9,6 @@
 
 use yii\base\InvalidConfigException;
 use yii\base\Model;
-use yii\caching\ArrayCache;
 use yii\db\ActiveQueryInterface;
 use yii\db\Connection;
 use yii\db\QueryInterface;
@@ -152,6 +151,8 @@ protected function prepareKeys($models)
         return array_keys($models);
     }
 
+    private $_totalCount = [];
+
     /**
      * {@inheritdoc}
      */
@@ -161,23 +162,12 @@ protected function prepareTotalCount()
             throw new InvalidConfigException('The "query" property must be an instance of a class that implements the QueryInterface e.g. yii\db\Query or its subclasses.');
         }
         $query = (clone $this->query)->limit(-1)->offset(-1)->orderBy([]);
+        $key = md5((string)$query);
 
-        return $this->getQueryCache()->getOrSet((string)$query, function () use ($query) {
-            return (int) $query->count('*', $this->db);
-        });
-    }
-
-    private $_queryCache;
-
-    /**
-     * @return \yii\caching\CacheInterface
-     */
-    protected function getQueryCache()
-    {
-        if ($this->_queryCache === null) {
-            $this->_queryCache = new ArrayCache();
+        if (isset($this->_totalCount[$key]) === false) {
+            $this->_totalCount[$key] = (int)$query->count('*', $this->db);
         }
-        return $this->_queryCache;
+        return $this->_totalCount[$key];
     }
 
     /**

diff --git a/framework/data/SqlDataProvider.php b/framework/data/SqlDataProvider.php
@@ -8,7 +8,6 @@
 namespace yii\data;
 
 use yii\base\InvalidConfigException;
-use yii\caching\ArrayCache;
 use yii\db\Connection;
 use yii\db\Expression;
 use yii\db\Query;
@@ -155,6 +154,8 @@ protected function prepareKeys($models)
         return array_keys($models);
     }
 
+    private $_totalCount = [];
+
     /**
      * {@inheritdoc}
      */
@@ -164,22 +165,11 @@ protected function prepareTotalCount()
             'from' => ['sub' => "({$this->sql})"],
             'params' => $this->params,
         ]);
+        $key = md5((string)$query);
 
-        return $this->getQueryCache()->getOrSet((string)$query, function () use ($query) {
-            return (int) $query->count('*', $this->db);
-        });
-    }
-
-    private $_queryCache;
-
-    /**
-     * @return \yii\caching\CacheInterface
-     */
-    protected function getQueryCache()
-    {
-        if ($this->_queryCache === null) {
-            $this->_queryCache = new ArrayCache();
+        if (isset($this->_totalCount[$key]) === false) {
+            $this->_totalCount[$key] = (int)$query->count('*', $this->db);
         }
-        return $this->_queryCache;
+        return $this->_totalCount[$key];
     }
 }