Rev 3029: Merge in Vincent's typo fix. in http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/extra_range_collapse_165061

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/extra_range_collapse_165061

------------------------------------------------------------
revno: 3029
revision-id:john at arbash-meinel.com-20071127123744-0m6h0xkfp1n113j2
parent: john at arbash-meinel.com-20071127123612-uyqqe8wwkg0va7d6
parent: v.ladeuil+lp at free.fr-20071127082600-y4hnhy03v0jdywgc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: extra_range_collapse_165061
timestamp: Tue 2007-11-27 06:37:44 -0600
message:
  Merge in Vincent's typo fix.
modified:
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    revno: 3024.2.1
    revision-id:v.ladeuil+lp at free.fr-20071127082600-y4hnhy03v0jdywgc
    parent: pqm at pqm.ubuntu.com-20071126080312-mc2sagjsq7u3lemo
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: 165061
    timestamp: Tue 2007-11-27 09:26:00 +0100
    message:
      Fix 165061 by using the correct _max_readv_combine attribute.
      
      * bzrlib/transport/http/__init__.py:
      (HttpTransportBase): Typo corrected. That should be some kind of
      record in the performance_gained / size(code_modified) ratio
      league.
    modified:
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
-------------- next part --------------
=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2007-11-26 21:36:40 +0000
+++ b/bzrlib/transport/__init__.py	2007-11-27 12:37:44 +0000
@@ -649,7 +649,7 @@
 
         :param relpath: The path to read data from.
         :param offsets: A list of (offset, size) tuples.
-        :param adjust_for_latency: Adjust the requested offsets to accomdate
+        :param adjust_for_latency: Adjust the requested offsets to accomodate
             transport latency. This may re-order the offsets, expand them to
             grab adjacent data when there is likely a high cost to requesting
             data relative to delivering it.
@@ -665,9 +665,12 @@
         if adjust_for_latency:
             # Design note: We may wish to have different algorithms for the
             # expansion of the offsets per-transport. E.g. for local disk to
-            # use page-aligned expansion. If that is the case consider the following structure:
-            #  - a test that transport.readv uses self._offset_expander or some similar attribute, to do the expansion
-            #  - a test for each transport that it has some known-good offset expander
+            # use page-aligned expansion. If that is the case consider the
+            # following structure:
+            #  - a test that transport.readv uses self._offset_expander or some
+            #    similar attribute, to do the expansion
+            #  - a test for each transport that it has some known-good offset
+            #    expander
             #  - unit tests for each offset expander
             #  - a set of tests for the offset expander interface, giving
             #    baseline behaviour (which the current transport

=== modified file 'bzrlib/transport/http/__init__.py'
--- a/bzrlib/transport/http/__init__.py	2007-11-27 12:36:12 +0000
+++ b/bzrlib/transport/http/__init__.py	2007-11-27 12:37:44 +0000
@@ -250,7 +250,7 @@
     _bytes_to_read_before_seek = 128
     # No limit on the offset number that get combined into one, we are trying
     # to avoid downloading the whole file.
-    _max_readv_combined = 0
+    _max_readv_combine = 0
 
     # Keep collapsing until we can fit all of the request into this many
     # ranges. By default Apache has a limit of ~400. So we go underneath that