OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

fix SQL based on PR feedback

pull/688/head
Matthew Hodgson 2016-04-08 18:55:38 +01:00
parent b04f81284a
commit fb83f6a1fc
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/storage/media_repository.py
View File

@ -58,9 +58,10 @@ class MediaRepositoryStore(SQLBaseStore):
def get_url_cache_txn(txn): def get_url_cache_txn(txn):
# get the most recently cached result (relative to the given ts) # get the most recently cached result (relative to the given ts)
sql = ( sql = (
"SELECT response_code, etag, expires, og, media_id, max(download_ts)" "SELECT response_code, etag, expires, og, media_id, download_ts"
" FROM local_media_repository_url_cache" " FROM local_media_repository_url_cache"
" WHERE url = ? AND download_ts <= ?" " WHERE url = ? AND download_ts <= ?"
" ORDER BY download_ts DESC LIMIT 1"
) )
txn.execute(sql, (url, ts)) txn.execute(sql, (url, ts))
row = txn.fetchone() row = txn.fetchone()
@ -69,9 +70,10 @@ class MediaRepositoryStore(SQLBaseStore):
# ...or if we've requested a timestamp older than the oldest # ...or if we've requested a timestamp older than the oldest
# copy in the cache, return the oldest copy (if any) # copy in the cache, return the oldest copy (if any)
sql = ( sql = (
"SELECT response_code, etag, expires, og, media_id, min(download_ts)" "SELECT response_code, etag, expires, og, media_id, download_ts"
" FROM local_media_repository_url_cache" " FROM local_media_repository_url_cache"
" WHERE url = ? AND download_ts > ?" " WHERE url = ? AND download_ts > ?"
" ORDER BY download_ts ASC LIMIT 1"
) )
txn.execute(sql, (url, ts)) txn.execute(sql, (url, ts))
row = txn.fetchone() row = txn.fetchone()