Skip to content

Commit 18e3020

Browse files
committed
ensure that update runs over unique ids
1 parent 7e37fc4 commit 18e3020

File tree

2 files changed

+21
-13
lines changed

2 files changed

+21
-13
lines changed

frameworks/Python/aiohttp/app/views.py

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
from operator import attrgetter, itemgetter
22
from pathlib import Path
3-
from random import randint
3+
from random import randint, sample
44

55
import jinja2
66
import orjson
77
from aiohttp.web import Response
88
from sqlalchemy import select
9+
from sqlalchemy.orm.attributes import flag_modified
910

1011
from .models import sa_fortunes, sa_worlds, Fortune, World
1112

@@ -77,7 +78,7 @@ async def multiple_database_queries_orm(request):
7778
result = []
7879
async with request.app['db_session']() as sess:
7980
for id_ in ids:
80-
num = await sess.scalar(READ_SELECT_ORM.filter_by(id=id_))
81+
num = await sess.scalar(READ_SELECT_ORM.where(World.id == id_))
8182
result.append({'id': id_, 'randomNumber': num})
8283
return json_response(result)
8384

@@ -131,30 +132,38 @@ async def updates(request):
131132
Test 5 ORM
132133
"""
133134
num_queries = get_num_queries(request)
134-
updates = [(randint(1, 10000), randint(1, 10000)) for _ in range(num_queries)]
135-
updates.sort()
136-
worlds = [{'id': row_id, 'randomNumber': number} for row_id, number in updates]
135+
136+
ids = sample(range(1, 10000 + 1), num_queries)
137+
ids.sort()
138+
worlds = []
137139

138140
async with request.app['db_session'].begin() as sess:
139-
for id_, number in updates:
140-
world = await sess.get(World, id_, populate_existing=True)
141-
world.randomnumber = number
141+
for row_id in ids:
142+
random_number = randint(1, 10000)
143+
world = await sess.get(World, row_id, populate_existing=True)
144+
world.randomnumber = random_number
145+
# force sqlalchemy to UPDATE entry even if the value has not changed
146+
# doesn't make sense in a real application, added only for pass `tfb verify`
147+
flag_modified(world, "randomnumber")
148+
worlds.append({'id': row_id, 'randomNumber': random_number})
149+
142150
return json_response(worlds)
143151

144152
async def updates_raw(request):
145153
"""
146154
Test 5 RAW
147155
"""
148156
num_queries = get_num_queries(request)
149-
updates = [(randint(1, 10000), randint(1, 10000)) for _ in range(num_queries)]
150-
updates.sort()
157+
ids = sample(range(1, 10000 + 1), num_queries)
158+
ids.sort()
159+
updates = [(row_id, randint(1, 10000)) for row_id in ids]
151160
worlds = [{'id': row_id, 'randomNumber': number} for row_id, number in updates]
152161

153162
async with request.app['pg'].acquire() as conn:
154163
stmt = await conn.prepare(READ_ROW_SQL)
155-
for id_, _ in updates:
164+
for row_id in ids:
156165
# the result of this is the int previous random number which we don't actually use
157-
await stmt.fetchval(id_)
166+
await stmt.fetchval(row_id)
158167
await conn.executemany(WRITE_ROW_SQL, updates)
159168

160169
return json_response(worlds)

frameworks/Python/aiohttp/requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ aiohttp==3.11.16
22
asyncpg==0.30.0
33
gunicorn==23.0.0
44
jinja2==3.1.6
5-
psycopg2==2.9.10
65
SQLAlchemy==2.0.39
76
orjson==3.10.16
87
uvloop==0.21.0

0 commit comments

Comments
 (0)