From 3529216e5d8c69d964bde8535c15c6c360875c49 Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Wed, 31 Jul 2024 09:14:16 -0700
Subject: [PATCH] disable caching get_originals (88cbe3b) until bugs are fixed

for #1149
---
 common.py            | 3 +--
 models.py            | 3 ++-
 tests/test_models.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/common.py b/common.py
index 70ee0450..c0e7220d 100644
--- a/common.py
+++ b/common.py
@@ -10,7 +10,6 @@
 from urllib.parse import urljoin, urlparse
 
 import cachetools
-from cachetools.keys import hashkey
 from Crypto.Util import number
 from flask import abort, g, has_request_context, make_response, request
 from google.cloud.error_reporting.util import build_flask_context
@@ -428,7 +427,7 @@ def memcache_memoize(expire=None):
     def decorator(fn):
         @functools.wraps(fn)
         def wrapped(*args, **kwargs):
-            key = memcache_key(f'{fn.__name__}-{str(hashkey(*args, **kwargs))}')
+            key = memcache_key(f'{fn.__name__}-{repr(args)}-{repr(kwargs)}')
             if val := memcache.get(key):
                 logger.debug(f'cache hit {key}')
                 return val
diff --git a/models.py b/models.py
index 38ce86c8..9e43e631 100644
--- a/models.py
+++ b/models.py
@@ -1564,7 +1564,8 @@ def get_original(copy_id, keys_only=None):
         return got[0]
 
 
-@memcache_memoize(expire=60 * 60 * 24)  # 1d
+# TODO
+# @memcache_memoize(expire=60 * 60)  # 1h
 def get_originals(copy_ids, keys_only=None):
     """Fetches users (across all protocols) for a given set of copies.
 
diff --git a/tests/test_models.py b/tests/test_models.py
index f2559984..44fd98a4 100644
--- a/tests/test_models.py
+++ b/tests/test_models.py
@@ -1102,7 +1102,7 @@ def test_get_originals(self):
         user = self.make_user('other:user', cls=OtherFake,
                               copies=[Target(uri='fake:bar', protocol='fake')])
 
-        memcache_key = "get_originals-(['other:foo',%20'fake:bar',%20'baz'],)"
+        memcache_key = "get_originals-(['other:foo',%20'fake:bar',%20'baz'],)-{}"
         self.assertIsNone(common.memcache.get(memcache_key))
 
         self.assert_entities_equal(