-
Notifications
You must be signed in to change notification settings - Fork 702
fix: Apply SQLite optimizations to the custom connection_string in SqlStorageClient
#1837
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
Open
Mantisus
wants to merge
2
commits into
apify:master
Choose a base branch
from
Mantisus:optimization-sqllite
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+60
−3
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
tests/unit/storage_clients/_sql/test_sql_storage_client.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| from __future__ import annotations | ||
|
|
||
| from typing import TYPE_CHECKING | ||
|
|
||
| from sqlalchemy import text | ||
| from sqlalchemy.ext.asyncio import create_async_engine | ||
|
|
||
| from crawlee.configuration import Configuration | ||
| from crawlee.storage_clients import SqlStorageClient | ||
|
|
||
| if TYPE_CHECKING: | ||
| from pathlib import Path | ||
|
|
||
|
|
||
| async def test_sqlite_wal_mode_with_default_connection(tmp_path: Path) -> None: | ||
| """Test that WAL mode is applied for the default SQLite connection.""" | ||
| configuration = Configuration(storage_dir=str(tmp_path)) | ||
|
|
||
| async with SqlStorageClient() as storage_client: | ||
| await storage_client.initialize(configuration) | ||
|
|
||
| async with storage_client.engine.begin() as conn: | ||
| result = await conn.execute(text('PRAGMA journal_mode')) | ||
| assert result.scalar() == 'wal' | ||
|
|
||
|
|
||
| async def test_sqlite_wal_mode_with_connection_string(tmp_path: Path) -> None: | ||
| """Test that WAL mode is applied when using a custom SQLite connection string.""" | ||
| db_path = tmp_path / 'test.db' | ||
| configuration = Configuration(storage_dir=str(tmp_path)) | ||
|
|
||
| async with SqlStorageClient(connection_string=f'sqlite+aiosqlite:///{db_path}') as storage_client: | ||
| await storage_client.initialize(configuration) | ||
|
|
||
| async with storage_client.engine.begin() as conn: | ||
| result = await conn.execute(text('PRAGMA journal_mode')) | ||
| assert result.scalar() == 'wal' | ||
|
|
||
|
|
||
| async def test_sqlite_wal_mode_not_applied_with_custom_engine(tmp_path: Path) -> None: | ||
| """Test that WAL mode is not applied when using a user-provided engine.""" | ||
| db_path = tmp_path / 'test.db' | ||
| configuration = Configuration(storage_dir=str(tmp_path)) | ||
| engine = create_async_engine(f'sqlite+aiosqlite:///{db_path}', future=True) | ||
|
|
||
| async with SqlStorageClient(engine=engine) as storage_client: | ||
| await storage_client.initialize(configuration) | ||
|
|
||
| async with engine.begin() as conn: | ||
| result = await conn.execute(text('PRAGMA journal_mode')) | ||
| assert result.scalar() != 'wal' |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we instead set up an
_on_connectcallback here that would receive the new DB connection? That way, the logic (if sqlite, set up some pragmas) would be in one place.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea.