-
Notifications
You must be signed in to change notification settings - Fork 158
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
added extras execute_batch for executemany #632
Open
vir-mir
wants to merge
2
commits into
master
Choose a base branch
from
add_execute_batch
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.
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 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,43 @@ | ||
def _paginate(seq, page_size): | ||
"""Consume an iterable and return it in chunks. | ||
|
||
Every chunk is at most `page_size`. Never return an empty chunk. | ||
""" | ||
page = [] | ||
count = len(seq) | ||
it = iter(seq) | ||
for s in range(count + 1): | ||
try: | ||
for i in range(page_size): | ||
page.append(next(it)) | ||
yield page | ||
page = [] | ||
except StopIteration: | ||
if page: | ||
yield page | ||
return | ||
|
||
|
||
async def execute_batch(cur, sql, argslist, page_size=100): | ||
r"""Execute groups of statements in fewer server roundtrips. | ||
|
||
Execute *sql* several times, against all parameters set (sequences or | ||
mappings) found in *argslist*. | ||
|
||
The function is semantically similar to | ||
|
||
.. parsed-literal:: | ||
|
||
*cur*\.\ `~cursor.executemany`\ (\ *sql*\ , *argslist*\ ) | ||
|
||
but has a different implementation: Psycopg will join the statements into | ||
fewer multi-statement commands, each one containing at most *page_size* | ||
statements, resulting in a reduced number of server roundtrips. | ||
|
||
After the execution of the function the `cursor.rowcount` property will | ||
**not** contain a total result. | ||
|
||
""" | ||
for page in _paginate(argslist, page_size=page_size): | ||
sqls = [cur.mogrify(sql, args) for args in page] | ||
await cur.execute(b";".join(sqls)) |
This file contains 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,54 @@ | ||
import pytest | ||
|
||
from aiopg.extras import _paginate, execute_batch | ||
|
||
|
||
@pytest.fixture | ||
def connect(make_connection): | ||
async def go(**kwargs): | ||
conn = await make_connection(**kwargs) | ||
async with conn.cursor() as cur: | ||
await cur.execute("DROP TABLE IF EXISTS tbl_extras") | ||
await cur.execute("CREATE TABLE tbl_extras (id int)") | ||
return conn | ||
|
||
return go | ||
|
||
|
||
@pytest.fixture | ||
def cursor(connect, loop): | ||
async def go(): | ||
return await (await connect()).cursor() | ||
|
||
cur = loop.run_until_complete(go()) | ||
yield cur | ||
cur.close() | ||
|
||
|
||
def test__paginate(): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. thanks! |
||
data = [ | ||
[1, 2, 3], | ||
[4, 5, 6], | ||
[7], | ||
] | ||
for index, val in enumerate(_paginate((1, 2, 3, 4, 5, 6, 7), page_size=3)): | ||
assert data[index] == list(val) | ||
|
||
|
||
def test__paginate_even(): | ||
data = [ | ||
[1, 2, 3], | ||
[4, 5, 6], | ||
] | ||
for index, val in enumerate(_paginate((1, 2, 3, 4, 5, 6), page_size=3)): | ||
assert data[index] == list(val) | ||
|
||
|
||
async def test_execute_batch(cursor): | ||
args = [(1,), (2,), (3,), (4,)] | ||
sql = 'insert into tbl_extras values(%s)' | ||
await execute_batch(cursor, sql, argslist=args, page_size=3) | ||
|
||
await cursor.execute('SELECT * from tbl_extras') | ||
ret = await cursor.fetchall() | ||
assert list(ret) == args |
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.
I think it is better solution
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.
with this solution you can use iterators in _paginate
for example
_paginate(range(1, 8), 3)