summary refs log tree commit diff
path: root/synapse/storage/media_repository.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-09-28 12:37:53 +0100
committerErik Johnston <erik@matrix.org>2017-09-28 12:37:53 +0100
commitae79764fe55ab15156b4f28658326bd2c9c0b937 (patch)
treeba96aced53980f87ec119722983bc5942260b5de /synapse/storage/media_repository.py
parentMore brackets (diff)
downloadsynapse-ae79764fe55ab15156b4f28658326bd2c9c0b937.tar.xz
Change expires column to expires_ts
Diffstat (limited to 'synapse/storage/media_repository.py')
-rw-r--r--synapse/storage/media_repository.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/synapse/storage/media_repository.py b/synapse/storage/media_repository.py
index 5cca14ccb2..b8a0dd0762 100644
--- a/synapse/storage/media_repository.py
+++ b/synapse/storage/media_repository.py
@@ -62,7 +62,7 @@ class MediaRepositoryStore(SQLBaseStore):
         def get_url_cache_txn(txn):
             # get the most recently cached result (relative to the given ts)
             sql = (
-                "SELECT response_code, etag, expires, og, media_id, download_ts"
+                "SELECT response_code, etag, expires_ts, og, media_id, download_ts"
                 " FROM local_media_repository_url_cache"
                 " WHERE url = ? AND download_ts <= ?"
                 " ORDER BY download_ts DESC LIMIT 1"
@@ -74,7 +74,7 @@ class MediaRepositoryStore(SQLBaseStore):
                 # ...or if we've requested a timestamp older than the oldest
                 # copy in the cache, return the oldest copy (if any)
                 sql = (
-                    "SELECT response_code, etag, expires, og, media_id, download_ts"
+                    "SELECT response_code, etag, expires_ts, og, media_id, download_ts"
                     " FROM local_media_repository_url_cache"
                     " WHERE url = ? AND download_ts > ?"
                     " ORDER BY download_ts ASC LIMIT 1"
@@ -86,14 +86,14 @@ class MediaRepositoryStore(SQLBaseStore):
                 return None
 
             return dict(zip((
-                'response_code', 'etag', 'expires', 'og', 'media_id', 'download_ts'
+                'response_code', 'etag', 'expires_ts', 'og', 'media_id', 'download_ts'
             ), row))
 
         return self.runInteraction(
             "get_url_cache", get_url_cache_txn
         )
 
-    def store_url_cache(self, url, response_code, etag, expires, og, media_id,
+    def store_url_cache(self, url, response_code, etag, expires_ts, og, media_id,
                         download_ts):
         return self._simple_insert(
             "local_media_repository_url_cache",
@@ -101,7 +101,7 @@ class MediaRepositoryStore(SQLBaseStore):
                 "url": url,
                 "response_code": response_code,
                 "etag": etag,
-                "expires": expires,
+                "expires_ts": expires_ts,
                 "og": og,
                 "media_id": media_id,
                 "download_ts": download_ts,
@@ -242,8 +242,8 @@ class MediaRepositoryStore(SQLBaseStore):
     def get_expired_url_cache(self, now_ts):
         sql = (
             "SELECT media_id FROM local_media_repository_url_cache"
-            " WHERE download_ts + expires < ?"
-            " ORDER BY download_ts + expires ASC"
+            " WHERE expires_ts < ?"
+            " ORDER BY expires_ts ASC"
             " LIMIT 100"
         )