Ticket #6436: cache-get_ticket_fields-trac-0.10.diff

trac/ticket/api.py

@@ -15 +15 @@
 # Author: Jonas Borgström <jonas@edgewall.com>
 
 import re
+try:
+    import threading
+except ImportError:
+    import dummy_threading as threading
 
 from trac.config import *
 from trac.core import *
@@ -68 +72 @@
         [TracTickets#Assign-toasDrop-DownList Assign-to as Drop-Down List]
         (''since 0.9'').""")
 
+    def __init__(self):
+         self._fields_lock = threading.RLock()
+  
     # Public API
 
     def get_available_actions(self, ticket, perm_):
@@ -85 +92 @@
 
     def get_ticket_fields(self):
         """Returns the list of fields available for tickets."""
+        # This is now cached - as it makes quite a number of things faster,
+        # e.g. #6436
+        if self._fields is None:
+            self._fields_lock.acquire()
+            try:
+                self._fields = self._get_ticket_fields()
+            finally:
+                self._fields_lock.release()
+        return self._fields
+
+    _fields = None
+    def _get_ticket_fields(self):
         from trac.ticket import model
 
         db = self.env.get_db_cnx()
@@ -155 +174 @@
         return fields
 
     def get_custom_fields(self):
+        if self._custom_fields is None:
+            self._fields_lock.acquire()
+            try:
+                self._custom_fields = self._get_custom_fields()
+            finally:
+                self._fields_lock.release()
+        return self._custom_fields
+
+    _custom_fields = None
+    def _get_custom_fields(self):
         fields = []
         config = self.config['ticket-custom']
         for name in [option for option, value in config.options()