Merge lp:~lifeless/storm/bug-618019 into lp:storm

[Robert Collins]

Permit instrumentation in launchpad OOPS reports of incremental DB time (which may be inconsequential, but its not AFAWCT guaranteed to be so).

[Robert Collins (lifeless)]

Note that this has as much direct testing as I could find of the emitting-of-tracers for the rest of database.py (none :(). However its extremely simple as-is.

[Gustavo Niemeyer (niemeyer)]

There are tests for trace emitters. Just grep for their names under tests/* and you should find them.

Also, even if there were none, lack of prior testing isn't generally an excuse for slacking in the future.

review: Needs Fixing

Unmerged revisions

377. By Robert Collins on 2010-09-07

Trace all raw cursor fetches.

376. By Robert Collins on 2010-09-07

Trace fetchmany calls. No tests - where would they go?

375. By Robert Collins on 2010-09-07

Guard tracer iteration with if _tracers at Gustavo's request.

=== modified file 'storm/database.py'
--- storm/database.py	2010-04-16 07:14:25 +0000
+++ storm/database.py	2010-09-07 03:02:38 +0000
@@ -82,7 +82,11 @@
 
         @return: A converted row or None, if no data is left.
         """
-        row = self._connection._check_disconnect(self._raw_cursor.fetchone)
+        trace("raw_cursor_fetchone_before", self)
+        try:
+            row = self._connection._check_disconnect(self._raw_cursor.fetchone)
+        finally:
+            trace("raw_cursor_fetchone_after", self)
         if row is not None:
             return tuple(self.from_database(row))
         return None
@@ -96,7 +100,12 @@
         @raise DisconnectionError: Raised when the connection is lost.
             Reconnection happens automatically on rollback.
         """
-        result = self._connection._check_disconnect(self._raw_cursor.fetchall)
+        trace("raw_cursor_fetchall_before", self)
+        try:
+            result = self._connection._check_disconnect(
+                self._raw_cursor.fetchall)
+        finally:
+            trace("raw_cursor_fetchall_after", self)
         if result:
             return [tuple(self.from_database(row)) for row in result]
         return result
@@ -111,8 +120,12 @@
             Reconnection happens automatically on rollback.
         """
         while True:
-            results = self._connection._check_disconnect(
-                self._raw_cursor.fetchmany)
+            trace("raw_cursor_fetchmany_before", self)
+            try:
+                results = self._connection._check_disconnect(
+                    self._raw_cursor.fetchmany)
+            finally:
+                trace("raw_cursor_fetchmany_after", self)
             if not results:
                 break
             for result in results:

=== modified file 'storm/tracer.py'
--- storm/tracer.py	2010-08-15 18:34:41 +0000
+++ storm/tracer.py	2010-09-07 03:02:38 +0000
@@ -107,10 +107,11 @@
 _tracers = []
 
 def trace(name, *args, **kwargs):
-    for tracer in _tracers:
-        attr = getattr(tracer, name, None)
-        if attr:
-            attr(*args, **kwargs)
+    if _tracers:
+        for tracer in _tracers:
+            attr = getattr(tracer, name, None)
+            if attr:
+                attr(*args, **kwargs)
 
 def install_tracer(tracer):
     _tracers.append(tracer)