Rev 4574: (andrew) Fix imports of _knit_load_data_pyx. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4574 [merge]
revision-id: pqm at pqm.ubuntu.com-20090728091930-mv2rza67y8ao8roo
parent: pqm at pqm.ubuntu.com-20090727093330-882xn6s1tt1zbnw6
parent: andrew.bennetts at canonical.com-20090728081415-6eemtejs1n2beq5n
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2009-07-28 10:19:30 +0100
message:
  (andrew) Fix imports of _knit_load_data_pyx.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/benchmarks/bench_knit.py bench_knit.py-20070509145850-pan5jnd3hl7mfdya-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
=== modified file 'NEWS'
--- a/NEWS	2009-07-27 05:24:02 +0000
+++ b/NEWS	2009-07-28 08:14:15 +0000
@@ -78,6 +78,10 @@
   lots of backtraces about ``UnknownSmartMethod``, ``do_chunk`` or
   ``do_end``.  (Andrew Bennetts, #338561)
   
+* The optional ``_knit_load_data_pyx`` C extension was never being
+  imported.  This caused significant slowdowns when reading data from
+  repositories.  (Andrew Bennetts, #405653)
+  
 * There was a bug in ``osutils.relpath`` that was only triggered on
   Windows. Essentially if you were at the root of a drive, and did
   something to a branch/repo on another drive, we would go into an

=== modified file 'bzrlib/benchmarks/bench_knit.py'
--- a/bzrlib/benchmarks/bench_knit.py	2009-03-23 14:59:43 +0000
+++ b/bzrlib/benchmarks/bench_knit.py	2009-07-28 08:09:13 +0000
@@ -65,7 +65,7 @@
         def reset():
             knit._load_data = orig
         self.addCleanup(reset)
-        from bzrlib._knit_load_data_c import _load_data_c
+        from bzrlib._knit_load_data_pyx import _load_data_c
         knit._load_data = _load_data_c
 
     def setup_load_data_py(self):

=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2009-07-15 17:51:40 +0000
+++ b/bzrlib/knit.py	2009-07-28 08:09:13 +0000
@@ -3621,6 +3621,6 @@
                     to_process.extend(self._process_pending(key))
 
 try:
-    from bzrlib._knit_load_data_c import _load_data_c as _load_data
+    from bzrlib._knit_load_data_pyx import _load_data_c as _load_data
 except ImportError:
     from bzrlib._knit_load_data_py import _load_data_py as _load_data

=== modified file 'bzrlib/tests/test_knit.py'
--- a/bzrlib/tests/test_knit.py	2009-07-24 19:22:25 +0000
+++ b/bzrlib/tests/test_knit.py	2009-07-28 08:09:13 +0000
@@ -73,13 +73,13 @@
 
     def _probe(self):
         try:
-            import bzrlib._knit_load_data_c
+            import bzrlib._knit_load_data_pyx
         except ImportError:
             return False
         return True
 
     def feature_name(self):
-        return 'bzrlib._knit_load_data_c'
+        return 'bzrlib._knit_load_data_pyx'
 
 CompiledKnitFeature = _CompiledKnitFeature()
 
@@ -1316,7 +1316,7 @@
         def reset():
             knit._load_data = orig
         self.addCleanup(reset)
-        from bzrlib._knit_load_data_c import _load_data_c
+        from bzrlib._knit_load_data_pyx import _load_data_c
         knit._load_data = _load_data_c
         allow_writes = lambda: mode == 'w'
         return _KndxIndex(transport, mapper, lambda:None, allow_writes, lambda:True)