diff options
author | Jordan Cook <jordan.cook.git@proton.me> | 2022-10-28 13:08:06 -0500 |
---|---|---|
committer | Jordan Cook <jordan.cook.git@proton.me> | 2022-10-28 17:38:28 -0500 |
commit | cfe381fdae57d1e2f93d5f2732d3ed57fce05b66 (patch) | |
tree | 5024cc33e50abd4786a3bd73eb16bb32f9cb5de6 /requests_cache | |
parent | 81929b18b11c72dbf7d95b7358b9cb1e0b395c2c (diff) | |
download | requests-cache-cfe381fdae57d1e2f93d5f2732d3ed57fce05b66.tar.gz |
Make use of index with SQLiteCache.filter(expired=False)
Diffstat (limited to 'requests_cache')
-rw-r--r-- | requests_cache/backends/base.py | 7 | ||||
-rw-r--r-- | requests_cache/backends/sqlite.py | 29 |
2 files changed, 22 insertions, 14 deletions
diff --git a/requests_cache/backends/base.py b/requests_cache/backends/base.py index 825cd55..efbd214 100644 --- a/requests_cache/backends/base.py +++ b/requests_cache/backends/base.py @@ -292,8 +292,11 @@ class BaseCache: DeprecationWarning, ) yield from self.redirects.keys() - for response in self.filter(expired=not check_expiry): - yield response.cache_key + if not check_expiry: + yield from self.responses.keys() + else: + for response in self.filter(expired=False): + yield response.cache_key def response_count(self, check_expiry: bool = False) -> int: warn( diff --git a/requests_cache/backends/sqlite.py b/requests_cache/backends/sqlite.py index 907e027..f936a77 100644 --- a/requests_cache/backends/sqlite.py +++ b/requests_cache/backends/sqlite.py @@ -19,6 +19,7 @@ from platformdirs import user_cache_dir from requests_cache.backends.base import VT from requests_cache.models.response import CachedResponse +from requests_cache.policy import ExpirationTime from .._utils import chunkify, get_valid_kwargs from . import BaseCache, BaseStorage @@ -56,8 +57,8 @@ class SQLiteCache(BaseCache): return self.responses.db_path def clear(self): - """Clear the cache. If this fails due to a corrupted cache or other I/O error, this will - attempt to delete the cache file and re-initialize. + """Delete all items from the cache. If this fails due to a corrupted cache or other I/O + error, this will attempt to delete the cache file and re-initialize. """ try: super().clear() @@ -68,13 +69,13 @@ class SQLiteCache(BaseCache): self.responses.init_db() self.redirects.init_db() + # A more efficient SQLite implementation of :py:meth:`BaseCache.delete` def delete( self, *keys: str, expired: bool = False, **kwargs, ): - """A more efficient SQLite implementation of :py:meth:`BaseCache.delete`""" if keys: self.responses.bulk_delete(keys) if expired: @@ -118,19 +119,23 @@ class SQLiteCache(BaseCache): """ return self.responses.count(expired=expired) - def filter( # type: ignore - self, valid: bool = True, expired: bool = True, **kwargs + # A more efficient implementation of :py:meth:`BaseCache.filter` to make use of indexes + def filter( + self, + valid: bool = True, + expired: bool = True, + invalid: bool = False, + older_than: ExpirationTime = None, ) -> Iterator[CachedResponse]: - """A more efficient implementation of :py:meth:`BaseCache.filter`, in the case where we want - to get **only** expired responses - """ - if expired and not valid and not kwargs: - return self.responses.sorted(expired=True) + if valid and not invalid: + return self.responses.sorted(expired=expired) else: - return super().filter(valid, expired, **kwargs) + return super().filter( + valid=valid, expired=expired, invalid=invalid, older_than=older_than + ) + # A more efficient implementation of :py:meth:`BaseCache.recreate_keys def recreate_keys(self): - """A more efficient implementation of :py:meth:`BaseCache.recreate_keys`""" with self.responses.bulk_commit(): super().recreate_keys() |