Rev 2487: Change to 50k entries, since this puts us in the 1s ballpark in http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/knit_index_pyrex

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.17-dev/knit_index_pyrex

------------------------------------------------------------
revno: 2487
revision-id: john at arbash-meinel.com-20070509152053-6wm1c1cg9wstaezq
parent: john at arbash-meinel.com-20070509151224-20uys53nsfunfv5k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_index_pyrex
timestamp: Wed 2007-05-09 10:20:53 -0500
message:
  Change to 50k entries, since this puts us in the 1s ballpark
modified:
  bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
-------------- next part --------------
=== modified file 'bzrlib/benchmarks/bench_knit.py'
--- a/bzrlib/benchmarks/bench_knit.py	2007-05-09 15:12:24 +0000
+++ b/bzrlib/benchmarks/bench_knit.py	2007-05-09 15:20:53 +0000
@@ -30,8 +30,8 @@
 class BenchKnitIndex(Benchmark):
     """Benchmark Knit index performance."""
 
-    def create_10k_index(self):
-        """Create an knit index file with 10,000 entries.
+    def create_50k_index(self):
+        """Create an knit index file with 50,000 entries.
 
         This isn't super realistic, but it *is* big :)
 
@@ -40,8 +40,17 @@
         rev_id = generate_ids.gen_revision_id('long.name at this.example.com')
         versions = [(rev_id, ('fulltext',), 0, 200, [])]
         pos = 200
-        for i in xrange(9999):
-            parent_ids = [rev_id]
+        alt_parent = None
+        for i in xrange(49999):
+            if alt_parent is not None:
+                parent_ids = [rev_id, alt_parent]
+            else:
+                parent_ids = [rev_id]
+            if i % 8 == 0:
+                # The *next* entry will be a merge
+                alt_parent = rev_id
+            else:
+                alt_parent = None
             rev_id = generate_ids.gen_revision_id('long.name at this.example.com')
             versions.append((rev_id, ('line-delta',), pos, 200, parent_ids))
             pos += 200
@@ -65,26 +74,26 @@
         self.addCleanup(reset)
         knit._load_data = knit._load_data_py
 
-    def test_read_10k_index_c(self):
-        self.create_10k_index()
-        self.setup_load_data_c()
-        t = self.get_transport()
-        kndx = self.time(knit._KnitIndex, t, 'test.kndx', 'r')
-
-    def test_read_10k_index_c_again(self):
-        self.create_10k_index()
-        self.setup_load_data_c()
-        t = self.get_transport()
-        kndx = self.time(knit._KnitIndex, t, 'test.kndx', 'r')
-
-    def test_read_10k_index_py(self):
-        self.create_10k_index()
+    def test_read_50k_index_c(self):
+        self.create_50k_index()
+        self.setup_load_data_c()
+        t = self.get_transport()
+        kndx = self.time(knit._KnitIndex, t, 'test.kndx', 'r')
+
+    def test_read_50k_index_c_again(self):
+        self.create_50k_index()
+        self.setup_load_data_c()
+        t = self.get_transport()
+        kndx = self.time(knit._KnitIndex, t, 'test.kndx', 'r')
+
+    def test_read_50k_index_py(self):
+        self.create_50k_index()
         self.setup_load_data_py()
         t = self.get_transport()
         kndx = self.time(knit._KnitIndex, t, 'test.kndx', 'r')
 
-    def test_read_10k_index_py_again(self):
-        self.create_10k_index()
+    def test_read_50k_index_py_again(self):
+        self.create_50k_index()
         self.setup_load_data_py()
         t = self.get_transport()
         kndx = self.time(knit._KnitIndex, t, 'test.kndx', 'r')