Ticket #4566: reverse-speedup2.diff

core/urlresolvers.py

@@ -11 +11 @@
 from django.core.exceptions import ImproperlyConfigured, ViewDoesNotExist
 import re
 
+def cacheable(func, cache):
+    def wrapper(arg):
+        if arg in cache:
+            return cache[arg]
+        
+        result = func(arg)
+        cache[arg] = result
+        return result
+    return wrapper
+
+resolver_cache = {}
+
+def get_resolver(urlconf):
+    if urlconf is None:
+        from django.conf import settings
+        urlconf = settings.ROOT_URLCONF
+    return RegexURLResolver(r'^/', urlconf)
+get_resolver = cacheable(get_resolver, resolver_cache)
+
 class Resolver404(Http404):
     pass
 
@@ -129 +148 @@
     def _get_callback(self):
         if self._callback is not None:
             return self._callback
-        mod_name, func_name = get_mod_func(self._callback_str)
         try:
-            self._callback = getattr(__import__(mod_name, {}, {}, ['']), func_name)
+            self._callback = make_callable(self._callback_str)
         except ImportError, e:
             raise ViewDoesNotExist, "Could not import %s. Error was: %s" % (mod_name, str(e))
         except AttributeError, e:
@@ -160 +178 @@
         self.urlconf_name = urlconf_name
         self.callback = None
         self.default_kwargs = default_kwargs or {}
+        self.reverse_dict = {}
+        
+        for pattern in reversed(self.urlconf_module.urlpatterns):
+            if isinstance(pattern, RegexURLResolver):
+                for key, value in pattern.reverse_dict.iteritems():
+                    self.reverse_dict[key] = (pattern,) + value
+            else:
+                self.reverse_dict[pattern.callback] = (pattern,)
+                self.reverse_dict[pattern.name] = (pattern,)
 
     def resolve(self, path):
         tried = []
@@ -209 +236 @@
         return self._resolve_special('500')
 
     def reverse(self, lookup_view, *args, **kwargs):
-        if not callable(lookup_view):
-            mod_name, func_name = get_mod_func(lookup_view)
-            try:
-                lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name)
-            except (ImportError, AttributeError):
-                if func_name != '':
-                    raise NoReverseMatch
-        for pattern in self.urlconf_module.urlpatterns:
-            if isinstance(pattern, RegexURLResolver):
-                try:
-                    return pattern.reverse_helper(lookup_view, *args, **kwargs)
-                except NoReverseMatch:
-                    continue
-            elif pattern.callback == lookup_view or pattern.name == lookup_view:
-                try:
-                    return pattern.reverse_helper(*args, **kwargs)
-                except NoReverseMatch:
-                    continue
+        try:
+            lookup_view = make_callable(lookup_view)
+        except (ImportError, AttributeError):
+            raise NoReverseMatch
+        if lookup_view in self.reverse_dict:
+            url_parts = (reverse_helper(part.regex, *args, **kwargs) for part in self.reverse_dict[lookup_view])
+            return ''.join(url_parts)
         raise NoReverseMatch
 
     def reverse_helper(self, lookup_view, *args, **kwargs):
@@ -234 +250 @@
         result = reverse_helper(self.regex, *args, **kwargs)
         return result + sub_match
 
+callable_cache = {}
+def make_callable(lookup_view):
+    if not callable(lookup_view):
+        mod_name, func_name = get_mod_func(lookup_view)
+        if func_name != '':
+            lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name)
+    return lookup_view
+make_callable = cacheable(make_callable, callable_cache)
+
 def resolve(path, urlconf=None):
-    if urlconf is None:
-        from django.conf import settings
-        urlconf = settings.ROOT_URLCONF
-    resolver = RegexURLResolver(r'^/', urlconf)
+    resolver = get_resolver(urlconf)
     return resolver.resolve(path)
 
 def reverse(viewname, urlconf=None, args=None, kwargs=None):
     args = args or []
     kwargs = kwargs or {}
-    if urlconf is None:
-        from django.conf import settings
-        urlconf = settings.ROOT_URLCONF
-    resolver = RegexURLResolver(r'^/', urlconf)
+    resolver = get_resolver(urlconf)
     return '/' + resolver.reverse(viewname, *args, **kwargs)