From 28d2d0cbb053778d8316666fedd4e50124333c94 Mon Sep 17 00:00:00 2001 From: Mike Dirolf Date: Mon, 23 Feb 2009 18:05:20 -0500 Subject: [PATCH] use cursorInfo command instead of intr collection --- test/test_cursor.py | 29 ++++++++++++++--------------- tools/benchmark.py | 6 +++--- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/test/test_cursor.py b/test/test_cursor.py index 49d4e851d..f2a252365 100644 --- a/test/test_cursor.py +++ b/test/test_cursor.py @@ -282,48 +282,47 @@ class TestCursor(unittest.TestCase): def test_kill_cursors(self): db = self.db db.drop_collection("test") - intr = self.db.connection().intr - client_cursors = intr.cursors.find_one()["clientCursors_size"] - by_location = intr.cursors.find_one()["byLocation_size"] + client_cursors = db._command({"cursorInfo": 1})["clientCursors_size"] + by_location = db._command({"cursorInfo": 1})["byLocation_size"] for i in range(10000): db.test.insert({"i": i}) - self.assertEqual(client_cursors, intr.cursors.find_one()["clientCursors_size"]) - self.assertEqual(by_location, intr.cursors.find_one()["byLocation_size"]) + self.assertEqual(client_cursors, db._command({"cursorInfo": 1})["clientCursors_size"]) + self.assertEqual(by_location, db._command({"cursorInfo": 1})["byLocation_size"]) for _ in range(10): db.test.find_one() - self.assertEqual(client_cursors, intr.cursors.find_one()["clientCursors_size"]) - self.assertEqual(by_location, intr.cursors.find_one()["byLocation_size"]) + self.assertEqual(client_cursors, db._command({"cursorInfo": 1})["clientCursors_size"]) + self.assertEqual(by_location, db._command({"cursorInfo": 1})["byLocation_size"]) for _ in range(10): for x in db.test.find(): break - self.assertEqual(client_cursors, intr.cursors.find_one()["clientCursors_size"]) - self.assertEqual(by_location, intr.cursors.find_one()["byLocation_size"]) + self.assertEqual(client_cursors, db._command({"cursorInfo": 1})["clientCursors_size"]) + self.assertEqual(by_location, db._command({"cursorInfo": 1})["byLocation_size"]) a = db.test.find() for x in a: break - self.assertNotEqual(client_cursors, intr.cursors.find_one()["clientCursors_size"]) - self.assertNotEqual(by_location, intr.cursors.find_one()["byLocation_size"]) + self.assertNotEqual(client_cursors, db._command({"cursorInfo": 1})["clientCursors_size"]) + self.assertNotEqual(by_location, db._command({"cursorInfo": 1})["byLocation_size"]) del a - self.assertEqual(client_cursors, intr.cursors.find_one()["clientCursors_size"]) - self.assertEqual(by_location, intr.cursors.find_one()["byLocation_size"]) + self.assertEqual(client_cursors, db._command({"cursorInfo": 1})["clientCursors_size"]) + self.assertEqual(by_location, db._command({"cursorInfo": 1})["byLocation_size"]) a = db.test.find().limit(10) for x in a: break - self.assertEqual(client_cursors, intr.cursors.find_one()["clientCursors_size"]) - self.assertEqual(by_location, intr.cursors.find_one()["byLocation_size"]) + self.assertEqual(client_cursors, db._command({"cursorInfo": 1})["clientCursors_size"]) + self.assertEqual(by_location, db._command({"cursorInfo": 1})["byLocation_size"]) if __name__ == "__main__": unittest.main() diff --git a/tools/benchmark.py b/tools/benchmark.py index 25b061001..e322d4e5b 100644 --- a/tools/benchmark.py +++ b/tools/benchmark.py @@ -12,17 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Jim's benchmarking suite +"""Python implementation of the MongoDB benchmarking suite. """ -import datetime +import timeit import sys sys.path[0:0] = [""] from pymongo.connection import Connection from pymongo import ASCENDING -N = 30000 +N = 1000000 def timed(function, db): before = datetime.datetime.now()