You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2014/02/26 18:01:46 UTC

[1/2] git commit: [#7224] time many more pymongo & ming methods

Repository: incubator-allura
Updated Branches:
  refs/heads/db/7224 [created] 4d4e1d806


[#7224] time many more pymongo & ming methods


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7ad8965e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7ad8965e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7ad8965e

Branch: refs/heads/db/7224
Commit: 7ad8965e8bcff3246921e38bc0a3b2e34d50b324
Parents: 1d044d9
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Feb 26 16:48:20 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Feb 26 16:48:20 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/custom_middleware.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7ad8965e/Allura/allura/lib/custom_middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
index 2a07e58..b6797e3 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -217,14 +217,19 @@ class AlluraTimerMiddleware(TimerMiddleware):
             Timer('markdown', markdown.Markdown, 'convert'),
             Timer('ming', ming.odm.odmsession.ODMCursor, 'next',  # FIXME: this may captures timings ok, but is misleading for counts
                   debug_each_call=False),
-            Timer('ming', ming.odm.odmsession.ODMSession, 'flush', 'find'),
+            Timer('ming', ming.odm.odmsession.ODMSession, 'flush',
+                  'find', 'find_and_modify', 'remove', 'update', 'update_if_not_modified',
+                  'aggregate', 'group', 'map_reduce', 'inline_map_reduce', 'distinct',
+                  ),
             Timer('ming', ming.schema.Document, 'validate',
                   debug_each_call=False),
             Timer('ming', ming.schema.FancySchemaItem, '_validate_required',
                   '_validate_fast_missing', '_validate_optional',
                   debug_each_call=False),
             Timer('mongo', pymongo.collection.Collection, 'count', 'find',
-                  'find_one'),
+                  'find_one', 'aggregate', 'group', 'map_reduce',
+                  'inline_map_reduce', 'find_and_modify',
+                  'insert', 'save', 'update', 'remove', 'drop'),
             Timer('mongo', pymongo.cursor.Cursor, 'count', 'distinct',
                   '_refresh'),
             # urlopen and socket io may or may not overlap partially


[2/2] git commit: [#7224] instead of timing a whole ming flush(), time each object op within a flush

Posted by br...@apache.org.
[#7224] instead of timing a whole ming flush(), time each object op within a flush

This will give us more accurate representation in call counts, and more
useful and detailed information when DEBUG logging timermiddleware.


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/4d4e1d80
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/4d4e1d80
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/4d4e1d80

Branch: refs/heads/db/7224
Commit: 4d4e1d80680d835e11a5a0012f8ca188dc28e215
Parents: 7ad8965
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Feb 26 16:58:57 2014 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Feb 26 16:58:57 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/custom_middleware.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4d4e1d80/Allura/allura/lib/custom_middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/custom_middleware.py b/Allura/allura/lib/custom_middleware.py
index b6797e3..ad1f276 100644
--- a/Allura/allura/lib/custom_middleware.py
+++ b/Allura/allura/lib/custom_middleware.py
@@ -217,7 +217,8 @@ class AlluraTimerMiddleware(TimerMiddleware):
             Timer('markdown', markdown.Markdown, 'convert'),
             Timer('ming', ming.odm.odmsession.ODMCursor, 'next',  # FIXME: this may captures timings ok, but is misleading for counts
                   debug_each_call=False),
-            Timer('ming', ming.odm.odmsession.ODMSession, 'flush',
+            Timer('ming', ming.odm.odmsession.ODMSession,
+                  'insert_now', 'update_now', 'delete_now',
                   'find', 'find_and_modify', 'remove', 'update', 'update_if_not_modified',
                   'aggregate', 'group', 'map_reduce', 'inline_map_reduce', 'distinct',
                   ),