优化查询缓存

top-think · Jun 25, 2024 · fed3f23 · fed3f23
1 parent 9226291
commit fed3f23
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/db/PDOConnection.php b/src/db/PDOConnection.php
@@ -723,10 +723,8 @@ protected function pdoQuery(BaseQuery $query, $sql, bool $master = null): array
             if (!$query->getOptions('force_cache')) {
                 $key = $cacheItem->getKey();
 
-                $data = $this->cache->get($key);
-
-                if (null !== $data) {
-                    return $data;
+                if ($this->cache->has($key)) {
+                    return $this->cache->get($key);
                 }
             }
         }
@@ -1252,14 +1250,16 @@ public function value(BaseQuery $query, string $field, $default = null, bool $on
         $pdo = $this->getPDOStatement($sql, $query->getBind(), $options['master']);
 
         $result = $pdo->fetchColumn();
+        $result = false !== $result ? $result : $default;
+        $requireCache = $query->getOptions('cache_always') || !empty($result);
 
-        if (isset($cacheItem)) {
+        if (isset($cacheItem) && $requireCache) {
             // 缓存数据
             $cacheItem->set($result);
             $this->cacheData($cacheItem);
         }
 
-        return false !== $result ? $result : $default;
+        return $result;
     }
 
     /**
@@ -1374,7 +1374,9 @@ public function column(BaseQuery $query, string|array $column, string $key = '')
             $result = $resultSet;
         }
 
-        if (isset($cacheItem)) {
+        $requireCache = $query->getOptions('cache_always') || !empty($result);
+
+        if (isset($cacheItem) && $requireCache) {
             // 缓存数据
             $cacheItem->set($result);
             $this->cacheData($cacheItem);