mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Potential performance improvements

Browse Source
This commit is contained in:
krateng 2022-03-06 05:42:13 +01:00
parent 2930d40685
commit c8e658af43
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maloja/database/__init__.py
View File

@ -139,7 +139,16 @@ def get_scrobbles(dbconn=None,**keys):
@waitfordb @waitfordb
def get_scrobbles_num(dbconn=None,**keys): def get_scrobbles_num(dbconn=None,**keys):
return len(get_scrobbles(dbconn=dbconn,**keys)) (since,to) = keys.get('timerange').timestamps()
if 'artist' in keys:
result = len(sqldb.get_scrobbles_of_artist(artist=keys['artist'],since=since,to=to,resolve_references=False,dbconn=dbconn))
elif 'track' in keys:
result = len(sqldb.get_scrobbles_of_track(track=keys['track'],since=since,to=to,resolve_references=False,dbconn=dbconn))
else:
result = sqldb.get_scrobbles_num(since=since,to=to,dbconn=dbconn)
return result
@waitfordb @waitfordb
def get_tracks(dbconn=None,**keys): def get_tracks(dbconn=None,**keys):

24
maloja/database/sqldb.py
View File

@ -283,7 +283,7 @@ def get_artist_id(artistname,dbconn=None):
@cached_wrapper @cached_wrapper
@connection_provider @connection_provider
def get_scrobbles_of_artist(artist,since=None,to=None,dbconn=None): def get_scrobbles_of_artist(artist,since=None,to=None,resolve_references=True,dbconn=None):
if since is None: since=0 if since is None: since=0
if to is None: to=now() if to is None: to=now()
@ -299,13 +299,14 @@ def get_scrobbles_of_artist(artist,since=None,to=None,dbconn=None):
).order_by(sql.asc('timestamp')) ).order_by(sql.asc('timestamp'))
result = dbconn.execute(op).all() result = dbconn.execute(op).all()
if resolve_references:
result = scrobbles_db_to_dict(result) result = scrobbles_db_to_dict(result)
#result = [scrobble_db_to_dict(row,resolve_references=resolve_references) for row in result] #result = [scrobble_db_to_dict(row,resolve_references=resolve_references) for row in result]
return result return result
@cached_wrapper @cached_wrapper
@connection_provider @connection_provider
def get_scrobbles_of_track(track,since=None,to=None,dbconn=None): def get_scrobbles_of_track(track,since=None,to=None,resolve_references=True,dbconn=None):
if since is None: since=0 if since is None: since=0
if to is None: to=now() if to is None: to=now()
@ -319,6 +320,7 @@ def get_scrobbles_of_track(track,since=None,to=None,dbconn=None):
).order_by(sql.asc('timestamp')) ).order_by(sql.asc('timestamp'))
result = dbconn.execute(op).all() result = dbconn.execute(op).all()
if resolve_references:
result = scrobbles_db_to_dict(result) result = scrobbles_db_to_dict(result)
#result = [scrobble_db_to_dict(row) for row in result] #result = [scrobble_db_to_dict(row) for row in result]
return result return result
@ -336,10 +338,28 @@ def get_scrobbles(since=None,to=None,resolve_references=True,dbconn=None):
).order_by(sql.asc('timestamp')) ).order_by(sql.asc('timestamp'))
result = dbconn.execute(op).all() result = dbconn.execute(op).all()
if resolve_references:
result = scrobbles_db_to_dict(result) result = scrobbles_db_to_dict(result)
#result = [scrobble_db_to_dict(row,resolve_references=resolve_references) for i,row in enumerate(result) if i<max] #result = [scrobble_db_to_dict(row,resolve_references=resolve_references) for i,row in enumerate(result) if i<max]
return result return result
# we can do that with above and resolve_references=False, but just testing speed
@cached_wrapper
@connection_provider
def get_scrobbles_num(since=None,to=None,dbconn=None):
if since is None: since=0
if to is None: to=now()
op = sql.select(sql.func.count()).select_from(DB['scrobbles']).where(
DB['scrobbles'].c.timestamp<=to,
DB['scrobbles'].c.timestamp>=since,
)
result = dbconn.execute(op).all()
return result[0][0]
@cached_wrapper @cached_wrapper
@connection_provider @connection_provider
def get_artists_of_track(track_id,resolve_references=True,dbconn=None): def get_artists_of_track(track_id,resolve_references=True,dbconn=None):