Merge lp:~spiv/bzr/c-extension-regression into lp:~bzr/bzr/trunk-old

[Andrew Bennetts]

[Andrew Bennetts (spiv)]

This fixes imports of _knit_load_data_pyx, which weren't updated when the
extension got renamed. We really should make a 1.17.1 with this fix, I think.

It's a bit embarrassing that we didn't notice this before the 1.17 release, but
hopefully now that the C and Pyrex extensions have consistent names this will be
less likely to happen in future.

-Andrew.

[Andrew Bennetts (spiv)]

Btw, I've gone ahead and submitted this to bzr.dev, it does seem clearly correct to me, so I decided it wasn't necessary to wait for review.

[Martin Pool (mbp)]

> Btw, I've gone ahead and submitted this to bzr.dev, it does seem clearly
> correct to me, so I decided it wasn't necessary to wait for review.

It looks ok to me too.

It's interesting to contemplate how this bug could have been prevented though, because there is definitely a test launcae here.

=== modified file 'NEWS'
--- NEWS	2009-07-27 05:24:02 +0000
+++ NEWS	2009-07-28 08:35:14 +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'
--- bzrlib/benchmarks/bench_knit.py	2009-03-23 14:59:43 +0000
+++ bzrlib/benchmarks/bench_knit.py	2009-07-28 08:35:14 +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'
--- bzrlib/knit.py	2009-07-15 17:51:40 +0000
+++ bzrlib/knit.py	2009-07-28 08:35:14 +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'
--- bzrlib/tests/test_knit.py	2009-07-24 19:22:25 +0000
+++ bzrlib/tests/test_knit.py	2009-07-28 08:35:14 +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)