Changeset 01d3cf in indico

Timestamp:

03/26/12 16:49:50 (14 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

13903d

Parents:

6a90d1

Message:

[OPT] Minor optimizations to fossils

File:

• indico/util/fossilize/__init__.py (modified) (10 diffs)

indico/util/fossilize/__init__.py

@@ -95 +95 @@
     __methodNameCache = {}
     __fossilNameCache = {}
+    __fossilInterfaceCache = {}
     __fossilAttrsCache = {} # Attribute Cache for Fossils with
                             # fields that are repeated
@@ -272 +273 @@
         result = {}
 
-        for method in interface:
-
-            tags = interface[method].getTaggedValueTags()
+        # cache method names for each interface
+        names = cls.__fossilInterfaceCache.get(interface)
+        if names is None:
+            names = interface.names(all=True)
+            cls.__fossilInterfaceCache[interface] = names
+        ###
+
+        for methodName in names:
+
+            method = interface[methodName]
+
+            tags = method.getTaggedValueTags()
             isAttribute = False
 
@@ -282 +292 @@
             if useAttrCache:
                 try:
-                    methodResult = cls.__fossilAttrsCache[obj._p_oid][method]
+                    methodResult = cls.__fossilAttrsCache[obj._p_oid][methodName]
                     cacheUsed = True
                 except KeyError:
@@ -290 +300 @@
                 # there is almost always a more elegant and modular solution!
                 if 'produce' in tags:
-                    methodResult = interface[method].getTaggedValue('produce')(obj)
+                    methodResult = method.getTaggedValue('produce')(obj)
                 else:
-                    attr = getattr(obj, method)
+                    attr = getattr(obj, methodName)
                     if callable(attr):
                         try:
@@ -305 +315 @@
 
                 if hasattr(obj, "_p_oid"):
-                    try:
-                        cls.__fossilAttrsCache[obj._p_oid]
-                    except KeyError:
-                        cls.__fossilAttrsCache[obj._p_oid] = {}
-                    cls.__fossilAttrsCache[obj._p_oid][method] = methodResult
+                    cls.__fossilAttrsCache.setdefault(obj._p_oid, {})[methodName] = methodResult
 
             if 'filterBy' in tags:
                 if 'filters' not in kwargs:
                     raise Exception('No filters defined!')
-                filterName = interface[method].getTaggedValue('filterBy')
+                filterName = method.getTaggedValue('filterBy')
 
                 if filterName in kwargs['filters']:
@@ -325 +331 @@
             # Result conversion
             if 'result' in tags:
-                targetInterface = interface[method].getTaggedValue('result')
+                targetInterface = method.getTaggedValue('result')
                 #targetInterface = globals()[targetInterfaceName]
 
@@ -333 +339 @@
             # Conversion function
             if 'convert' in tags:
-                convertFunction = interface[method].getTaggedValue('convert')
+                convertFunction = method.getTaggedValue('convert')
                 converterArgNames = inspect.getargspec(convertFunction)[0]
                 converterArgs = dict((name, kwargs[name])
@@ -342 +348 @@
                 except:
                     logging.getLogger('indico.fossilize').error("Problem fossilizing '%r' with '%s' (%s)" %
-                                                                (obj, interfaceArg, method))
+                                                                (obj, interfaceArg, methodName))
                     raise
 
@@ -348 +354 @@
             # Re-name the attribute produced by the method
             if 'name' in tags:
-                attrName = interface[method].getTaggedValue('name')
+                attrName = method.getTaggedValue('name')
             elif isAttribute:
-                attrName = method
-            else:
-                attrName = cls.__extractName(method)
+                attrName = methodName
+            else:
+                attrName = cls.__extractName(methodName)
 
             # In case the name contains dots, each of the 'domains' but the
@@ -367 +373 @@
             while len(attrList) > 1:
                 attr = attrList.pop(0)
-                try:
-                    current = current[attr]
-                except KeyError:
+                if attr not in current:
                     current[attr] = {}
-                    current = current[attr]
+                current = current[attr]
 
             # For the last attribute level