Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix ttl for the SQLiteStorage #119

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## Unreleased

- Add `force_cache` extension to enforce the request to be cached, ignoring the HTTP headers. (#117)
- Fix issue where sqlite storage cache get deleted immediately. (#119)

## 0.0.18 (23/11/2023)

Expand Down
2 changes: 1 addition & 1 deletion hishel/_async/_storages.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ async def _remove_expired_caches(self) -> None:

async with self._lock:
await self._connection.execute(
f"DELETE FROM cache WHERE datetime(date_created, '+{self._ttl} seconds') > datetime()"
f"DELETE FROM cache WHERE datetime(date_created, '+{self._ttl} seconds') < datetime()"
)
await self._connection.commit()

Expand Down
2 changes: 1 addition & 1 deletion hishel/_sync/_storages.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ def _remove_expired_caches(self) -> None:

with self._lock:
self._connection.execute(
f"DELETE FROM cache WHERE datetime(date_created, '+{self._ttl} seconds') > datetime()"
f"DELETE FROM cache WHERE datetime(date_created, '+{self._ttl} seconds') < datetime()"
)
self._connection.commit()

Expand Down
3 changes: 3 additions & 0 deletions tests/_async/test_storages.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ async def test_filestorage_expired():
await response.aread()

await storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata)
assert await storage.retreive(first_key) is not None

await asleep(2)
await storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata)
Expand All @@ -127,6 +128,7 @@ async def test_redisstorage_expired():
await response.aread()

await storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata)
assert await storage.retreive(first_key) is not None

await asleep(2)
await storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata)
Expand All @@ -147,6 +149,7 @@ async def test_sqlite_expired():
await response.aread()

await storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata)
assert await storage.retreive(first_key) is not None

await asleep(2)
await storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata)
Expand Down
3 changes: 3 additions & 0 deletions tests/_sync/test_storages.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ def test_filestorage_expired():
response.read()

storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata)
assert storage.retreive(first_key) is not None

sleep(2)
storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata)
Expand All @@ -127,6 +128,7 @@ def test_redisstorage_expired():
response.read()

storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata)
assert storage.retreive(first_key) is not None

sleep(2)
storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata)
Expand All @@ -147,6 +149,7 @@ def test_sqlite_expired():
response.read()

storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata)
assert storage.retreive(first_key) is not None

sleep(2)
storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata)
Expand Down