Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-08-11 09:13:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

More experimental DB caching

Browse Source
This commit is contained in:
krateng 2022-02-18 08:26:28 +01:00
parent 900ce51af0
commit 7b3e1bbaa6
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maloja/database/dbcache.py
View File

@ -27,9 +27,9 @@ def print_stats():
def cached_wrapper(inner_func): def cached_wrapper(inner_func):
if not USE_CACHE: return inner_func if not USE_CACHE: return inner_func
def outer_func(**kwargs): def outer_func(*args,**kwargs):
global hits, misses global hits, misses
key = (serialize(kwargs), inner_func, kwargs.get("since"), kwargs.get("to")) key = (serialize(args),serialize(kwargs), inner_func, kwargs.get("since"), kwargs.get("to"))
if key in cache: if key in cache:
hits += 1 hits += 1
@ -37,7 +37,7 @@ def cached_wrapper(inner_func):
else: else:
misses += 1 misses += 1
result = inner_func(**kwargs) result = inner_func(*args,**kwargs)
cache[key] = result cache[key] = result
return result return result
@ -71,7 +71,7 @@ def serialize(obj):
try: try:
return json.dumps(obj) return json.dumps(obj)
except: except:
if isinstance(obj, (list, tuple)): if isinstance(obj, (list, tuple, set)):
return "[" + ",".join(serialize(o) for o in obj) + "]" return "[" + ",".join(serialize(o) for o in obj) + "]"
elif isinstance(obj,dict): elif isinstance(obj,dict):
return "{" + ",".join(serialize(o) + ":" + serialize(obj[o]) for o in obj) + "}" return "{" + ",".join(serialize(o) + ":" + serialize(obj[o]) for o in obj) + "}"

16
maloja/database/sqldb.py
View File

@ -188,6 +188,7 @@ def add_scrobbles(scrobbleslist):
### these will 'get' the ID of an entity, creating it if necessary ### these will 'get' the ID of an entity, creating it if necessary
@cached_wrapper
def get_track_id(trackdict): def get_track_id(trackdict):
ntitle = normalize_name(trackdict['title']) ntitle = normalize_name(trackdict['title'])
artist_ids = [get_artist_id(a) for a in trackdict['artists']] artist_ids = [get_artist_id(a) for a in trackdict['artists']]
@ -233,6 +234,7 @@ def get_track_id(trackdict):
#print("Created",trackdict['title'],track_id) #print("Created",trackdict['title'],track_id)
return track_id return track_id
@cached_wrapper
def get_artist_id(artistname): def get_artist_id(artistname):
nname = normalize_name(artistname) nname = normalize_name(artistname)
#print("looking for",nname) #print("looking for",nname)
@ -332,6 +334,7 @@ def get_artists_of_track(track_id,resolve_references=True):
return artists return artists
@cached_wrapper
def get_tracks_of_artist(artist): def get_tracks_of_artist(artist):
artist_id = get_artist_id(artist) artist_id = get_artist_id(artist)
@ -344,6 +347,7 @@ def get_tracks_of_artist(artist):
return tracks_db_to_dict(result) return tracks_db_to_dict(result)
@cached_wrapper
def get_artists(): def get_artists():
with engine.begin() as conn: with engine.begin() as conn:
op = DB['artists'].select() op = DB['artists'].select()
@ -351,6 +355,7 @@ def get_artists():
return artists_db_to_dict(result) return artists_db_to_dict(result)
@cached_wrapper
def get_tracks(): def get_tracks():
with engine.begin() as conn: with engine.begin() as conn:
op = DB['tracks'].select() op = DB['tracks'].select()
@ -392,7 +397,7 @@ def count_scrobbles_by_artist(since,to):
counts = [row.count for row in result] counts = [row.count for row in result]
artists = get_artists_map(row.artist_id for row in result) artists = get_artists_map([row.artist_id for row in result])
result = [{'scrobbles':row.count,'artist':artists[row.artist_id]} for row in result] result = [{'scrobbles':row.count,'artist':artists[row.artist_id]} for row in result]
result = rank(result,key='scrobbles') result = rank(result,key='scrobbles')
return result return result
@ -412,7 +417,7 @@ def count_scrobbles_by_track(since,to):
counts = [row.count for row in result] counts = [row.count for row in result]
tracks = get_tracks_map(row.track_id for row in result) tracks = get_tracks_map([row.track_id for row in result])
result = [{'scrobbles':row.count,'track':tracks[row.track_id]} for row in result] result = [{'scrobbles':row.count,'track':tracks[row.track_id]} for row in result]
result = rank(result,key='scrobbles') result = rank(result,key='scrobbles')
return result return result
@ -441,7 +446,7 @@ def count_scrobbles_by_track_of_artist(since,to,artist):
counts = [row.count for row in result] counts = [row.count for row in result]
tracks = get_tracks_map(row.track_id for row in result) tracks = get_tracks_map([row.track_id for row in result])
result = [{'scrobbles':row.count,'track':tracks[row.track_id]} for row in result] result = [{'scrobbles':row.count,'track':tracks[row.track_id]} for row in result]
result = rank(result,key='scrobbles') result = rank(result,key='scrobbles')
return result return result
@ -451,6 +456,7 @@ def count_scrobbles_by_track_of_artist(since,to,artist):
### functions that get mappings for several entities -> rows ### functions that get mappings for several entities -> rows
@cached_wrapper
def get_artists_of_tracks(track_ids): def get_artists_of_tracks(track_ids):
with engine.begin() as conn: with engine.begin() as conn:
op = sql.join(DB['trackartists'],DB['artists']).select().where( op = sql.join(DB['trackartists'],DB['artists']).select().where(
@ -464,6 +470,7 @@ def get_artists_of_tracks(track_ids):
return artists return artists
@cached_wrapper
def get_tracks_map(track_ids): def get_tracks_map(track_ids):
with engine.begin() as conn: with engine.begin() as conn:
op = DB['tracks'].select().where( op = DB['tracks'].select().where(
@ -478,6 +485,7 @@ def get_tracks_map(track_ids):
tracks[trackids[i]] = trackdicts[i] tracks[trackids[i]] = trackdicts[i]
return tracks return tracks
@cached_wrapper
def get_artists_map(artist_ids): def get_artists_map(artist_ids):
with engine.begin() as conn: with engine.begin() as conn:
op = DB['artists'].select().where( op = DB['artists'].select().where(
@ -534,6 +542,7 @@ def get_credited_artists(*artists):
### get a specific entity by id ### get a specific entity by id
@cached_wrapper
def get_track(id): def get_track(id):
with engine.begin() as conn: with engine.begin() as conn:
op = DB['tracks'].select().where( op = DB['tracks'].select().where(
@ -544,6 +553,7 @@ def get_track(id):
trackinfo = result[0] trackinfo = result[0]
return track_db_to_dict(trackinfo) return track_db_to_dict(trackinfo)
@cached_wrapper
def get_artist(id): def get_artist(id):
with engine.begin() as conn: with engine.begin() as conn:
op = DB['artists'].select().where( op = DB['artists'].select().where(