/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
5590.1.5 by John Arbash Meinel
Don't use tuned_gzip.GzipFile in knit.py
1
# Copyright (C) 2006-2011 Canonical Ltd
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
16
17
"""Knit versionedfile implementation.
18
19
A knit is a versioned file implementation that supports efficient append only
20
updates.
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
21
22
Knit file layout:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
23
lifeless: the data file is made up of "delta records".  each delta record has a delta header
24
that contains; (1) a version id, (2) the size of the delta (in lines), and (3)  the digest of
25
the -expanded data- (ie, the delta applied to the parent).  the delta also ends with a
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
26
end-marker; simply "end VERSION"
27
28
delta can be line or full contents.a
29
... the 8's there are the index number of the annotation.
30
version robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad 7 c7d23b2a5bd6ca00e8e266cec0ec228158ee9f9e
31
59,59,3
32
8
33
8         if ie.executable:
34
8             e.set('executable', 'yes')
35
130,130,2
36
8         if elt.get('executable') == 'yes':
37
8             ie.executable = True
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
38
end robertc@robertcollins.net-20051003014215-ee2990904cc4c7ad
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
39
40
41
whats in an index:
42
09:33 < jrydberg> lifeless: each index is made up of a tuple of; version id, options, position, size, parents
43
09:33 < jrydberg> lifeless: the parents are currently dictionary compressed
44
09:33 < jrydberg> lifeless: (meaning it currently does not support ghosts)
45
09:33 < lifeless> right
46
09:33 < jrydberg> lifeless: the position and size is the range in the data file
47
48
49
so the index sequence is the dictionary compressed sequence number used
50
in the deltas to provide line annotation
51
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
52
"""
53
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
54
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
55
from cStringIO import StringIO
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
56
from itertools import izip
1756.2.17 by Aaron Bentley
Fixes suggested by John Meinel
57
import operator
1563.2.6 by Robert Collins
Start check tests for knits (pending), and remove dead code.
58
import os
1594.2.19 by Robert Collins
More coalescing tweaks, and knit feedback.
59
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
60
from bzrlib.lazy_import import lazy_import
61
lazy_import(globals(), """
5671.1.2 by Jelmer Vernooij
Lazy load gzip (we don't use it when doing 2a), remove some unused imports.
62
import gzip
63
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
64
from bzrlib import (
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
65
    debug,
66
    diff,
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
67
    graph as _mod_graph,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
68
    index as _mod_index,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
69
    pack,
5279.1.1 by Andrew Bennetts
lazy_import most things in merge.py; add a few representative modules to the import tariff tests; tweak a couple of other modules so that patiencediff is not necessarily imported; remove a bunch of unused imports from test_knit.py.
70
    patiencediff,
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
71
    static_tuple,
2745.1.2 by Robert Collins
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
72
    trace,
3224.5.1 by Andrew Bennetts
Lots of assorted hackery to reduce the number of imports for common operations. Improves 'rocks', 'st' and 'help' times by ~50ms on my laptop.
73
    tsort,
3535.5.1 by John Arbash Meinel
cleanup a few imports to be lazily loaded.
74
    tuned_gzip,
4961.2.13 by Martin Pool
Further progress bar string-pulling
75
    ui,
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
76
    )
5757.8.9 by Jelmer Vernooij
Fix pack_repo imports.
77
78
from bzrlib.repofmt import pack_repo
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
79
""")
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
80
from bzrlib import (
5753.2.2 by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports.
81
    annotate,
1911.2.3 by John Arbash Meinel
Moving everything into a new location so that we can cache more than just revision ids
82
    errors,
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
83
    osutils,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
84
    )
85
from bzrlib.errors import (
86
    NoSuchFile,
87
    InvalidRevisionId,
88
    KnitCorrupt,
89
    KnitHeaderError,
90
    RevisionNotPresent,
3787.1.1 by Robert Collins
Embed the failed text in sha1 knit errors.
91
    SHA1KnitCorrupt,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
92
    )
93
from bzrlib.osutils import (
94
    contains_whitespace,
2850.1.1 by Robert Collins
* ``KnitVersionedFile.add*`` will no longer cache added records even when
95
    sha_string,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
96
    sha_strings,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
97
    split_lines,
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
98
    )
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
99
from bzrlib.versionedfile import (
5757.8.1 by Jelmer Vernooij
Avoid bzrlib.knit imports when using groupcompress repositories.
100
    _KeyRefs,
3350.3.12 by Robert Collins
Generate streams with absent records.
101
    AbsentContentFactory,
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
102
    adapter_registry,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
103
    ConstantMapper,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
104
    ContentFactory,
4111.1.1 by Robert Collins
Add a groupcompress sort order.
105
    sort_groupcompress,
5816.8.1 by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls.
106
    VersionedFilesWithFallbacks,
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
107
    )
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
108
109
110
# TODO: Split out code specific to this format into an associated object.
111
112
# TODO: Can we put in some kind of value to check that the index and data
113
# files belong together?
114
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
115
# TODO: accommodate binaries, perhaps by storing a byte count
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
116
117
# TODO: function to check whole file
118
119
# TODO: atomically append data, then measure backwards from the cursor
120
# position after writing to work out where it was located.  we may need to
121
# bypass python file buffering.
122
123
DATA_SUFFIX = '.knit'
124
INDEX_SUFFIX = '.kndx'
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
125
_STREAM_MIN_BUFFER_SIZE = 5*1024*1024
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
126
127
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
128
class KnitAdapter(object):
129
    """Base class for knit record adaption."""
130
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
131
    def __init__(self, basis_vf):
132
        """Create an adapter which accesses full texts from basis_vf.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
133
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
134
        :param basis_vf: A versioned file to access basis texts of deltas from.
135
            May be None for adapters that do not need to access basis texts.
136
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
137
        self._data = KnitVersionedFiles(None, None)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
138
        self._annotate_factory = KnitAnnotateFactory()
139
        self._plain_factory = KnitPlainFactory()
3350.3.7 by Robert Collins
Create a registry of versioned file record adapters.
140
        self._basis_vf = basis_vf
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
141
142
143
class FTAnnotatedToUnannotated(KnitAdapter):
144
    """An adapter from FT annotated knits to unannotated ones."""
145
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
146
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
147
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
148
        rec, contents = \
149
            self._data._parse_record_unchecked(annotated_compressed_bytes)
150
        content = self._annotate_factory.parse_fulltext(contents, rec[1])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
151
        size, bytes = self._data._record_to_data((rec[1],), rec[3], content.text())
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
152
        return bytes
153
154
155
class DeltaAnnotatedToUnannotated(KnitAdapter):
156
    """An adapter for deltas from annotated to unannotated."""
157
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
158
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
159
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
160
        rec, contents = \
161
            self._data._parse_record_unchecked(annotated_compressed_bytes)
162
        delta = self._annotate_factory.parse_line_delta(contents, rec[1],
163
            plain=True)
164
        contents = self._plain_factory.lower_line_delta(delta)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
165
        size, bytes = self._data._record_to_data((rec[1],), rec[3], contents)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
166
        return bytes
167
168
169
class FTAnnotatedToFullText(KnitAdapter):
170
    """An adapter from FT annotated knits to unannotated ones."""
171
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
172
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
173
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
174
        rec, contents = \
175
            self._data._parse_record_unchecked(annotated_compressed_bytes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
176
        content, delta = self._annotate_factory.parse_record(factory.key[-1],
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
177
            contents, factory._build_details, None)
178
        return ''.join(content.text())
179
180
181
class DeltaAnnotatedToFullText(KnitAdapter):
182
    """An adapter for deltas from annotated to unannotated."""
183
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
184
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
185
        annotated_compressed_bytes = factory._raw_record
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
186
        rec, contents = \
187
            self._data._parse_record_unchecked(annotated_compressed_bytes)
188
        delta = self._annotate_factory.parse_line_delta(contents, rec[1],
189
            plain=True)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
190
        compression_parent = factory.parents[0]
191
        basis_entry = self._basis_vf.get_record_stream(
192
            [compression_parent], 'unordered', True).next()
193
        if basis_entry.storage_kind == 'absent':
194
            raise errors.RevisionNotPresent(compression_parent, self._basis_vf)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
195
        basis_chunks = basis_entry.get_bytes_as('chunked')
196
        basis_lines = osutils.chunks_to_lines(basis_chunks)
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
197
        # Manually apply the delta because we have one annotated content and
198
        # one plain.
199
        basis_content = PlainKnitContent(basis_lines, compression_parent)
200
        basis_content.apply_delta(delta, rec[1])
201
        basis_content._should_strip_eol = factory._build_details[1]
202
        return ''.join(basis_content.text())
203
204
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
205
class FTPlainToFullText(KnitAdapter):
206
    """An adapter from FT plain knits to unannotated ones."""
207
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
208
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
209
        compressed_bytes = factory._raw_record
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
210
        rec, contents = \
211
            self._data._parse_record_unchecked(compressed_bytes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
212
        content, delta = self._plain_factory.parse_record(factory.key[-1],
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
213
            contents, factory._build_details, None)
214
        return ''.join(content.text())
215
216
217
class DeltaPlainToFullText(KnitAdapter):
218
    """An adapter for deltas from annotated to unannotated."""
219
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
220
    def get_bytes(self, factory):
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
221
        compressed_bytes = factory._raw_record
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
222
        rec, contents = \
223
            self._data._parse_record_unchecked(compressed_bytes)
224
        delta = self._plain_factory.parse_line_delta(contents, rec[1])
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
225
        compression_parent = factory.parents[0]
226
        # XXX: string splitting overhead.
227
        basis_entry = self._basis_vf.get_record_stream(
228
            [compression_parent], 'unordered', True).next()
229
        if basis_entry.storage_kind == 'absent':
230
            raise errors.RevisionNotPresent(compression_parent, self._basis_vf)
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
231
        basis_chunks = basis_entry.get_bytes_as('chunked')
232
        basis_lines = osutils.chunks_to_lines(basis_chunks)
3350.3.5 by Robert Collins
Create adapters from plain compressed knit content.
233
        basis_content = PlainKnitContent(basis_lines, compression_parent)
234
        # Manually apply the delta because we have one annotated content and
235
        # one plain.
236
        content, _ = self._plain_factory.parse_record(rec[1], contents,
237
            factory._build_details, basis_content)
238
        return ''.join(content.text())
239
240
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
241
class KnitContentFactory(ContentFactory):
242
    """Content factory for streaming from knits.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
243
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
244
    :seealso ContentFactory:
245
    """
246
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
247
    def __init__(self, key, parents, build_details, sha1, raw_record,
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
248
        annotated, knit=None, network_bytes=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
249
        """Create a KnitContentFactory for key.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
250
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
251
        :param key: The key.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
252
        :param parents: The parents.
253
        :param build_details: The build details as returned from
254
            get_build_details.
255
        :param sha1: The sha1 expected from the full text of this object.
256
        :param raw_record: The bytes of the knit data from disk.
257
        :param annotated: True if the raw data is annotated.
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
258
        :param network_bytes: None to calculate the network bytes on demand,
259
            not-none if they are already known.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
260
        """
261
        ContentFactory.__init__(self)
262
        self.sha1 = sha1
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
263
        self.key = key
264
        self.parents = parents
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
265
        if build_details[0] == 'line-delta':
266
            kind = 'delta'
267
        else:
268
            kind = 'ft'
269
        if annotated:
270
            annotated_kind = 'annotated-'
271
        else:
272
            annotated_kind = ''
273
        self.storage_kind = 'knit-%s%s-gz' % (annotated_kind, kind)
274
        self._raw_record = raw_record
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
275
        self._network_bytes = network_bytes
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
276
        self._build_details = build_details
277
        self._knit = knit
278
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
279
    def _create_network_bytes(self):
280
        """Create a fully serialised network version for transmission."""
281
        # storage_kind, key, parents, Noeol, raw_record
282
        key_bytes = '\x00'.join(self.key)
283
        if self.parents is None:
284
            parent_bytes = 'None:'
285
        else:
286
            parent_bytes = '\t'.join('\x00'.join(key) for key in self.parents)
287
        if self._build_details[1]:
288
            noeol = 'N'
289
        else:
290
            noeol = ' '
291
        network_bytes = "%s\n%s\n%s\n%s%s" % (self.storage_kind, key_bytes,
292
            parent_bytes, noeol, self._raw_record)
293
        self._network_bytes = network_bytes
294
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
295
    def get_bytes_as(self, storage_kind):
296
        if storage_kind == self.storage_kind:
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
297
            if self._network_bytes is None:
298
                self._create_network_bytes()
299
            return self._network_bytes
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
300
        if ('-ft-' in self.storage_kind and
301
            storage_kind in ('chunked', 'fulltext')):
302
            adapter_key = (self.storage_kind, 'fulltext')
303
            adapter_factory = adapter_registry.get(adapter_key)
304
            adapter = adapter_factory(None)
305
            bytes = adapter.get_bytes(self)
306
            if storage_kind == 'chunked':
307
                return [bytes]
308
            else:
309
                return bytes
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
310
        if self._knit is not None:
4152.1.2 by Robert Collins
Add streaming from a stacked branch when the sort order is compatible with doing so.
311
            # Not redundant with direct conversion above - that only handles
312
            # fulltext cases.
3890.2.1 by John Arbash Meinel
Start working on a ChunkedContentFactory.
313
            if storage_kind == 'chunked':
314
                return self._knit.get_lines(self.key[0])
315
            elif storage_kind == 'fulltext':
316
                return self._knit.get_text(self.key[0])
317
        raise errors.UnavailableRepresentation(self.key, storage_kind,
318
            self.storage_kind)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
319
320
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
321
class LazyKnitContentFactory(ContentFactory):
322
    """A ContentFactory which can either generate full text or a wire form.
323
324
    :seealso ContentFactory:
325
    """
326
327
    def __init__(self, key, parents, generator, first):
328
        """Create a LazyKnitContentFactory.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
329
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
330
        :param key: The key of the record.
331
        :param parents: The parents of the record.
332
        :param generator: A _ContentMapGenerator containing the record for this
333
            key.
334
        :param first: Is this the first content object returned from generator?
335
            if it is, its storage kind is knit-delta-closure, otherwise it is
336
            knit-delta-closure-ref
337
        """
338
        self.key = key
339
        self.parents = parents
340
        self.sha1 = None
341
        self._generator = generator
342
        self.storage_kind = "knit-delta-closure"
343
        if not first:
344
            self.storage_kind = self.storage_kind + "-ref"
345
        self._first = first
346
347
    def get_bytes_as(self, storage_kind):
348
        if storage_kind == self.storage_kind:
349
            if self._first:
350
                return self._generator._wire_bytes()
351
            else:
352
                # all the keys etc are contained in the bytes returned in the
353
                # first record.
354
                return ''
355
        if storage_kind in ('chunked', 'fulltext'):
356
            chunks = self._generator._get_one_work(self.key).text()
357
            if storage_kind == 'chunked':
358
                return chunks
359
            else:
360
                return ''.join(chunks)
361
        raise errors.UnavailableRepresentation(self.key, storage_kind,
362
            self.storage_kind)
363
364
365
def knit_delta_closure_to_records(storage_kind, bytes, line_end):
366
    """Convert a network record to a iterator over stream records.
367
368
    :param storage_kind: The storage kind of the record.
369
        Must be 'knit-delta-closure'.
370
    :param bytes: The bytes of the record on the network.
371
    """
372
    generator = _NetworkContentMapGenerator(bytes, line_end)
373
    return generator.get_record_stream()
374
375
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
376
def knit_network_to_record(storage_kind, bytes, line_end):
377
    """Convert a network record to a record object.
378
379
    :param storage_kind: The storage kind of the record.
380
    :param bytes: The bytes of the record on the network.
381
    """
382
    start = line_end
383
    line_end = bytes.find('\n', start)
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
384
    key = tuple(bytes[start:line_end].split('\x00'))
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
385
    start = line_end + 1
386
    line_end = bytes.find('\n', start)
387
    parent_line = bytes[start:line_end]
388
    if parent_line == 'None:':
389
        parents = None
390
    else:
391
        parents = tuple(
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
392
            [tuple(segment.split('\x00')) for segment in parent_line.split('\t')
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
393
             if segment])
394
    start = line_end + 1
4005.3.3 by Robert Collins
Test NetworkRecordStream with delta'd texts.
395
    noeol = bytes[start] == 'N'
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
396
    if 'ft' in storage_kind:
397
        method = 'fulltext'
398
    else:
399
        method = 'line-delta'
400
    build_details = (method, noeol)
401
    start = start + 1
402
    raw_record = bytes[start:]
403
    annotated = 'annotated' in storage_kind
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
404
    return [KnitContentFactory(key, parents, build_details, None, raw_record,
405
        annotated, network_bytes=bytes)]
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
406
407
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
408
class KnitContent(object):
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
409
    """Content of a knit version to which deltas can be applied.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
410
3468.2.5 by Martin Pool
Correct comment and remove overbroad except block
411
    This is always stored in memory as a list of lines with \n at the end,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
412
    plus a flag saying if the final ending is really there or not, because that
3468.2.5 by Martin Pool
Correct comment and remove overbroad except block
413
    corresponds to the on-disk knit representation.
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
414
    """
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
415
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
416
    def __init__(self):
417
        self._should_strip_eol = False
418
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
419
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
420
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
421
        raise NotImplementedError(self.apply_delta)
422
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
423
    def line_delta_iter(self, new_lines):
1596.2.32 by Robert Collins
Reduce re-extraction of texts during weave to knit joins by providing a memoisation facility.
424
        """Generate line-based delta from this content to new_lines."""
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
425
        new_texts = new_lines.text()
426
        old_texts = self.text()
2781.1.1 by Martin Pool
merge cpatiencediff from Lukas
427
        s = patiencediff.PatienceSequenceMatcher(None, old_texts, new_texts)
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
428
        for tag, i1, i2, j1, j2 in s.get_opcodes():
429
            if tag == 'equal':
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
430
                continue
2151.1.1 by John Arbash Meinel
(Dmitry Vasiliev) Tune KnitContent and add tests
431
            # ofrom, oto, length, data
432
            yield i1, i2, j2 - j1, new_lines._lines[j1:j2]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
433
434
    def line_delta(self, new_lines):
435
        return list(self.line_delta_iter(new_lines))
436
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
437
    @staticmethod
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
438
    def get_line_delta_blocks(knit_delta, source, target):
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
439
        """Extract SequenceMatcher.get_matching_blocks() from a knit delta"""
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
440
        target_len = len(target)
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
441
        s_pos = 0
442
        t_pos = 0
443
        for s_begin, s_end, t_len, new_text in knit_delta:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
444
            true_n = s_begin - s_pos
445
            n = true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
446
            if n > 0:
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
447
                # knit deltas do not provide reliable info about whether the
448
                # last line of a file matches, due to eol handling.
449
                if source[s_pos + n -1] != target[t_pos + n -1]:
2520.4.47 by Aaron Bentley
Fix get_line_delta_blocks with eol
450
                    n-=1
451
                if n > 0:
452
                    yield s_pos, t_pos, n
453
            t_pos += t_len + true_n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
454
            s_pos = s_end
2520.4.48 by Aaron Bentley
Support getting blocks from knit deltas with no final EOL
455
        n = target_len - t_pos
456
        if n > 0:
457
            if source[s_pos + n -1] != target[t_pos + n -1]:
458
                n-=1
459
            if n > 0:
460
                yield s_pos, t_pos, n
2520.4.41 by Aaron Bentley
Accelerate mpdiff generation
461
        yield s_pos + (target_len - t_pos), target_len, 0
462
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
463
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
464
class AnnotatedKnitContent(KnitContent):
465
    """Annotated content."""
466
467
    def __init__(self, lines):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
468
        KnitContent.__init__(self)
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
469
        self._lines = lines
470
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
471
    def annotate(self):
472
        """Return a list of (origin, text) for each content line."""
3468.2.4 by Martin Pool
Test and fix #234748 problems in trailing newline diffs
473
        lines = self._lines[:]
474
        if self._should_strip_eol:
475
            origin, last_line = lines[-1]
476
            lines[-1] = (origin, last_line.rstrip('\n'))
477
        return lines
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
478
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
479
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
480
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
481
        offset = 0
482
        lines = self._lines
483
        for start, end, count, delta_lines in delta:
484
            lines[offset+start:offset+end] = delta_lines
485
            offset = offset + (start - end) + count
486
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
487
    def text(self):
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
488
        try:
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
489
            lines = [text for origin, text in self._lines]
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
490
        except ValueError, e:
491
            # most commonly (only?) caused by the internal form of the knit
492
            # missing annotation information because of a bug - see thread
493
            # around 20071015
494
            raise KnitCorrupt(self,
495
                "line in annotated knit missing annotation information: %s"
496
                % (e,))
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
497
        if self._should_strip_eol:
3350.3.4 by Robert Collins
Finish adapters for annotated knits to unannotated knits and full texts.
498
            lines[-1] = lines[-1].rstrip('\n')
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
499
        return lines
500
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
501
    def copy(self):
502
        return AnnotatedKnitContent(self._lines[:])
503
504
505
class PlainKnitContent(KnitContent):
2794.1.3 by Robert Collins
Review feedback.
506
    """Unannotated content.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
507
2794.1.3 by Robert Collins
Review feedback.
508
    When annotate[_iter] is called on this content, the same version is reported
509
    for all lines. Generally, annotate[_iter] is not useful on PlainKnitContent
510
    objects.
511
    """
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
512
513
    def __init__(self, lines, version_id):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
514
        KnitContent.__init__(self)
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
515
        self._lines = lines
516
        self._version_id = version_id
517
3316.2.13 by Robert Collins
* ``VersionedFile.annotate_iter`` is deprecated. While in principal this
518
    def annotate(self):
519
        """Return a list of (origin, text) for each content line."""
520
        return [(self._version_id, line) for line in self._lines]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
521
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
522
    def apply_delta(self, delta, new_version_id):
2921.2.2 by Robert Collins
Review feedback.
523
        """Apply delta to this object to become new_version_id."""
2921.2.1 by Robert Collins
* Knit text reconstruction now avoids making copies of the lines list for
524
        offset = 0
525
        lines = self._lines
526
        for start, end, count, delta_lines in delta:
527
            lines[offset+start:offset+end] = delta_lines
528
            offset = offset + (start - end) + count
529
        self._version_id = new_version_id
530
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
531
    def copy(self):
532
        return PlainKnitContent(self._lines[:], self._version_id)
533
534
    def text(self):
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
535
        lines = self._lines
536
        if self._should_strip_eol:
537
            lines = lines[:]
538
            lines[-1] = lines[-1].rstrip('\n')
539
        return lines
540
541
542
class _KnitFactory(object):
543
    """Base class for common Factory functions."""
544
545
    def parse_record(self, version_id, record, record_details,
546
                     base_content, copy_base_content=True):
547
        """Parse a record into a full content object.
548
549
        :param version_id: The official version id for this content
550
        :param record: The data returned by read_records_iter()
551
        :param record_details: Details about the record returned by
552
            get_build_details
553
        :param base_content: If get_build_details returns a compression_parent,
554
            you must return a base_content here, else use None
555
        :param copy_base_content: When building from the base_content, decide
556
            you can either copy it and return a new object, or modify it in
557
            place.
558
        :return: (content, delta) A Content object and possibly a line-delta,
559
            delta may be None
560
        """
561
        method, noeol = record_details
562
        if method == 'line-delta':
563
            if copy_base_content:
564
                content = base_content.copy()
565
            else:
566
                content = base_content
567
            delta = self.parse_line_delta(record, version_id)
568
            content.apply_delta(delta, version_id)
569
        else:
570
            content = self.parse_fulltext(record, version_id)
571
            delta = None
572
        content._should_strip_eol = noeol
573
        return (content, delta)
574
575
576
class KnitAnnotateFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
577
    """Factory for creating annotated Content objects."""
578
579
    annotated = True
580
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
581
    def make(self, lines, version_id):
582
        num_lines = len(lines)
583
        return AnnotatedKnitContent(zip([version_id] * num_lines, lines))
584
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
585
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
586
        """Convert fulltext to internal representation
587
588
        fulltext content is of the format
589
        revid(utf8) plaintext\n
590
        internal representation is of the format:
591
        (revid, plaintext)
592
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
593
        # TODO: jam 20070209 The tests expect this to be returned as tuples,
594
        #       but the code itself doesn't really depend on that.
595
        #       Figure out a way to not require the overhead of turning the
596
        #       list back into tuples.
597
        lines = [tuple(line.split(' ', 1)) for line in content]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
598
        return AnnotatedKnitContent(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
599
600
    def parse_line_delta_iter(self, lines):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
601
        return iter(self.parse_line_delta(lines))
1628.1.2 by Robert Collins
More knit micro-optimisations.
602
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
603
    def parse_line_delta(self, lines, version_id, plain=False):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
604
        """Convert a line based delta into internal representation.
605
606
        line delta is in the form of:
607
        intstart intend intcount
608
        1..count lines:
609
        revid(utf8) newline\n
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
610
        internal representation is
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
611
        (start, end, count, [1..count tuples (revid, newline)])
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
612
613
        :param plain: If True, the lines are returned as a plain
2911.1.1 by Martin Pool
Better messages when problems are detected inside a knit
614
            list without annotations, not as a list of (origin, content) tuples, i.e.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
615
            (start, end, count, [1..count newline])
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
616
        """
1628.1.2 by Robert Collins
More knit micro-optimisations.
617
        result = []
618
        lines = iter(lines)
619
        next = lines.next
2249.5.1 by John Arbash Meinel
Leave revision-ids in utf-8 when reading.
620
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
621
        cache = {}
622
        def cache_and_return(line):
623
            origin, text = line.split(' ', 1)
624
            return cache.setdefault(origin, origin), text
625
1628.1.2 by Robert Collins
More knit micro-optimisations.
626
        # walk through the lines parsing.
2851.4.2 by Ian Clatworthy
use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
627
        # Note that the plain test is explicitly pulled out of the
628
        # loop to minimise any performance impact
629
        if plain:
630
            for header in lines:
631
                start, end, count = [int(n) for n in header.split(',')]
632
                contents = [next().split(' ', 1)[1] for i in xrange(count)]
633
                result.append((start, end, count, contents))
634
        else:
635
            for header in lines:
636
                start, end, count = [int(n) for n in header.split(',')]
637
                contents = [tuple(next().split(' ', 1)) for i in xrange(count)]
638
                result.append((start, end, count, contents))
1628.1.2 by Robert Collins
More knit micro-optimisations.
639
        return result
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
640
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
641
    def get_fulltext_content(self, lines):
642
        """Extract just the content lines from a fulltext."""
643
        return (line.split(' ', 1)[1] for line in lines)
644
645
    def get_linedelta_content(self, lines):
646
        """Extract just the content from a line delta.
647
648
        This doesn't return all of the extra information stored in a delta.
649
        Only the actual content lines.
650
        """
651
        lines = iter(lines)
652
        next = lines.next
653
        for header in lines:
654
            header = header.split(',')
655
            count = int(header[2])
656
            for i in xrange(count):
657
                origin, text = next().split(' ', 1)
658
                yield text
659
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
660
    def lower_fulltext(self, content):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
661
        """convert a fulltext content record into a serializable form.
662
663
        see parse_fulltext which this inverts.
664
        """
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
665
        return ['%s %s' % (o, t) for o, t in content._lines]
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
666
667
    def lower_line_delta(self, delta):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
668
        """convert a delta into a serializable form.
669
1628.1.2 by Robert Collins
More knit micro-optimisations.
670
        See parse_line_delta which this inverts.
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
671
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
672
        # TODO: jam 20070209 We only do the caching thing to make sure that
673
        #       the origin is a valid utf-8 line, eventually we could remove it
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
674
        out = []
675
        for start, end, c, lines in delta:
676
            out.append('%d,%d,%d\n' % (start, end, c))
2249.5.15 by John Arbash Meinel
remove get_cached_utf8 checks which were slowing things down.
677
            out.extend(origin + ' ' + text
1911.2.1 by John Arbash Meinel
Cache encode/decode operations, saves memory and time. Especially when committing a new kernel tree with 7.7M new lines to annotate
678
                       for origin, text in lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
679
        return out
680
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
681
    def annotate(self, knit, key):
682
        content = knit._get_content(key)
683
        # adjust for the fact that serialised annotations are only key suffixes
684
        # for this factory.
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
685
        if type(key) is tuple:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
686
            prefix = key[:-1]
687
            origins = content.annotate()
688
            result = []
689
            for origin, line in origins:
690
                result.append((prefix + (origin,), line))
691
            return result
692
        else:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
693
            # XXX: This smells a bit.  Why would key ever be a non-tuple here?
694
            # Aren't keys defined to be tuples?  -- spiv 20080618
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
695
            return content.annotate()
2770.1.1 by Aaron Bentley
Initial implmentation of plain knit annotation
696
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
697
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
698
class KnitPlainFactory(_KnitFactory):
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
699
    """Factory for creating plain Content objects."""
700
701
    annotated = False
702
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
703
    def make(self, lines, version_id):
704
        return PlainKnitContent(lines, version_id)
705
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
706
    def parse_fulltext(self, content, version_id):
1596.2.7 by Robert Collins
Remove the requirement for reannotation in knit joins.
707
        """This parses an unannotated fulltext.
708
709
        Note that this is not a noop - the internal representation
710
        has (versionid, line) - its just a constant versionid.
711
        """
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
712
        return self.make(content, version_id)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
713
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
714
    def parse_line_delta_iter(self, lines, version_id):
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
715
        cur = 0
716
        num_lines = len(lines)
717
        while cur < num_lines:
718
            header = lines[cur]
719
            cur += 1
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
720
            start, end, c = [int(n) for n in header.split(',')]
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
721
            yield start, end, c, lines[cur:cur+c]
2163.1.2 by John Arbash Meinel
Don't modify the list during parse_line_delta
722
            cur += c
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
723
2249.5.12 by John Arbash Meinel
Change the APIs for VersionedFile, Store, and some of Repository into utf-8
724
    def parse_line_delta(self, lines, version_id):
725
        return list(self.parse_line_delta_iter(lines, version_id))
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
726
2163.2.2 by John Arbash Meinel
Don't deal with annotations when we don't care about them. Saves another 300+ms
727
    def get_fulltext_content(self, lines):
728
        """Extract just the content lines from a fulltext."""
729
        return iter(lines)
730
731
    def get_linedelta_content(self, lines):
732
        """Extract just the content from a line delta.
733
734
        This doesn't return all of the extra information stored in a delta.
735
        Only the actual content lines.
736
        """
737
        lines = iter(lines)
738
        next = lines.next
739
        for header in lines:
740
            header = header.split(',')
741
            count = int(header[2])
742
            for i in xrange(count):
743
                yield next()
744
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
745
    def lower_fulltext(self, content):
746
        return content.text()
747
748
    def lower_line_delta(self, delta):
749
        out = []
750
        for start, end, c, lines in delta:
751
            out.append('%d,%d,%d\n' % (start, end, c))
2794.1.2 by Robert Collins
Nuke versioned file add/get delta support, allowing easy simplification of unannotated Content, reducing memory copies and friction during commit on unannotated texts.
752
            out.extend(lines)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
753
        return out
754
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
755
    def annotate(self, knit, key):
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
756
        annotator = _KnitAnnotator(knit)
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
757
        return annotator.annotate_flat(key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
758
759
760
761
def make_file_factory(annotated, mapper):
762
    """Create a factory for creating a file based KnitVersionedFiles.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
763
764
    This is only functional enough to run interface tests, it doesn't try to
765
    provide a full pack environment.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
766
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
767
    :param annotated: knit annotations are wanted.
768
    :param mapper: The mapper from keys to paths.
769
    """
770
    def factory(transport):
771
        index = _KndxIndex(transport, mapper, lambda:None, lambda:True, lambda:True)
772
        access = _KnitKeyAccess(transport, mapper)
773
        return KnitVersionedFiles(index, access, annotated=annotated)
774
    return factory
775
776
777
def make_pack_factory(graph, delta, keylength):
778
    """Create a factory for creating a pack based VersionedFiles.
779
780
    This is only functional enough to run interface tests, it doesn't try to
781
    provide a full pack environment.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
782
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
783
    :param graph: Store a graph.
784
    :param delta: Delta compress contents.
785
    :param keylength: How long should keys be.
786
    """
787
    def factory(transport):
788
        parents = graph or delta
789
        ref_length = 0
790
        if graph:
791
            ref_length += 1
792
        if delta:
793
            ref_length += 1
794
            max_delta_chain = 200
795
        else:
796
            max_delta_chain = 0
797
        graph_index = _mod_index.InMemoryGraphIndex(reference_lists=ref_length,
798
            key_elements=keylength)
799
        stream = transport.open_write_stream('newpack')
800
        writer = pack.ContainerWriter(stream.write)
801
        writer.begin()
802
        index = _KnitGraphIndex(graph_index, lambda:True, parents=parents,
803
            deltas=delta, add_callback=graph_index.add_nodes)
5757.5.1 by Jelmer Vernooij
Move _DirectPackAccess to bzrlib.repofmt.pack_repo.
804
        access = pack_repo._DirectPackAccess({})
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
805
        access.set_writer(writer, graph_index, (transport, 'newpack'))
806
        result = KnitVersionedFiles(index, access,
807
            max_delta_chain=max_delta_chain)
808
        result.stream = stream
809
        result.writer = writer
810
        return result
811
    return factory
812
813
814
def cleanup_pack_knit(versioned_files):
815
    versioned_files.stream.close()
816
    versioned_files.writer.end()
817
818
4039.3.5 by John Arbash Meinel
Add direct tests for _get_total_build_size.
819
def _get_total_build_size(self, keys, positions):
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
820
    """Determine the total bytes to build these keys.
821
822
    (helper function because _KnitGraphIndex and _KndxIndex work the same, but
823
    don't inherit from a common base.)
824
825
    :param keys: Keys that we want to build
826
    :param positions: dict of {key, (info, index_memo, comp_parent)} (such
827
        as returned by _get_components_positions)
828
    :return: Number of bytes to build those keys
829
    """
830
    all_build_index_memos = {}
831
    build_keys = keys
832
    while build_keys:
833
        next_keys = set()
834
        for key in build_keys:
835
            # This is mostly for the 'stacked' case
836
            # Where we will be getting the data from a fallback
837
            if key not in positions:
838
                continue
839
            _, index_memo, compression_parent = positions[key]
840
            all_build_index_memos[key] = index_memo
841
            if compression_parent not in all_build_index_memos:
842
                next_keys.add(compression_parent)
843
        build_keys = next_keys
844
    return sum([index_memo[2] for index_memo
845
                in all_build_index_memos.itervalues()])
846
847
5816.8.1 by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls.
848
class KnitVersionedFiles(VersionedFilesWithFallbacks):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
849
    """Storage for many versioned files using knit compression.
850
851
    Backend storage is managed by indices and data objects.
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
852
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
853
    :ivar _index: A _KnitGraphIndex or similar that can describe the
854
        parents, graph, compression and data location of entries in this
855
        KnitVersionedFiles.  Note that this is only the index for
3582.1.16 by Martin Pool
Review feedback and news entry
856
        *this* vfs; if there are fallbacks they must be queried separately.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
857
    """
858
859
    def __init__(self, index, data_access, max_delta_chain=200,
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
860
                 annotated=False, reload_func=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
861
        """Create a KnitVersionedFiles with index and data_access.
862
863
        :param index: The index for the knit data.
864
        :param data_access: The access object to store and retrieve knit
865
            records.
866
        :param max_delta_chain: The maximum number of deltas to permit during
867
            insertion. Set to 0 to prohibit the use of deltas.
868
        :param annotated: Set to True to cause annotations to be calculated and
869
            stored during insertion.
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
870
        :param reload_func: An function that can be called if we think we need
871
            to reload the pack listing and try again. See
872
            'bzrlib.repofmt.pack_repo.AggregateIndex' for the signature.
1563.2.25 by Robert Collins
Merge in upstream.
873
        """
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
874
        self._index = index
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
875
        self._access = data_access
876
        self._max_delta_chain = max_delta_chain
877
        if annotated:
878
            self._factory = KnitAnnotateFactory()
879
        else:
880
            self._factory = KnitPlainFactory()
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
881
        self._immediate_fallback_vfs = []
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
882
        self._reload_func = reload_func
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
883
3702.1.1 by Martin Pool
Add repr for KnitVersionedFiles
884
    def __repr__(self):
885
        return "%s(%r, %r)" % (
886
            self.__class__.__name__,
887
            self._index,
888
            self._access)
889
5816.8.1 by Andrew Bennetts
Be a little more clever about constructing a parents provider for stacked repositories, so that get_parent_map with local-stacked-on-remote doesn't use HPSS VFS calls.
890
    def without_fallbacks(self):
891
        """Return a clone of this object without any fallbacks configured."""
892
        return KnitVersionedFiles(self._index, self._access,
893
            self._max_delta_chain, self._factory.annotated,
894
            self._reload_func)
895
3350.8.1 by Robert Collins
KnitVersionedFiles.add_fallback_versioned_files exists.
896
    def add_fallback_versioned_files(self, a_versioned_files):
897
        """Add a source of texts for texts not present in this knit.
898
899
        :param a_versioned_files: A VersionedFiles object.
900
        """
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
901
        self._immediate_fallback_vfs.append(a_versioned_files)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
902
903
    def add_lines(self, key, parents, lines, parent_texts=None,
904
        left_matching_blocks=None, nostore_sha=None, random_id=False,
905
        check_content=True):
906
        """See VersionedFiles.add_lines()."""
907
        self._index._check_write_ok()
908
        self._check_add(key, lines, random_id, check_content)
909
        if parents is None:
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
910
            # The caller might pass None if there is no graph data, but kndx
911
            # indexes can't directly store that, so we give them
912
            # an empty tuple instead.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
913
            parents = ()
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
914
        line_bytes = ''.join(lines)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
915
        return self._add(key, lines, parents,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
916
            parent_texts, left_matching_blocks, nostore_sha, random_id,
917
            line_bytes=line_bytes)
918
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
919
    def _add_text(self, key, parents, text, nostore_sha=None, random_id=False):
4398.9.1 by Matt Nordhoff
Update _add_text docstrings that still referred to add_text.
920
        """See VersionedFiles._add_text()."""
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
921
        self._index._check_write_ok()
922
        self._check_add(key, None, random_id, check_content=False)
923
        if text.__class__ is not str:
4398.8.5 by John Arbash Meinel
Fix a few more cases where we were adding a list rather than an empty string.
924
            raise errors.BzrBadParameterUnicode("text")
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
925
        if parents is None:
926
            # The caller might pass None if there is no graph data, but kndx
927
            # indexes can't directly store that, so we give them
928
            # an empty tuple instead.
929
            parents = ()
930
        return self._add(key, None, parents,
4398.8.6 by John Arbash Meinel
Switch the api from VF.add_text to VF._add_text and trim some extra 'features'.
931
            None, None, nostore_sha, random_id,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
932
            line_bytes=text)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
933
934
    def _add(self, key, lines, parents, parent_texts,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
935
        left_matching_blocks, nostore_sha, random_id,
936
        line_bytes):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
937
        """Add a set of lines on top of version specified by parents.
938
939
        Any versions not present will be converted into ghosts.
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
940
941
        :param lines: A list of strings where each one is a single line (has a
942
            single newline at the end of the string) This is now optional
943
            (callers can pass None). It is left in its location for backwards
944
            compatibility. It should ''.join(lines) must == line_bytes
945
        :param line_bytes: A single string containing the content
946
947
        We pass both lines and line_bytes because different routes bring the
948
        values to this function. And for memory efficiency, we don't want to
949
        have to split/join on-demand.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
950
        """
951
        # first thing, if the content is something we don't need to store, find
952
        # that out.
953
        digest = sha_string(line_bytes)
954
        if nostore_sha == digest:
955
            raise errors.ExistingContent
956
957
        present_parents = []
958
        if parent_texts is None:
959
            parent_texts = {}
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
960
        # Do a single query to ascertain parent presence; we only compress
961
        # against parents in the same kvf.
962
        present_parent_map = self._index.get_parent_map(parents)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
963
        for parent in parents:
964
            if parent in present_parent_map:
965
                present_parents.append(parent)
966
967
        # Currently we can only compress against the left most present parent.
968
        if (len(present_parents) == 0 or
969
            present_parents[0] != parents[0]):
970
            delta = False
971
        else:
972
            # To speed the extract of texts the delta chain is limited
973
            # to a fixed number of deltas.  This should minimize both
974
            # I/O and the time spend applying deltas.
975
            delta = self._check_should_delta(present_parents[0])
976
977
        text_length = len(line_bytes)
978
        options = []
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
979
        no_eol = False
980
        # Note: line_bytes is not modified to add a newline, that is tracked
981
        #       via the no_eol flag. 'lines' *is* modified, because that is the
982
        #       general values needed by the Content code.
983
        if line_bytes and line_bytes[-1] != '\n':
984
            options.append('no-eol')
985
            no_eol = True
986
            # Copy the existing list, or create a new one
987
            if lines is None:
988
                lines = osutils.split_lines(line_bytes)
989
            else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
990
                lines = lines[:]
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
991
            # Replace the last line with one that ends in a final newline
992
            lines[-1] = lines[-1] + '\n'
993
        if lines is None:
994
            lines = osutils.split_lines(line_bytes)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
995
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
996
        for element in key[:-1]:
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
997
            if type(element) is not str:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
998
                raise TypeError("key contains non-strings: %r" % (key,))
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
999
        if key[-1] is None:
1000
            key = key[:-1] + ('sha1:' + digest,)
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
1001
        elif type(key[-1]) is not str:
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1002
                raise TypeError("key contains non-strings: %r" % (key,))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1003
        # Knit hunks are still last-element only
1004
        version_id = key[-1]
1005
        content = self._factory.make(lines, version_id)
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1006
        if no_eol:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1007
            # Hint to the content object that its text() call should strip the
1008
            # EOL.
1009
            content._should_strip_eol = True
1010
        if delta or (self._factory.annotated and len(present_parents) > 0):
1011
            # Merge annotations from parent texts if needed.
1012
            delta_hunks = self._merge_annotations(content, present_parents,
1013
                parent_texts, delta, self._factory.annotated,
1014
                left_matching_blocks)
1015
1016
        if delta:
1017
            options.append('line-delta')
1018
            store_lines = self._factory.lower_line_delta(delta_hunks)
1019
            size, bytes = self._record_to_data(key, digest,
1020
                store_lines)
1021
        else:
1022
            options.append('fulltext')
1023
            # isinstance is slower and we have no hierarchy.
4088.3.1 by Benjamin Peterson
compare types with 'is' not ==
1024
            if self._factory.__class__ is KnitPlainFactory:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1025
                # Use the already joined bytes saving iteration time in
1026
                # _record_to_data.
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1027
                dense_lines = [line_bytes]
1028
                if no_eol:
1029
                    dense_lines.append('\n')
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1030
                size, bytes = self._record_to_data(key, digest,
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1031
                    lines, dense_lines)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1032
            else:
1033
                # get mixed annotation + content and feed it into the
1034
                # serialiser.
1035
                store_lines = self._factory.lower_fulltext(content)
1036
                size, bytes = self._record_to_data(key, digest,
1037
                    store_lines)
1038
1039
        access_memo = self._access.add_raw_records([(key, size)], bytes)[0]
1040
        self._index.add_records(
1041
            ((key, options, access_memo, parents),),
1042
            random_id=random_id)
1043
        return digest, text_length, content
1044
1045
    def annotate(self, key):
1046
        """See VersionedFiles.annotate."""
1047
        return self._factory.annotate(self, key)
1048
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
1049
    def get_annotator(self):
1050
        return _KnitAnnotator(self)
1051
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1052
    def check(self, progress_bar=None, keys=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1053
        """See VersionedFiles.check()."""
4332.3.26 by Robert Collins
Allow passing keys to check to VersionedFile.check().
1054
        if keys is None:
1055
            return self._logical_check()
1056
        else:
1057
            # At the moment, check does not extra work over get_record_stream
1058
            return self.get_record_stream(keys, 'unordered', True)
1059
1060
    def _logical_check(self):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1061
        # This doesn't actually test extraction of everything, but that will
1062
        # impact 'bzr check' substantially, and needs to be integrated with
1063
        # care. However, it does check for the obvious problem of a delta with
1064
        # no basis.
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
1065
        keys = self._index.keys()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1066
        parent_map = self.get_parent_map(keys)
1067
        for key in keys:
1068
            if self._index.get_method(key) != 'fulltext':
1069
                compression_parent = parent_map[key][0]
1070
                if compression_parent not in parent_map:
1071
                    raise errors.KnitCorrupt(self,
1072
                        "Missing basis parent %s for %s" % (
1073
                        compression_parent, key))
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1074
        for fallback_vfs in self._immediate_fallback_vfs:
3517.4.14 by Martin Pool
KnitVersionedFiles.check should just check its own keys then recurse into fallbacks
1075
            fallback_vfs.check()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1076
1077
    def _check_add(self, key, lines, random_id, check_content):
1078
        """check that version_id and lines are safe to add."""
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1079
        version_id = key[-1]
4241.4.1 by Ian Clatworthy
add sha generation support to versionedfiles
1080
        if version_id is not None:
1081
            if contains_whitespace(version_id):
1082
                raise InvalidRevisionId(version_id, self)
1083
            self.check_not_reserved_id(version_id)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1084
        # TODO: If random_id==False and the key is already present, we should
1085
        # probably check that the existing content is identical to what is
1086
        # being inserted, and otherwise raise an exception.  This would make
1087
        # the bundle code simpler.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1088
        if check_content:
1089
            self._check_lines_not_unicode(lines)
1090
            self._check_lines_are_lines(lines)
1091
1092
    def _check_header(self, key, line):
1093
        rec = self._split_header(line)
1094
        self._check_header_version(rec, key[-1])
1095
        return rec
1096
1097
    def _check_header_version(self, rec, version_id):
1098
        """Checks the header version on original format knit records.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1099
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1100
        These have the last component of the key embedded in the record.
1101
        """
1102
        if rec[1] != version_id:
1103
            raise KnitCorrupt(self,
1104
                'unexpected version, wanted %r, got %r' % (version_id, rec[1]))
1105
1106
    def _check_should_delta(self, parent):
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
1107
        """Iterate back through the parent listing, looking for a fulltext.
1108
1109
        This is used when we want to decide whether to add a delta or a new
1110
        fulltext. It searches for _max_delta_chain parents. When it finds a
1111
        fulltext parent, it sees if the total size of the deltas leading up to
1112
        it is large enough to indicate that we want a new full text anyway.
1113
1114
        Return True if we should create a new delta, False if we should use a
1115
        full text.
1116
        """
1117
        delta_size = 0
1118
        fulltext_size = None
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
1119
        for count in xrange(self._max_delta_chain):
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1120
            try:
3582.1.14 by Martin Pool
Clearer comments about KnitVersionedFile stacking
1121
                # Note that this only looks in the index of this particular
1122
                # KnitVersionedFiles, not in the fallbacks.  This ensures that
1123
                # we won't store a delta spanning physical repository
1124
                # boundaries.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1125
                build_details = self._index.get_build_details([parent])
1126
                parent_details = build_details[parent]
3973.1.1 by John Arbash Meinel
Trivially fix a bug in _check_should_delta when a parent is not present.
1127
            except (RevisionNotPresent, KeyError), e:
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1128
                # Some basis is not locally present: always fulltext
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
1129
                return False
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1130
            index_memo, compression_parent, _, _ = parent_details
1131
            _, _, size = index_memo
1132
            if compression_parent is None:
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
1133
                fulltext_size = size
1134
                break
1135
            delta_size += size
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1136
            # We don't explicitly check for presence because this is in an
1137
            # inner loop, and if it's missing it'll fail anyhow.
3915.3.1 by John Arbash Meinel
As part of _check_should_delta, use the get_build_details api.
1138
            parent = compression_parent
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
1139
        else:
1140
            # We couldn't find a fulltext, so we must create a new one
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
1141
            return False
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1142
        # Simple heuristic - if the total I/O wold be greater as a delta than
1143
        # the originally installed fulltext, we create a new fulltext.
2147.1.2 by John Arbash Meinel
Simplify the knit max-chain detection code.
1144
        return fulltext_size > delta_size
2147.1.1 by John Arbash Meinel
Factor the common knit delta selection into a helper func, and allow the fulltext to be chosen based on cumulative delta size
1145
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1146
    def _build_details_to_components(self, build_details):
1147
        """Convert a build_details tuple to a position tuple."""
1148
        # record_details, access_memo, compression_parent
1149
        return build_details[3], build_details[0], build_details[1]
1150
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1151
    def _get_components_positions(self, keys, allow_missing=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1152
        """Produce a map of position data for the components of keys.
1153
1154
        This data is intended to be used for retrieving the knit records.
1155
1156
        A dict of key to (record_details, index_memo, next, parents) is
1157
        returned.
1158
        method is the way referenced data should be applied.
1159
        index_memo is the handle to pass to the data access to actually get the
1160
            data
1161
        next is the build-parent of the version, or None for fulltexts.
1162
        parents is the version_ids of the parents of this version
1163
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1164
        :param allow_missing: If True do not raise an error on a missing component,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1165
            just ignore it.
1166
        """
1167
        component_data = {}
1168
        pending_components = keys
1169
        while pending_components:
1170
            build_details = self._index.get_build_details(pending_components)
1171
            current_components = set(pending_components)
1172
            pending_components = set()
1173
            for key, details in build_details.iteritems():
1174
                (index_memo, compression_parent, parents,
1175
                 record_details) = details
1176
                method = record_details[0]
1177
                if compression_parent is not None:
1178
                    pending_components.add(compression_parent)
1179
                component_data[key] = self._build_details_to_components(details)
1180
            missing = current_components.difference(build_details)
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1181
            if missing and not allow_missing:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1182
                raise errors.RevisionNotPresent(missing.pop(), self)
1183
        return component_data
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1184
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1185
    def _get_content(self, key, parent_texts={}):
1186
        """Returns a content object that makes up the specified
1187
        version."""
1188
        cached_version = parent_texts.get(key, None)
1189
        if cached_version is not None:
1190
            # Ensure the cache dict is valid.
1191
            if not self.get_parent_map([key]):
1192
                raise RevisionNotPresent(key, self)
1193
            return cached_version
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1194
        generator = _VFContentMapGenerator(self, [key])
1195
        return generator._get_content(key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1196
4593.5.20 by John Arbash Meinel
Expose KnownGraph off of VersionedFiles
1197
    def get_known_graph_ancestry(self, keys):
1198
        """Get a KnownGraph instance with the ancestry of keys."""
4593.5.36 by John Arbash Meinel
a few more implementations of the interface.
1199
        parent_map, missing_keys = self._index.find_ancestry(keys)
5050.70.2 by Martin Pool
Search all fallbacks for get_known_graph_ancestry
1200
        for fallback in self._transitive_fallbacks():
4634.11.2 by John Arbash Meinel
Teach VF.get_known_graph_ancestry to go to fallbacks (bug #419241)
1201
            if not missing_keys:
1202
                break
1203
            (f_parent_map, f_missing_keys) = fallback._index.find_ancestry(
1204
                                                missing_keys)
1205
            parent_map.update(f_parent_map)
1206
            missing_keys = f_missing_keys
4593.5.20 by John Arbash Meinel
Expose KnownGraph off of VersionedFiles
1207
        kg = _mod_graph.KnownGraph(parent_map)
1208
        return kg
1209
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1210
    def get_parent_map(self, keys):
3517.4.17 by Martin Pool
Redo base Repository.get_parent_map to use .revisions graph
1211
        """Get a map of the graph parents of keys.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1212
1213
        :param keys: The keys to look up parents for.
1214
        :return: A mapping from keys to parents. Absent keys are absent from
1215
            the mapping.
1216
        """
3350.8.14 by Robert Collins
Review feedback.
1217
        return self._get_parent_map_with_sources(keys)[0]
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1218
3350.8.14 by Robert Collins
Review feedback.
1219
    def _get_parent_map_with_sources(self, keys):
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1220
        """Get a map of the parents of keys.
1221
1222
        :param keys: The keys to look up parents for.
1223
        :return: A tuple. The first element is a mapping from keys to parents.
1224
            Absent keys are absent from the mapping. The second element is a
1225
            list with the locations each key was found in. The first element
1226
            is the in-this-knit parents, the second the first fallback source,
1227
            and so on.
1228
        """
3350.8.2 by Robert Collins
stacked get_parent_map.
1229
        result = {}
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1230
        sources = [self._index] + self._immediate_fallback_vfs
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1231
        source_results = []
3350.8.2 by Robert Collins
stacked get_parent_map.
1232
        missing = set(keys)
1233
        for source in sources:
1234
            if not missing:
1235
                break
1236
            new_result = source.get_parent_map(missing)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1237
            source_results.append(new_result)
3350.8.2 by Robert Collins
stacked get_parent_map.
1238
            result.update(new_result)
1239
            missing.difference_update(set(new_result))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1240
        return result, source_results
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1241
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1242
    def _get_record_map(self, keys, allow_missing=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1243
        """Produce a dictionary of knit records.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1244
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1245
        :return: {key:(record, record_details, digest, next)}
1246
            record
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1247
                data returned from read_records (a KnitContentobject)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1248
            record_details
1249
                opaque information to pass to parse_record
1250
            digest
1251
                SHA1 digest of the full text after all steps are done
1252
            next
1253
                build-parent of the version, i.e. the leftmost ancestor.
1254
                Will be None if the record is not a delta.
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1255
        :param keys: The keys to build a map for
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1256
        :param allow_missing: If some records are missing, rather than
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1257
            error, just return the data that could be generated.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1258
        """
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1259
        raw_map = self._get_record_map_unparsed(keys,
1260
            allow_missing=allow_missing)
1261
        return self._raw_map_to_record_map(raw_map)
1262
1263
    def _raw_map_to_record_map(self, raw_map):
1264
        """Parse the contents of _get_record_map_unparsed.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1265
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1266
        :return: see _get_record_map.
1267
        """
1268
        result = {}
1269
        for key in raw_map:
1270
            data, record_details, next = raw_map[key]
1271
            content, digest = self._parse_record(key[-1], data)
1272
            result[key] = content, record_details, digest, next
1273
        return result
1274
1275
    def _get_record_map_unparsed(self, keys, allow_missing=False):
1276
        """Get the raw data for reconstructing keys without parsing it.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
1277
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1278
        :return: A dict suitable for parsing via _raw_map_to_record_map.
1279
            key-> raw_bytes, (method, noeol), compression_parent
1280
        """
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1281
        # This retries the whole request if anything fails. Potentially we
1282
        # could be a bit more selective. We could track the keys whose records
1283
        # we have successfully found, and then only request the new records
1284
        # from there. However, _get_components_positions grabs the whole build
1285
        # chain, which means we'll likely try to grab the same records again
4005.3.7 by Robert Collins
Review feedback.
1286
        # anyway. Also, can the build chains change as part of a pack
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1287
        # operation? We wouldn't want to end up with a broken chain.
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1288
        while True:
1289
            try:
1290
                position_map = self._get_components_positions(keys,
1291
                    allow_missing=allow_missing)
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1292
                # key = component_id, r = record_details, i_m = index_memo,
1293
                # n = next
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1294
                records = [(key, i_m) for key, (r, i_m, n)
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1295
                                       in position_map.iteritems()]
4039.3.1 by John Arbash Meinel
Group records to read by pack file and sort by offset.
1296
                # Sort by the index memo, so that we request records from the
1297
                # same pack file together, and in forward-sorted order
1298
                records.sort(key=operator.itemgetter(1))
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1299
                raw_record_map = {}
1300
                for key, data in self._read_records_iter_unchecked(records):
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1301
                    (record_details, index_memo, next) = position_map[key]
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1302
                    raw_record_map[key] = data, record_details, next
1303
                return raw_record_map
3789.2.10 by John Arbash Meinel
The first function for KnitVersionedFiles can now retry on request.
1304
            except errors.RetryWithNewPacks, e:
1305
                self._access.reload_or_raise(e)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1306
4039.3.6 by John Arbash Meinel
Turn _split_by_prefix into a classmethod, and add direct tests.
1307
    @classmethod
1308
    def _split_by_prefix(cls, keys):
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1309
        """For the given keys, split them up based on their prefix.
1310
1311
        To keep memory pressure somewhat under control, split the
1312
        requests back into per-file-id requests, otherwise "bzr co"
1313
        extracts the full tree into memory before writing it to disk.
1314
        This should be revisited if _get_content_maps() can ever cross
1315
        file-id boundaries.
1316
4039.3.6 by John Arbash Meinel
Turn _split_by_prefix into a classmethod, and add direct tests.
1317
        The keys for a given file_id are kept in the same relative order.
1318
        Ordering between file_ids is not, though prefix_order will return the
1319
        order that the key was first seen.
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1320
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1321
        :param keys: An iterable of key tuples
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1322
        :return: (split_map, prefix_order)
1323
            split_map       A dictionary mapping prefix => keys
1324
            prefix_order    The order that we saw the various prefixes
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1325
        """
1326
        split_by_prefix = {}
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1327
        prefix_order = []
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1328
        for key in keys:
1329
            if len(key) == 1:
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1330
                prefix = ''
1331
            else:
1332
                prefix = key[0]
1333
1334
            if prefix in split_by_prefix:
1335
                split_by_prefix[prefix].append(key)
1336
            else:
1337
                split_by_prefix[prefix] = [key]
1338
                prefix_order.append(prefix)
1339
        return split_by_prefix, prefix_order
1340
4039.3.7 by John Arbash Meinel
Some direct tests for _group_keys_for_io
1341
    def _group_keys_for_io(self, keys, non_local_keys, positions,
1342
                           _min_buffer_size=_STREAM_MIN_BUFFER_SIZE):
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1343
        """For the given keys, group them into 'best-sized' requests.
1344
1345
        The idea is to avoid making 1 request per file, but to never try to
1346
        unpack an entire 1.5GB source tree in a single pass. Also when
1347
        possible, we should try to group requests to the same pack file
1348
        together.
1349
4039.3.7 by John Arbash Meinel
Some direct tests for _group_keys_for_io
1350
        :return: list of (keys, non_local) tuples that indicate what keys
1351
            should be fetched next.
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1352
        """
1353
        # TODO: Ideally we would group on 2 factors. We want to extract texts
1354
        #       from the same pack file together, and we want to extract all
1355
        #       the texts for a given build-chain together. Ultimately it
1356
        #       probably needs a better global view.
4039.3.3 by John Arbash Meinel
Add some debugging code.
1357
        total_keys = len(keys)
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1358
        prefix_split_keys, prefix_order = self._split_by_prefix(keys)
1359
        prefix_split_non_local_keys, _ = self._split_by_prefix(non_local_keys)
1360
        cur_keys = []
1361
        cur_non_local = set()
1362
        cur_size = 0
4039.3.3 by John Arbash Meinel
Add some debugging code.
1363
        result = []
1364
        sizes = []
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1365
        for prefix in prefix_order:
1366
            keys = prefix_split_keys[prefix]
1367
            non_local = prefix_split_non_local_keys.get(prefix, [])
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
1368
1369
            this_size = self._index._get_total_build_size(keys, positions)
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1370
            cur_size += this_size
1371
            cur_keys.extend(keys)
1372
            cur_non_local.update(non_local)
4039.3.7 by John Arbash Meinel
Some direct tests for _group_keys_for_io
1373
            if cur_size > _min_buffer_size:
4039.3.3 by John Arbash Meinel
Add some debugging code.
1374
                result.append((cur_keys, cur_non_local))
1375
                sizes.append(cur_size)
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1376
                cur_keys = []
4039.3.4 by John Arbash Meinel
Properly determine the total number of bytes needed for a given key.
1377
                cur_non_local = set()
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1378
                cur_size = 0
1379
        if cur_keys:
4039.3.3 by John Arbash Meinel
Add some debugging code.
1380
            result.append((cur_keys, cur_non_local))
1381
            sizes.append(cur_size)
1382
        return result
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1383
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1384
    def get_record_stream(self, keys, ordering, include_delta_closure):
1385
        """Get a stream of records for keys.
1386
1387
        :param keys: The keys to include.
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1388
        :param ordering: Either 'unordered' or 'topological'. A topologically
1389
            sorted stream has compression parents strictly before their
1390
            children.
1391
        :param include_delta_closure: If True then the closure across any
1392
            compression parents will be included (in the opaque data).
1393
        :return: An iterator of ContentFactory objects, each of which is only
1394
            valid until the iterator is advanced.
1395
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1396
        # keys might be a generator
1397
        keys = set(keys)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1398
        if not keys:
1399
            return
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1400
        if not self._index.has_graph:
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1401
            # Cannot sort when no graph has been stored.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1402
            ordering = 'unordered'
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1403
1404
        remaining_keys = keys
1405
        while True:
1406
            try:
1407
                keys = set(remaining_keys)
1408
                for content_factory in self._get_remaining_record_stream(keys,
1409
                                            ordering, include_delta_closure):
1410
                    remaining_keys.discard(content_factory.key)
1411
                    yield content_factory
1412
                return
1413
            except errors.RetryWithNewPacks, e:
3789.2.11 by John Arbash Meinel
KnitVersionedFile.get_record_stream now retries *and* fails correctly.
1414
                self._access.reload_or_raise(e)
3789.2.1 by John Arbash Meinel
_DirectPackAccess can now raise RetryWithNewPacks when we think something has happened.
1415
1416
    def _get_remaining_record_stream(self, keys, ordering,
1417
                                     include_delta_closure):
3789.2.4 by John Arbash Meinel
Add a multiple-record test, though it isn't quite what we want for the readv tests.
1418
        """This function is the 'retry' portion for get_record_stream."""
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1419
        if include_delta_closure:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1420
            positions = self._get_components_positions(keys, allow_missing=True)
3350.3.3 by Robert Collins
Functional get_record_stream interface tests covering full interface.
1421
        else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1422
            build_details = self._index.get_build_details(keys)
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1423
            # map from key to
1424
            # (record_details, access_memo, compression_parent_key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1425
            positions = dict((key, self._build_details_to_components(details))
1426
                for key, details in build_details.iteritems())
1427
        absent_keys = keys.difference(set(positions))
1428
        # There may be more absent keys : if we're missing the basis component
1429
        # and are trying to include the delta closure.
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1430
        # XXX: We should not ever need to examine remote sources because we do
1431
        # not permit deltas across versioned files boundaries.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1432
        if include_delta_closure:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1433
            needed_from_fallback = set()
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
1434
            # Build up reconstructable_keys dict.  key:True in this dict means
1435
            # the key can be reconstructed.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1436
            reconstructable_keys = {}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1437
            for key in keys:
1438
                # the delta chain
1439
                try:
1440
                    chain = [key, positions[key][2]]
1441
                except KeyError:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1442
                    needed_from_fallback.add(key)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1443
                    continue
1444
                result = True
1445
                while chain[-1] is not None:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1446
                    if chain[-1] in reconstructable_keys:
1447
                        result = reconstructable_keys[chain[-1]]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1448
                        break
1449
                    else:
1450
                        try:
1451
                            chain.append(positions[chain[-1]][2])
1452
                        except KeyError:
1453
                            # missing basis component
3350.8.10 by Robert Collins
Stacked insert_record_stream.
1454
                            needed_from_fallback.add(chain[-1])
1455
                            result = True
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1456
                            break
1457
                for chain_key in chain[:-1]:
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1458
                    reconstructable_keys[chain_key] = result
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1459
                if not result:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1460
                    needed_from_fallback.add(key)
1461
        # Double index lookups here : need a unified api ?
3350.8.14 by Robert Collins
Review feedback.
1462
        global_map, parent_maps = self._get_parent_map_with_sources(keys)
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1463
        if ordering in ('topological', 'groupcompress'):
1464
            if ordering == 'topological':
1465
                # Global topological sort
1466
                present_keys = tsort.topo_sort(global_map)
1467
            else:
1468
                present_keys = sort_groupcompress(global_map)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1469
            # Now group by source:
1470
            source_keys = []
1471
            current_source = None
1472
            for key in present_keys:
1473
                for parent_map in parent_maps:
1474
                    if key in parent_map:
1475
                        key_source = parent_map
1476
                        break
1477
                if current_source is not key_source:
1478
                    source_keys.append((key_source, []))
1479
                    current_source = key_source
1480
                source_keys[-1][1].append(key)
1481
        else:
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1482
            if ordering != 'unordered':
1483
                raise AssertionError('valid values for ordering are:'
4111.1.1 by Robert Collins
Add a groupcompress sort order.
1484
                    ' "unordered", "groupcompress" or "topological" not: %r'
3606.7.7 by John Arbash Meinel
Add tests for the fetching behavior.
1485
                    % (ordering,))
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1486
            # Just group by source; remote sources first.
1487
            present_keys = []
1488
            source_keys = []
1489
            for parent_map in reversed(parent_maps):
1490
                source_keys.append((parent_map, []))
1491
                for key in parent_map:
1492
                    present_keys.append(key)
1493
                    source_keys[-1][1].append(key)
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1494
            # We have been requested to return these records in an order that
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
1495
            # suits us. So we ask the index to give us an optimally sorted
1496
            # order.
3878.1.1 by John Arbash Meinel
KVF.get_record_stream('unordered') now returns the records based on I/O ordering.
1497
            for source, sub_keys in source_keys:
1498
                if source is parent_maps[0]:
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
1499
                    # Only sort the keys for this VF
1500
                    self._index._sort_keys_by_io(sub_keys, positions)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1501
        absent_keys = keys - set(global_map)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1502
        for key in absent_keys:
1503
            yield AbsentContentFactory(key)
1504
        # restrict our view to the keys we can answer.
1505
        # XXX: Memory: TODO: batch data here to cap buffered data at (say) 1MB.
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1506
        # XXX: At that point we need to consider the impact of double reads by
1507
        # utilising components multiple times.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1508
        if include_delta_closure:
1509
            # XXX: get_content_maps performs its own index queries; allow state
1510
            # to be passed in.
3763.4.1 by John Arbash Meinel
Possible fix for bug #269456.
1511
            non_local_keys = needed_from_fallback - absent_keys
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
1512
            for keys, non_local_keys in self._group_keys_for_io(present_keys,
1513
                                                                non_local_keys,
1514
                                                                positions):
1515
                generator = _VFContentMapGenerator(self, keys, non_local_keys,
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
1516
                                                   global_map,
1517
                                                   ordering=ordering)
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1518
                for record in generator.get_record_stream():
1519
                    yield record
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1520
        else:
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1521
            for source, keys in source_keys:
1522
                if source is parent_maps[0]:
1523
                    # this KnitVersionedFiles
1524
                    records = [(key, positions[key][1]) for key in keys]
4082.1.1 by Andrew Bennetts
Use _read_records_iter_unchecked in _get_remaining_record_stream.
1525
                    for key, raw_data in self._read_records_iter_unchecked(records):
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1526
                        (record_details, index_memo, _) = positions[key]
1527
                        yield KnitContentFactory(key, global_map[key],
4082.1.1 by Andrew Bennetts
Use _read_records_iter_unchecked in _get_remaining_record_stream.
1528
                            record_details, None, raw_data, self._factory.annotated, None)
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1529
                else:
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1530
                    vf = self._immediate_fallback_vfs[parent_maps.index(source) - 1]
3350.8.6 by Robert Collins
get_record_stream stacking for delta access.
1531
                    for record in vf.get_record_stream(keys, ordering,
1532
                        include_delta_closure):
1533
                        yield record
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1534
1535
    def get_sha1s(self, keys):
1536
        """See VersionedFiles.get_sha1s()."""
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1537
        missing = set(keys)
1538
        record_map = self._get_record_map(missing, allow_missing=True)
1539
        result = {}
1540
        for key, details in record_map.iteritems():
1541
            if key not in missing:
1542
                continue
1543
            # record entry 2 is the 'digest'.
1544
            result[key] = details[2]
1545
        missing.difference_update(set(result))
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1546
        for source in self._immediate_fallback_vfs:
3350.8.3 by Robert Collins
VF.get_sha1s needed changing to be stackable.
1547
            if not missing:
1548
                break
1549
            new_result = source.get_sha1s(missing)
1550
            result.update(new_result)
1551
            missing.difference_update(set(new_result))
1552
        return result
3052.2.2 by Robert Collins
* Operations pulling data from a smart server where the underlying
1553
5195.3.27 by Parth Malwankar
code cleanup and comments.
1554
    def insert_record_stream(self, stream):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1555
        """Insert a record stream into this container.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1556
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1557
        :param stream: A stream of records to insert.
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1558
        :return: None
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1559
        :seealso VersionedFiles.get_record_stream:
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1560
        """
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1561
        def get_adapter(adapter_key):
1562
            try:
1563
                return adapters[adapter_key]
1564
            except KeyError:
1565
                adapter_factory = adapter_registry.get(adapter_key)
1566
                adapter = adapter_factory(self)
1567
                adapters[adapter_key] = adapter
1568
                return adapter
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1569
        delta_types = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1570
        if self._factory.annotated:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1571
            # self is annotated, we need annotated knits to use directly.
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1572
            annotated = "annotated-"
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1573
            convertibles = []
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1574
        else:
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1575
            # self is not annotated, but we can strip annotations cheaply.
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1576
            annotated = ""
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1577
            convertibles = set(["knit-annotated-ft-gz"])
1578
            if self._max_delta_chain:
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1579
                delta_types.add("knit-annotated-delta-gz")
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1580
                convertibles.add("knit-annotated-delta-gz")
3350.3.22 by Robert Collins
Review feedback.
1581
        # The set of types we can cheaply adapt without needing basis texts.
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1582
        native_types = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1583
        if self._max_delta_chain:
1584
            native_types.add("knit-%sdelta-gz" % annotated)
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1585
            delta_types.add("knit-%sdelta-gz" % annotated)
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1586
        native_types.add("knit-%sft-gz" % annotated)
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1587
        knit_types = native_types.union(convertibles)
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1588
        adapters = {}
3350.3.22 by Robert Collins
Review feedback.
1589
        # Buffer all index entries that we can't add immediately because their
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1590
        # basis parent is missing. We don't buffer all because generating
1591
        # annotations may require access to some of the new records. However we
1592
        # can't generate annotations from new deltas until their basis parent
1593
        # is present anyway, so we get away with not needing an index that
3350.3.22 by Robert Collins
Review feedback.
1594
        # includes the new keys.
3830.3.15 by Martin Pool
Check against all parents when deciding whether to store a fulltext in a stacked repository
1595
        #
1596
        # See <http://launchpad.net/bugs/300177> about ordering of compression
1597
        # parents in the records - to be conservative, we insist that all
1598
        # parents must be present to avoid expanding to a fulltext.
1599
        #
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1600
        # key = basis_parent, value = index entry to add
4009.3.7 by Andrew Bennetts
Most tests passing.
1601
        buffered_index_entries = {}
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1602
        for record in stream:
4082.1.3 by Andrew Bennetts
Add knit header paranoia to insert_record_stream to replace the paranoia removed from get_record_stream.
1603
            kind = record.storage_kind
1604
            if kind.startswith('knit-') and kind.endswith('-gz'):
1605
                # Check that the ID in the header of the raw knit bytes matches
1606
                # the record metadata.
1607
                raw_data = record._raw_record
1608
                df, rec = self._parse_record_header(record.key, raw_data)
1609
                df.close()
4052.1.2 by Robert Collins
Review feedback - fix flushing buffered records in knit's insert_record_stream.
1610
            buffered = False
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1611
            parents = record.parents
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1612
            if record.storage_kind in delta_types:
1613
                # TODO: eventually the record itself should track
1614
                #       compression_parent
1615
                compression_parent = parents[0]
1616
            else:
1617
                compression_parent = None
3350.3.15 by Robert Collins
Update the insert_record_stream contract to error if an absent record is provided.
1618
            # Raise an error when a record is missing.
1619
            if record.storage_kind == 'absent':
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1620
                raise RevisionNotPresent([record.key], self)
3830.3.15 by Martin Pool
Check against all parents when deciding whether to store a fulltext in a stacked repository
1621
            elif ((record.storage_kind in knit_types)
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1622
                  and (compression_parent is None
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1623
                       or not self._immediate_fallback_vfs
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1624
                       or self._index.has_key(compression_parent)
1625
                       or not self.has_key(compression_parent))):
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
1626
                # we can insert the knit record literally if either it has no
1627
                # compression parent OR we already have its basis in this kvf
1628
                # OR the basis is not present even in the fallbacks.  In the
1629
                # last case it will either turn up later in the stream and all
1630
                # will be well, or it won't turn up at all and we'll raise an
1631
                # error at the end.
3830.3.13 by Martin Pool
review cleanups to insert_record_stream
1632
                #
1633
                # TODO: self.has_key is somewhat redundant with
1634
                # self._index.has_key; we really want something that directly
1635
                # asks if it's only present in the fallbacks. -- mbp 20081119
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1636
                if record.storage_kind not in native_types:
1637
                    try:
1638
                        adapter_key = (record.storage_kind, "knit-delta-gz")
1639
                        adapter = get_adapter(adapter_key)
1640
                    except KeyError:
1641
                        adapter_key = (record.storage_kind, "knit-ft-gz")
1642
                        adapter = get_adapter(adapter_key)
4005.3.1 by Robert Collins
Change the signature on VersionedFiles adapters to allow less typing and more flexability inside adapters.
1643
                    bytes = adapter.get_bytes(record)
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1644
                else:
4005.3.2 by Robert Collins
First passing NetworkRecordStream test - a fulltext from any record type which isn't a chunked or fulltext can be serialised and deserialised successfully.
1645
                    # It's a knit record, it has a _raw_record field (even if
1646
                    # it was reconstituted from a network stream).
1647
                    bytes = record._raw_record
3350.3.9 by Robert Collins
Avoid full text reconstruction when transferring knit to knit via record streams.
1648
                options = [record._build_details[0]]
1649
                if record._build_details[1]:
1650
                    options.append('no-eol')
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1651
                # Just blat it across.
1652
                # Note: This does end up adding data on duplicate keys. As
1653
                # modern repositories use atomic insertions this should not
1654
                # lead to excessive growth in the event of interrupted fetches.
1655
                # 'knit' repositories may suffer excessive growth, but as a
1656
                # deprecated format this is tolerable. It can be fixed if
1657
                # needed by in the kndx index support raising on a duplicate
1658
                # add with identical parents and options.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1659
                access_memo = self._access.add_raw_records(
1660
                    [(record.key, len(bytes))], bytes)[0]
1661
                index_entry = (record.key, options, access_memo, parents)
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1662
                if 'fulltext' not in options:
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1663
                    # Not a fulltext, so we need to make sure the compression
1664
                    # parent will also be present.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1665
                    # Note that pack backed knits don't need to buffer here
1666
                    # because they buffer all writes to the transaction level,
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1667
                    # but we don't expose that difference at the index level. If
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1668
                    # the query here has sufficient cost to show up in
1669
                    # profiling we should do that.
3830.3.24 by John Arbash Meinel
We don't require all parents to be present, just the compression parent.
1670
                    #
3830.3.7 by Martin Pool
KnitVersionedFiles.insert_record_stream checks that compression parents are in the same kvf, not in a fallback
1671
                    # They're required to be physically in this
1672
                    # KnitVersionedFiles, not in a fallback.
3871.4.3 by John Arbash Meinel
We should only care if the compression parent is not available, not if all parents are available.
1673
                    if not self._index.has_key(compression_parent):
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1674
                        pending = buffered_index_entries.setdefault(
1675
                            compression_parent, [])
1676
                        pending.append(index_entry)
4009.3.9 by Andrew Bennetts
Remove some XXXs.
1677
                        buffered = True
1678
                if not buffered:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1679
                    self._index.add_records([index_entry])
3890.2.9 by John Arbash Meinel
Start using osutils.chunks_as_lines rather than osutils.split_lines.
1680
            elif record.storage_kind == 'chunked':
1681
                self.add_lines(record.key, parents,
1682
                    osutils.chunks_to_lines(record.get_bytes_as('chunked')))
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1683
            else:
4005.3.8 by Robert Collins
Handle record streams where a fulltext is obtainable from a record but not the storage_kind.
1684
                # Not suitable for direct insertion as a
3849.3.2 by Andrew Bennetts
Expand a comment inside insert_record_stream slightly.
1685
                # delta, either because it's not the right format, or this
1686
                # KnitVersionedFiles doesn't permit deltas (_max_delta_chain ==
1687
                # 0) or because it depends on a base only present in the
1688
                # fallback kvfs.
4187.3.6 by Andrew Bennetts
Move the flush in KnitVersionedFiles.insert_record_stream so that it covers the add_lines call of the fallback case, not just the adapter.get_bytes.
1689
                self._access.flush()
4005.3.8 by Robert Collins
Handle record streams where a fulltext is obtainable from a record but not the storage_kind.
1690
                try:
1691
                    # Try getting a fulltext directly from the record.
1692
                    bytes = record.get_bytes_as('fulltext')
1693
                except errors.UnavailableRepresentation:
1694
                    adapter_key = record.storage_kind, 'fulltext'
1695
                    adapter = get_adapter(adapter_key)
1696
                    bytes = adapter.get_bytes(record)
1697
                lines = split_lines(bytes)
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1698
                try:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1699
                    self.add_lines(record.key, parents, lines)
3350.3.11 by Robert Collins
Test inserting a stream that overlaps the current content of a knit does not error.
1700
                except errors.RevisionAlreadyPresent:
1701
                    pass
3350.3.17 by Robert Collins
Prevent corrupt knits being created when a stream is interrupted with basis parents not present.
1702
            # Add any records whose basis parent is now available.
4052.1.2 by Robert Collins
Review feedback - fix flushing buffered records in knit's insert_record_stream.
1703
            if not buffered:
1704
                added_keys = [record.key]
1705
                while added_keys:
1706
                    key = added_keys.pop(0)
1707
                    if key in buffered_index_entries:
1708
                        index_entries = buffered_index_entries[key]
1709
                        self._index.add_records(index_entries)
1710
                        added_keys.extend(
1711
                            [index_entry[0] for index_entry in index_entries])
1712
                        del buffered_index_entries[key]
4009.3.8 by Andrew Bennetts
Fix test failure.
1713
        if buffered_index_entries:
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1714
            # There were index entries buffered at the end of the stream,
1715
            # So these need to be added (if the index supports holding such
1716
            # entries for later insertion)
4634.84.1 by Andrew Bennetts
Pass all buffered_index_entries together so that records that are buffered because their parent is buffered are not mistaken as having a missing parent.
1717
            all_entries = []
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1718
            for key in buffered_index_entries:
1719
                index_entries = buffered_index_entries[key]
4634.84.1 by Andrew Bennetts
Pass all buffered_index_entries together so that records that are buffered because their parent is buffered are not mistaken as having a missing parent.
1720
                all_entries.extend(index_entries)
4634.84.2 by Andrew Bennetts
Add test.
1721
            self._index.add_records(
1722
                all_entries, missing_compression_parents=True)
4009.3.2 by Andrew Bennetts
Add test_insert_record_stream_delta_missing_basis_can_be_added_later.
1723
1724
    def get_missing_compression_parent_keys(self):
4009.3.3 by Andrew Bennetts
Add docstrings.
1725
        """Return an iterable of keys of missing compression parents.
1726
1727
        Check this after calling insert_record_stream to find out if there are
1728
        any missing compression parents.  If there are, the records that
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
1729
        depend on them are not able to be inserted safely. For atomic
1730
        KnitVersionedFiles built on packs, the transaction should be aborted or
1731
        suspended - commit will fail at this point. Nonatomic knits will error
1732
        earlier because they have no staging area to put pending entries into.
4009.3.3 by Andrew Bennetts
Add docstrings.
1733
        """
4009.3.7 by Andrew Bennetts
Most tests passing.
1734
        return self._index.get_missing_compression_parents()
3350.3.8 by Robert Collins
Basic stream insertion, no fast path yet for knit to knit.
1735
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1736
    def iter_lines_added_or_present_in_keys(self, keys, pb=None):
1737
        """Iterate over the lines in the versioned files from keys.
1738
1739
        This may return lines from other keys. Each item the returned
1740
        iterator yields is a tuple of a line and a text version that that line
1741
        is present in (not introduced in).
1742
1743
        Ordering of results is in whatever order is most suitable for the
1744
        underlying storage format.
1745
1746
        If a progress bar is supplied, it may be used to indicate progress.
1747
        The caller is responsible for cleaning up progress bars (because this
1748
        is an iterator).
1749
1750
        NOTES:
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1751
         * Lines are normalised by the underlying store: they will all have \\n
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1752
           terminators.
1753
         * Lines are returned in arbitrary order.
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1754
         * If a requested key did not change any lines (or didn't have any
1755
           lines), it may not be mentioned at all in the result.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1756
4110.2.10 by Martin Pool
Tweak iter_lines progress messages
1757
        :param pb: Progress bar supplied by caller.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1758
        :return: An iterator over (line, key).
1759
        """
1760
        if pb is None:
4961.2.2 by Martin Pool
Change some dummy progress bars to be real tasks
1761
            pb = ui.ui_factory.nested_progress_bar()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1762
        keys = set(keys)
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1763
        total = len(keys)
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1764
        done = False
1765
        while not done:
1766
            try:
1767
                # we don't care about inclusions, the caller cares.
1768
                # but we need to setup a list of records to visit.
1769
                # we need key, position, length
1770
                key_records = []
1771
                build_details = self._index.get_build_details(keys)
1772
                for key, details in build_details.iteritems():
1773
                    if key in keys:
1774
                        key_records.append((key, details[0]))
1775
                records_iter = enumerate(self._read_records_iter(key_records))
1776
                for (key_idx, (key, data, sha_value)) in records_iter:
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
1777
                    pb.update('Walking content', key_idx, total)
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1778
                    compression_parent = build_details[key][1]
1779
                    if compression_parent is None:
1780
                        # fulltext
1781
                        line_iterator = self._factory.get_fulltext_content(data)
1782
                    else:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1783
                        # Delta
3789.2.12 by John Arbash Meinel
iter_lines_added_or_present now retries.
1784
                        line_iterator = self._factory.get_linedelta_content(data)
1785
                    # Now that we are yielding the data for this key, remove it
1786
                    # from the list
1787
                    keys.remove(key)
1788
                    # XXX: It might be more efficient to yield (key,
1789
                    # line_iterator) in the future. However for now, this is a
1790
                    # simpler change to integrate into the rest of the
1791
                    # codebase. RBC 20071110
1792
                    for line in line_iterator:
1793
                        yield line, key
1794
                done = True
1795
            except errors.RetryWithNewPacks, e:
1796
                self._access.reload_or_raise(e)
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1797
        # If there are still keys we've not yet found, we look in the fallback
1798
        # vfs, and hope to find them there.  Note that if the keys are found
1799
        # but had no changes or no content, the fallback may not return
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1800
        # anything.
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1801
        if keys and not self._immediate_fallback_vfs:
3830.3.17 by Martin Pool
Don't assume versions being unmentioned by iter_lines_added_or_changed implies the versions aren't present
1802
            # XXX: strictly the second parameter is meant to be the file id
1803
            # but it's not easily accessible here.
1804
            raise RevisionNotPresent(keys, repr(self))
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
1805
        for source in self._immediate_fallback_vfs:
3350.8.5 by Robert Collins
Iter_lines_added_or_present_in_keys stacks.
1806
            if not keys:
1807
                break
1808
            source_keys = set()
1809
            for line, key in source.iter_lines_added_or_present_in_keys(keys):
1810
                source_keys.add(key)
1811
                yield line, key
1812
            keys.difference_update(source_keys)
4103.3.2 by Martin Pool
Remove trailing punctuation from progress messages
1813
        pb.update('Walking content', total, total)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1814
1815
    def _make_line_delta(self, delta_seq, new_content):
1816
        """Generate a line delta from delta_seq and new_content."""
1817
        diff_hunks = []
1818
        for op in delta_seq.get_opcodes():
1819
            if op[0] == 'equal':
1820
                continue
1821
            diff_hunks.append((op[1], op[2], op[4]-op[3], new_content._lines[op[3]:op[4]]))
1822
        return diff_hunks
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
1823
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1824
    def _merge_annotations(self, content, parents, parent_texts={},
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1825
                           delta=None, annotated=None,
1826
                           left_matching_blocks=None):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1827
        """Merge annotations for content and generate deltas.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1828
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1829
        This is done by comparing the annotations based on changes to the text
1830
        and generating a delta on the resulting full texts. If annotations are
1831
        not being created then a simple delta is created.
1596.2.27 by Robert Collins
Note potential improvements in knit adds.
1832
        """
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1833
        if left_matching_blocks is not None:
1834
            delta_seq = diff._PrematchedMatcher(left_matching_blocks)
1835
        else:
1836
            delta_seq = None
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1837
        if annotated:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1838
            for parent_key in parents:
1839
                merge_content = self._get_content(parent_key, parent_texts)
1840
                if (parent_key == parents[0] and delta_seq is not None):
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1841
                    seq = delta_seq
2520.4.140 by Aaron Bentley
Use matching blocks from mpdiff for knit delta creation
1842
                else:
1843
                    seq = patiencediff.PatienceSequenceMatcher(
1844
                        None, merge_content.text(), content.text())
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1845
                for i, j, n in seq.get_matching_blocks():
1846
                    if n == 0:
1847
                        continue
3460.2.1 by Robert Collins
* Inserting a bundle which changes the contents of a file with no trailing
1848
                    # this copies (origin, text) pairs across to the new
1849
                    # content for any line that matches the last-checked
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1850
                    # parent.
1596.2.34 by Robert Collins
Optimise knit add to only diff once per parent, not once per parent + once for the delta generation.
1851
                    content._lines[j:j+n] = merge_content._lines[i:i+n]
3350.6.10 by Martin Pool
VersionedFiles review cleanups
1852
            # XXX: Robert says the following block is a workaround for a
1853
            # now-fixed bug and it can probably be deleted. -- mbp 20080618
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1854
            if content._lines and content._lines[-1][1][-1] != '\n':
1855
                # The copied annotation was from a line without a trailing EOL,
1856
                # reinstate one for the content object, to ensure correct
1857
                # serialization.
1858
                line = content._lines[-1][1] + '\n'
1859
                content._lines[-1] = (content._lines[-1][0], line)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1860
        if delta:
2520.4.146 by Aaron Bentley
Avoid get_matching_blocks for un-annotated text
1861
            if delta_seq is None:
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1862
                reference_content = self._get_content(parents[0], parent_texts)
1863
                new_texts = content.text()
1864
                old_texts = reference_content.text()
2104.4.2 by John Arbash Meinel
Small cleanup and NEWS entry about fixing bug #65714
1865
                delta_seq = patiencediff.PatienceSequenceMatcher(
2100.2.1 by wang
Replace python's difflib by patiencediff because the worst case
1866
                                                 None, old_texts, new_texts)
1596.2.36 by Robert Collins
add a get_delta api to versioned_file.
1867
            return self._make_line_delta(delta_seq, content)
1868
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1869
    def _parse_record(self, version_id, data):
1870
        """Parse an original format knit record.
1871
1872
        These have the last element of the key only present in the stored data.
1873
        """
1874
        rec, record_contents = self._parse_record_unchecked(data)
1875
        self._check_header_version(rec, version_id)
1876
        return record_contents, rec[3]
1877
1878
    def _parse_record_header(self, key, raw_data):
1879
        """Parse a record header for consistency.
1880
1881
        :return: the header and the decompressor stream.
1882
                 as (stream, header_record)
1883
        """
5590.1.5 by John Arbash Meinel
Don't use tuned_gzip.GzipFile in knit.py
1884
        df = gzip.GzipFile(mode='rb', fileobj=StringIO(raw_data))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1885
        try:
1886
            # Current serialise
1887
            rec = self._check_header(key, df.readline())
1888
        except Exception, e:
1889
            raise KnitCorrupt(self,
1890
                              "While reading {%s} got %s(%s)"
1891
                              % (key, e.__class__.__name__, str(e)))
1892
        return df, rec
1893
1894
    def _parse_record_unchecked(self, data):
1895
        # profiling notes:
1896
        # 4168 calls in 2880 217 internal
1897
        # 4168 calls to _parse_record_header in 2121
1898
        # 4168 calls to readlines in 330
5590.1.5 by John Arbash Meinel
Don't use tuned_gzip.GzipFile in knit.py
1899
        df = gzip.GzipFile(mode='rb', fileobj=StringIO(data))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1900
        try:
1901
            record_contents = df.readlines()
1902
        except Exception, e:
1903
            raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
1904
                (data, e.__class__.__name__, str(e)))
1905
        header = record_contents.pop(0)
1906
        rec = self._split_header(header)
1907
        last_line = record_contents.pop()
1908
        if len(record_contents) != int(rec[2]):
1909
            raise KnitCorrupt(self,
1910
                              'incorrect number of lines %s != %s'
1911
                              ' for version {%s} %s'
1912
                              % (len(record_contents), int(rec[2]),
1913
                                 rec[1], record_contents))
1914
        if last_line != 'end %s\n' % rec[1]:
1915
            raise KnitCorrupt(self,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1916
                              'unexpected version end line %r, wanted %r'
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1917
                              % (last_line, rec[1]))
1918
        df.close()
1919
        return rec, record_contents
1920
1921
    def _read_records_iter(self, records):
1922
        """Read text records from data file and yield result.
1923
1924
        The result will be returned in whatever is the fastest to read.
1925
        Not by the order requested. Also, multiple requests for the same
1926
        record will only yield 1 response.
1927
        :param records: A list of (key, access_memo) entries
1928
        :return: Yields (key, contents, digest) in the order
1929
                 read, not the order requested
1930
        """
1931
        if not records:
1932
            return
1933
1934
        # XXX: This smells wrong, IO may not be getting ordered right.
1935
        needed_records = sorted(set(records), key=operator.itemgetter(1))
1936
        if not needed_records:
1937
            return
1938
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1939
        # The transport optimizes the fetching as well
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1940
        # (ie, reads continuous ranges.)
1941
        raw_data = self._access.get_raw_records(
1942
            [index_memo for key, index_memo in needed_records])
1943
1944
        for (key, index_memo), data in \
1945
                izip(iter(needed_records), raw_data):
1946
            content, digest = self._parse_record(key[-1], data)
1947
            yield key, content, digest
1948
1949
    def _read_records_iter_raw(self, records):
1950
        """Read text records from data file and yield raw data.
1951
1952
        This unpacks enough of the text record to validate the id is
1953
        as expected but thats all.
1954
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1955
        Each item the iterator yields is (key, bytes,
1956
            expected_sha1_of_full_text).
1957
        """
1958
        for key, data in self._read_records_iter_unchecked(records):
1959
            # validate the header (note that we can only use the suffix in
1960
            # current knit records).
1961
            df, rec = self._parse_record_header(key, data)
1962
            df.close()
1963
            yield key, data, rec[3]
1964
1965
    def _read_records_iter_unchecked(self, records):
1966
        """Read text records from data file and yield raw data.
1967
1968
        No validation is done.
1969
1970
        Yields tuples of (key, data).
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1971
        """
1972
        # setup an iterator of the external records:
1973
        # uses readv so nice and fast we hope.
1974
        if len(records):
1975
            # grab the disk data needed.
1976
            needed_offsets = [index_memo for key, index_memo
1977
                                           in records]
1978
            raw_records = self._access.get_raw_records(needed_offsets)
1979
1980
        for key, index_memo in records:
1981
            data = raw_records.next()
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
1982
            yield key, data
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1983
1984
    def _record_to_data(self, key, digest, lines, dense_lines=None):
1985
        """Convert key, digest, lines into a raw data block.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1986
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
1987
        :param key: The key of the record. Currently keys are always serialised
1988
            using just the trailing component.
1989
        :param dense_lines: The bytes of lines but in a denser form. For
1990
            instance, if lines is a list of 1000 bytestrings each ending in \n,
1991
            dense_lines may be a list with one line in it, containing all the
1992
            1000's lines and their \n's. Using dense_lines if it is already
1993
            known is a win because the string join to create bytes in this
1994
            function spends less time resizing the final string.
1995
        :return: (len, a StringIO instance with the raw data ready to read.)
1996
        """
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
1997
        chunks = ["version %s %d %s\n" % (key[-1], len(lines), digest)]
1998
        chunks.extend(dense_lines or lines)
1999
        chunks.append("end %s\n" % key[-1])
2000
        for chunk in chunks:
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
2001
            if type(chunk) is not str:
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
2002
                raise AssertionError(
2003
                    'data must be plain bytes was %s' % type(chunk))
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2004
        if lines and lines[-1][-1] != '\n':
2005
            raise ValueError('corrupt lines value %r' % lines)
4398.8.3 by John Arbash Meinel
Rewrite some of the internals of KnitVersionedFiles._add()
2006
        compressed_bytes = tuned_gzip.chunks_to_gzip(chunks)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2007
        return len(compressed_bytes), compressed_bytes
2008
2009
    def _split_header(self, line):
2010
        rec = line.split()
2011
        if len(rec) != 4:
2012
            raise KnitCorrupt(self,
2013
                              'unexpected number of elements in record header')
2014
        return rec
2015
2016
    def keys(self):
2017
        """See VersionedFiles.keys."""
2018
        if 'evil' in debug.debug_flags:
2019
            trace.mutter_callsite(2, "keys scales with size of history")
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
2020
        sources = [self._index] + self._immediate_fallback_vfs
3350.8.4 by Robert Collins
Vf.keys() stacking support.
2021
        result = set()
2022
        for source in sources:
2023
            result.update(source.keys())
2024
        return result
2025
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2026
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2027
class _ContentMapGenerator(object):
2028
    """Generate texts or expose raw deltas for a set of texts."""
2029
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2030
    def __init__(self, ordering='unordered'):
2031
        self._ordering = ordering
2032
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2033
    def _get_content(self, key):
2034
        """Get the content object for key."""
4005.3.7 by Robert Collins
Review feedback.
2035
        # Note that _get_content is only called when the _ContentMapGenerator
2036
        # has been constructed with just one key requested for reconstruction.
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2037
        if key in self.nonlocal_keys:
2038
            record = self.get_record_stream().next()
2039
            # Create a content object on the fly
2040
            lines = osutils.chunks_to_lines(record.get_bytes_as('chunked'))
2041
            return PlainKnitContent(lines, record.key)
2042
        else:
2043
            # local keys we can ask for directly
2044
            return self._get_one_work(key)
2045
2046
    def get_record_stream(self):
2047
        """Get a record stream for the keys requested during __init__."""
2048
        for record in self._work():
2049
            yield record
2050
2051
    def _work(self):
2052
        """Produce maps of text and KnitContents as dicts.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2053
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2054
        :return: (text_map, content_map) where text_map contains the texts for
2055
            the requested versions and content_map contains the KnitContents.
2056
        """
2057
        # NB: By definition we never need to read remote sources unless texts
2058
        # are requested from them: we don't delta across stores - and we
2059
        # explicitly do not want to to prevent data loss situations.
2060
        if self.global_map is None:
2061
            self.global_map = self.vf.get_parent_map(self.keys)
2062
        nonlocal_keys = self.nonlocal_keys
2063
2064
        missing_keys = set(nonlocal_keys)
2065
        # Read from remote versioned file instances and provide to our caller.
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
2066
        for source in self.vf._immediate_fallback_vfs:
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2067
            if not missing_keys:
2068
                break
2069
            # Loop over fallback repositories asking them for texts - ignore
2070
            # any missing from a particular fallback.
2071
            for record in source.get_record_stream(missing_keys,
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2072
                self._ordering, True):
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2073
                if record.storage_kind == 'absent':
2074
                    # Not in thie particular stream, may be in one of the
2075
                    # other fallback vfs objects.
2076
                    continue
2077
                missing_keys.remove(record.key)
2078
                yield record
2079
4454.2.1 by John Arbash Meinel
Don't populate self._raw_record_map in _work, it was done in __init__
2080
        if self._raw_record_map is None:
2081
            raise AssertionError('_raw_record_map should have been filled')
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2082
        first = True
2083
        for key in self.keys:
2084
            if key in self.nonlocal_keys:
2085
                continue
2086
            yield LazyKnitContentFactory(key, self.global_map[key], self, first)
2087
            first = False
2088
2089
    def _get_one_work(self, requested_key):
2090
        # Now, if we have calculated everything already, just return the
2091
        # desired text.
2092
        if requested_key in self._contents_map:
2093
            return self._contents_map[requested_key]
4005.3.7 by Robert Collins
Review feedback.
2094
        # To simplify things, parse everything at once - code that wants one text
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2095
        # probably wants them all.
2096
        # FUTURE: This function could be improved for the 'extract many' case
2097
        # by tracking each component and only doing the copy when the number of
2098
        # children than need to apply delta's to it is > 1 or it is part of the
2099
        # final output.
2100
        multiple_versions = len(self.keys) != 1
2101
        if self._record_map is None:
2102
            self._record_map = self.vf._raw_map_to_record_map(
2103
                self._raw_record_map)
2104
        record_map = self._record_map
2105
        # raw_record_map is key:
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2106
        # Have read and parsed records at this point.
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2107
        for key in self.keys:
2108
            if key in self.nonlocal_keys:
2109
                # already handled
2110
                continue
2111
            components = []
2112
            cursor = key
2113
            while cursor is not None:
2114
                try:
2115
                    record, record_details, digest, next = record_map[cursor]
2116
                except KeyError:
2117
                    raise RevisionNotPresent(cursor, self)
2118
                components.append((cursor, record, record_details, digest))
2119
                cursor = next
2120
                if cursor in self._contents_map:
2121
                    # no need to plan further back
2122
                    components.append((cursor, None, None, None))
2123
                    break
2124
2125
            content = None
2126
            for (component_id, record, record_details,
2127
                 digest) in reversed(components):
2128
                if component_id in self._contents_map:
2129
                    content = self._contents_map[component_id]
2130
                else:
2131
                    content, delta = self._factory.parse_record(key[-1],
2132
                        record, record_details, content,
2133
                        copy_base_content=multiple_versions)
2134
                    if multiple_versions:
2135
                        self._contents_map[component_id] = content
2136
2137
            # digest here is the digest from the last applied component.
2138
            text = content.text()
2139
            actual_sha = sha_strings(text)
2140
            if actual_sha != digest:
2141
                raise SHA1KnitCorrupt(self, actual_sha, digest, key, text)
2142
        if multiple_versions:
2143
            return self._contents_map[requested_key]
2144
        else:
2145
            return content
2146
2147
    def _wire_bytes(self):
2148
        """Get the bytes to put on the wire for 'key'.
2149
2150
        The first collection of bytes asked for returns the serialised
2151
        raw_record_map and the additional details (key, parent) for key.
2152
        Subsequent calls return just the additional details (key, parent).
2153
        The wire storage_kind given for the first key is 'knit-delta-closure',
2154
        For subsequent keys it is 'knit-delta-closure-ref'.
2155
2156
        :param key: A key from the content generator.
2157
        :return: Bytes to put on the wire.
2158
        """
2159
        lines = []
2160
        # kind marker for dispatch on the far side,
2161
        lines.append('knit-delta-closure')
2162
        # Annotated or not
2163
        if self.vf._factory.annotated:
2164
            lines.append('annotated')
2165
        else:
2166
            lines.append('')
2167
        # then the list of keys
2168
        lines.append('\t'.join(['\x00'.join(key) for key in self.keys
2169
            if key not in self.nonlocal_keys]))
2170
        # then the _raw_record_map in serialised form:
2171
        map_byte_list = []
2172
        # for each item in the map:
2173
        # 1 line with key
2174
        # 1 line with parents if the key is to be yielded (None: for None, '' for ())
2175
        # one line with method
2176
        # one line with noeol
2177
        # one line with next ('' for None)
2178
        # one line with byte count of the record bytes
2179
        # the record bytes
2180
        for key, (record_bytes, (method, noeol), next) in \
2181
            self._raw_record_map.iteritems():
2182
            key_bytes = '\x00'.join(key)
2183
            parents = self.global_map.get(key, None)
2184
            if parents is None:
2185
                parent_bytes = 'None:'
2186
            else:
2187
                parent_bytes = '\t'.join('\x00'.join(key) for key in parents)
2188
            method_bytes = method
2189
            if noeol:
2190
                noeol_bytes = "T"
2191
            else:
2192
                noeol_bytes = "F"
2193
            if next:
2194
                next_bytes = '\x00'.join(next)
2195
            else:
2196
                next_bytes = ''
2197
            map_byte_list.append('%s\n%s\n%s\n%s\n%s\n%d\n%s' % (
2198
                key_bytes, parent_bytes, method_bytes, noeol_bytes, next_bytes,
2199
                len(record_bytes), record_bytes))
2200
        map_bytes = ''.join(map_byte_list)
2201
        lines.append(map_bytes)
2202
        bytes = '\n'.join(lines)
2203
        return bytes
2204
2205
2206
class _VFContentMapGenerator(_ContentMapGenerator):
2207
    """Content map generator reading from a VersionedFiles object."""
2208
2209
    def __init__(self, versioned_files, keys, nonlocal_keys=None,
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2210
        global_map=None, raw_record_map=None, ordering='unordered'):
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2211
        """Create a _ContentMapGenerator.
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2212
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2213
        :param versioned_files: The versioned files that the texts are being
2214
            extracted from.
2215
        :param keys: The keys to produce content maps for.
2216
        :param nonlocal_keys: An iterable of keys(possibly intersecting keys)
2217
            which are known to not be in this knit, but rather in one of the
2218
            fallback knits.
2219
        :param global_map: The result of get_parent_map(keys) (or a supermap).
2220
            This is required if get_record_stream() is to be used.
2221
        :param raw_record_map: A unparsed raw record map to use for answering
2222
            contents.
2223
        """
4537.3.1 by John Arbash Meinel
Start working on tests that get_record_stream gives reasonable results w/ stacking.
2224
        _ContentMapGenerator.__init__(self, ordering=ordering)
4005.3.6 by Robert Collins
Support delta_closure=True with NetworkRecordStream to transmit deltas over the wire when full text extraction is required on the far end.
2225
        # The vf to source data from
2226
        self.vf = versioned_files
2227
        # The keys desired
2228
        self.keys = list(keys)
2229
        # Keys known to be in fallback vfs objects
2230
        if nonlocal_keys is None:
2231
            self.nonlocal_keys = set()
2232
        else:
2233
            self.nonlocal_keys = frozenset(nonlocal_keys)
2234
        # Parents data for keys to be returned in get_record_stream
2235
        self.global_map = global_map
2236
        # The chunked lists for self.keys in text form
2237
        self._text_map = {}
2238
        # A cache of KnitContent objects used in extracting texts.
2239
        self._contents_map = {}
2240
        # All the knit records needed to assemble the requested keys as full
2241
        # texts.
2242
        self._record_map = None
2243
        if raw_record_map is None:
2244
            self._raw_record_map = self.vf._get_record_map_unparsed(keys,
2245
                allow_missing=True)
2246
        else:
2247
            self._raw_record_map = raw_record_map
2248
        # the factory for parsing records
2249
        self._factory = self.vf._factory
2250
2251
2252
class _NetworkContentMapGenerator(_ContentMapGenerator):
2253
    """Content map generator sourced from a network stream."""
2254
2255
    def __init__(self, bytes, line_end):
2256
        """Construct a _NetworkContentMapGenerator from a bytes block."""
2257
        self._bytes = bytes
2258
        self.global_map = {}
2259
        self._raw_record_map = {}
2260
        self._contents_map = {}
2261
        self._record_map = None
2262
        self.nonlocal_keys = []
2263
        # Get access to record parsing facilities
2264
        self.vf = KnitVersionedFiles(None, None)
2265
        start = line_end
2266
        # Annotated or not
2267
        line_end = bytes.find('\n', start)
2268
        line = bytes[start:line_end]
2269
        start = line_end + 1
2270
        if line == 'annotated':
2271
            self._factory = KnitAnnotateFactory()
2272
        else:
2273
            self._factory = KnitPlainFactory()
2274
        # list of keys to emit in get_record_stream
2275
        line_end = bytes.find('\n', start)
2276
        line = bytes[start:line_end]
2277
        start = line_end + 1
2278
        self.keys = [
2279
            tuple(segment.split('\x00')) for segment in line.split('\t')
2280
            if segment]
2281
        # now a loop until the end. XXX: It would be nice if this was just a
2282
        # bunch of the same records as get_record_stream(..., False) gives, but
2283
        # there is a decent sized gap stopping that at the moment.
2284
        end = len(bytes)
2285
        while start < end:
2286
            # 1 line with key
2287
            line_end = bytes.find('\n', start)
2288
            key = tuple(bytes[start:line_end].split('\x00'))
2289
            start = line_end + 1
2290
            # 1 line with parents (None: for None, '' for ())
2291
            line_end = bytes.find('\n', start)
2292
            line = bytes[start:line_end]
2293
            if line == 'None:':
2294
                parents = None
2295
            else:
2296
                parents = tuple(
2297
                    [tuple(segment.split('\x00')) for segment in line.split('\t')
2298
                     if segment])
2299
            self.global_map[key] = parents
2300
            start = line_end + 1
2301
            # one line with method
2302
            line_end = bytes.find('\n', start)
2303
            line = bytes[start:line_end]
2304
            method = line
2305
            start = line_end + 1
2306
            # one line with noeol
2307
            line_end = bytes.find('\n', start)
2308
            line = bytes[start:line_end]
2309
            noeol = line == "T"
2310
            start = line_end + 1
2311
            # one line with next ('' for None)
2312
            line_end = bytes.find('\n', start)
2313
            line = bytes[start:line_end]
2314
            if not line:
2315
                next = None
2316
            else:
2317
                next = tuple(bytes[start:line_end].split('\x00'))
2318
            start = line_end + 1
2319
            # one line with byte count of the record bytes
2320
            line_end = bytes.find('\n', start)
2321
            line = bytes[start:line_end]
2322
            count = int(line)
2323
            start = line_end + 1
2324
            # the record bytes
2325
            record_bytes = bytes[start:start+count]
2326
            start = start + count
2327
            # put it in the map
2328
            self._raw_record_map[key] = (record_bytes, (method, noeol), next)
2329
2330
    def get_record_stream(self):
2331
        """Get a record stream for for keys requested by the bytestream."""
2332
        first = True
2333
        for key in self.keys:
2334
            yield LazyKnitContentFactory(key, self.global_map[key], self, first)
2335
            first = False
2336
2337
    def _wire_bytes(self):
2338
        return self._bytes
2339
2340
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2341
class _KndxIndex(object):
2342
    """Manages knit index files
2343
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2344
    The index is kept in memory and read on startup, to enable
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2345
    fast lookups of revision information.  The cursor of the index
2346
    file is always pointing to the end, making it easy to append
2347
    entries.
2348
2349
    _cache is a cache for fast mapping from version id to a Index
2350
    object.
2351
2352
    _history is a cache for fast mapping from indexes to version ids.
2353
2354
    The index data format is dictionary compressed when it comes to
2355
    parent references; a index entry may only have parents that with a
2356
    lover index number.  As a result, the index is topological sorted.
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
2357
2358
    Duplicate entries may be written to the index for a single version id
2359
    if this is done then the latter one completely replaces the former:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2360
    this allows updates to correct version and parent information.
1563.2.11 by Robert Collins
Consolidate reweave and join as we have no separate usage, make reweave tests apply to all versionedfile implementations and deprecate the old reweave apis.
2361
    Note that the two entries may share the delta, and that successive
2362
    annotations and references MUST point to the first entry.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2363
2364
    The index file on disc contains a header, followed by one line per knit
2365
    record. The same revision can be present in an index file more than once.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2366
    The first occurrence gets assigned a sequence number starting from 0.
2367
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2368
    The format of a single line is
2369
    REVISION_ID FLAGS BYTE_OFFSET LENGTH( PARENT_ID|PARENT_SEQUENCE_ID)* :\n
2370
    REVISION_ID is a utf8-encoded revision id
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2371
    FLAGS is a comma separated list of flags about the record. Values include
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2372
        no-eol, line-delta, fulltext.
2373
    BYTE_OFFSET is the ascii representation of the byte offset in the data file
4775.1.1 by Martin Pool
Remove several 'the the' typos
2374
        that the compressed data starts at.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2375
    LENGTH is the ascii representation of the length of the data file.
2376
    PARENT_ID a utf-8 revision id prefixed by a '.' that is a parent of
2377
        REVISION_ID.
2378
    PARENT_SEQUENCE_ID the ascii representation of the sequence number of a
2379
        revision id already in the knit that is a parent of REVISION_ID.
2380
    The ' :' marker is the end of record marker.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2381
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2382
    partial writes:
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2383
    when a write is interrupted to the index file, it will result in a line
2384
    that does not end in ' :'. If the ' :' is not present at the end of a line,
2385
    or at the end of the file, then the record that is missing it will be
2386
    ignored by the parser.
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2387
1759.2.1 by Jelmer Vernooij
Fix some types (found using aspell).
2388
    When writing new records to the index file, the data is preceded by '\n'
1641.1.2 by Robert Collins
Change knit index files to be robust in the presence of partial writes.
2389
    to ensure that records always start on new lines even if the last write was
2390
    interrupted. As a result its normal for the last line in the index to be
2391
    missing a trailing newline. One can be added with no harmful effects.
3350.6.11 by Martin Pool
Review cleanups and documentation from Robert's mail on 2080618
2392
2393
    :ivar _kndx_cache: dict from prefix to the old state of KnitIndex objects,
2394
        where prefix is e.g. the (fileid,) for .texts instances or () for
2395
        constant-mapped things like .revisions, and the old state is
2396
        tuple(history_vector, cache_dict).  This is used to prevent having an
2397
        ABI change with the C extension that reads .kndx files.
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2398
    """
2399
1666.1.6 by Robert Collins
Make knit the default format.
2400
    HEADER = "# bzr knit index 8\n"
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2401
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2402
    def __init__(self, transport, mapper, get_scope, allow_writes, is_locked):
2403
        """Create a _KndxIndex on transport using mapper."""
2404
        self._transport = transport
2405
        self._mapper = mapper
2406
        self._get_scope = get_scope
2407
        self._allow_writes = allow_writes
2408
        self._is_locked = is_locked
2409
        self._reset_cache()
2410
        self.has_graph = True
2411
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2412
    def add_records(self, records, random_id=False, missing_compression_parents=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2413
        """Add multiple records to the index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2414
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2415
        :param records: a list of tuples:
2416
                         (key, options, access_memo, parents).
2417
        :param random_id: If True the ids being added were randomly generated
2418
            and no check for existence will be performed.
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2419
        :param missing_compression_parents: If True the records being added are
2420
            only compressed against texts already in the index (or inside
2421
            records). If False the records all refer to unavailable texts (or
2422
            texts inside records) as compression parents.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2423
        """
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2424
        if missing_compression_parents:
2425
            # It might be nice to get the edge of the records. But keys isn't
2426
            # _wrong_.
2427
            keys = sorted(record[0] for record in records)
2428
            raise errors.RevisionNotPresent(keys, self)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2429
        paths = {}
2430
        for record in records:
2431
            key = record[0]
2432
            prefix = key[:-1]
2433
            path = self._mapper.map(key) + '.kndx'
2434
            path_keys = paths.setdefault(path, (prefix, []))
2435
            path_keys[1].append(record)
2436
        for path in sorted(paths):
2437
            prefix, path_keys = paths[path]
2438
            self._load_prefixes([prefix])
2439
            lines = []
2440
            orig_history = self._kndx_cache[prefix][1][:]
2441
            orig_cache = self._kndx_cache[prefix][0].copy()
2442
2443
            try:
2444
                for key, options, (_, pos, size), parents in path_keys:
2445
                    if parents is None:
2446
                        # kndx indices cannot be parentless.
2447
                        parents = ()
2448
                    line = "\n%s %s %s %s %s :" % (
2449
                        key[-1], ','.join(options), pos, size,
2450
                        self._dictionary_compress(parents))
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
2451
                    if type(line) is not str:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2452
                        raise AssertionError(
2453
                            'data must be utf8 was %s' % type(line))
2454
                    lines.append(line)
2455
                    self._cache_key(key, options, pos, size, parents)
2456
                if len(orig_history):
2457
                    self._transport.append_bytes(path, ''.join(lines))
2458
                else:
2459
                    self._init_index(path, lines)
2460
            except:
2461
                # If any problems happen, restore the original values and re-raise
2462
                self._kndx_cache[prefix] = (orig_cache, orig_history)
2463
                raise
2464
4011.5.7 by Andrew Bennetts
Remove leading underscore from _scan_unvalidate_index, explicitly NotImplementedError it for _KndxIndex.
2465
    def scan_unvalidated_index(self, graph_index):
2466
        """See _KnitGraphIndex.scan_unvalidated_index."""
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2467
        # Because kndx files do not support atomic insertion via separate index
2468
        # files, they do not support this method.
4011.5.7 by Andrew Bennetts
Remove leading underscore from _scan_unvalidate_index, explicitly NotImplementedError it for _KndxIndex.
2469
        raise NotImplementedError(self.scan_unvalidated_index)
2470
2471
    def get_missing_compression_parents(self):
2472
        """See _KnitGraphIndex.get_missing_compression_parents."""
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2473
        # Because kndx files do not support atomic insertion via separate index
2474
        # files, they do not support this method.
2475
        raise NotImplementedError(self.get_missing_compression_parents)
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2476
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2477
    def _cache_key(self, key, options, pos, size, parent_keys):
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
2478
        """Cache a version record in the history array and index cache.
2158.3.1 by Dmitry Vasiliev
KnitIndex tests/fixes/optimizations
2479
2480
        This is inlined into _load_data for performance. KEEP IN SYNC.
1596.2.18 by Robert Collins
More microopimisations on index reading, now down to 16000 records/seconds.
2481
        (It saves 60ms, 25% of the __init__ overhead on local 4000 record
2482
         indexes).
2483
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2484
        prefix = key[:-1]
2485
        version_id = key[-1]
2486
        # last-element only for compatibilty with the C load_data.
2487
        parents = tuple(parent[-1] for parent in parent_keys)
2488
        for parent in parent_keys:
2489
            if parent[:-1] != prefix:
2490
                raise ValueError("mismatched prefixes for %r, %r" % (
2491
                    key, parent_keys))
2492
        cache, history = self._kndx_cache[prefix]
1596.2.14 by Robert Collins
Make knit parsing non quadratic?
2493
        # only want the _history index to reference the 1st index entry
2494
        # for version_id
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2495
        if version_id not in cache:
2496
            index = len(history)
2497
            history.append(version_id)
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
2498
        else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2499
            index = cache[version_id][5]
2500
        cache[version_id] = (version_id,
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
2501
                                   options,
2502
                                   pos,
2503
                                   size,
2504
                                   parents,
2505
                                   index)
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2506
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2507
    def check_header(self, fp):
2508
        line = fp.readline()
2509
        if line == '':
2510
            # An empty file can actually be treated as though the file doesn't
2511
            # exist yet.
2512
            raise errors.NoSuchFile(self)
2513
        if line != self.HEADER:
2514
            raise KnitHeaderError(badline=line, filename=self)
2515
2516
    def _check_read(self):
2517
        if not self._is_locked():
2518
            raise errors.ObjectNotLocked(self)
2519
        if self._get_scope() != self._scope:
2520
            self._reset_cache()
2521
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
2522
    def _check_write_ok(self):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2523
        """Assert if not writes are permitted."""
2524
        if not self._is_locked():
2525
            raise errors.ObjectNotLocked(self)
3316.2.5 by Robert Collins
Review feedback.
2526
        if self._get_scope() != self._scope:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2527
            self._reset_cache()
3316.2.3 by Robert Collins
Remove manual notification of transaction finishing on versioned files.
2528
        if self._mode != 'w':
2529
            raise errors.ReadOnlyObjectDirtiedError(self)
2530
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2531
    def get_build_details(self, keys):
2532
        """Get the method, index_memo and compression parent for keys.
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2533
3224.1.29 by John Arbash Meinel
Properly handle annotating when ghosts are present.
2534
        Ghosts are omitted from the result.
2535
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2536
        :param keys: An iterable of keys.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2537
        :return: A dict of key:(index_memo, compression_parent, parents,
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2538
            record_details).
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2539
            index_memo
2540
                opaque structure to pass to read_records to extract the raw
2541
                data
2542
            compression_parent
2543
                Content that this record is built upon, may be None
2544
            parents
2545
                Logical parents of this node
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2546
            record_details
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2547
                extra information about the content which needs to be passed to
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
2548
                Factory.parse_record
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2549
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2550
        parent_map = self.get_parent_map(keys)
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2551
        result = {}
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2552
        for key in keys:
2553
            if key not in parent_map:
2554
                continue # Ghost
2555
            method = self.get_method(key)
2556
            parents = parent_map[key]
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2557
            if method == 'fulltext':
2558
                compression_parent = None
2559
            else:
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
2560
                compression_parent = parents[0]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2561
            noeol = 'no-eol' in self.get_options(key)
2562
            index_memo = self.get_position(key)
2563
            result[key] = (index_memo, compression_parent,
3224.1.14 by John Arbash Meinel
Switch to making content_details opaque, step 1
2564
                                  parents, (method, noeol))
3218.1.1 by Robert Collins
Reduce index query pressure for text construction by batching the individual queries into single batch queries.
2565
        return result
2566
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2567
    def get_method(self, key):
2568
        """Return compression method of specified key."""
2569
        options = self.get_options(key)
2570
        if 'fulltext' in options:
2571
            return 'fulltext'
2572
        elif 'line-delta' in options:
2573
            return 'line-delta'
2574
        else:
2575
            raise errors.KnitIndexUnknownMethod(self, options)
2576
2577
    def get_options(self, key):
2578
        """Return a list representing options.
2579
2580
        e.g. ['foo', 'bar']
2581
        """
2582
        prefix, suffix = self._split_key(key)
2583
        self._load_prefixes([prefix])
3350.8.9 by Robert Collins
define behaviour for add_lines with stacked storage.
2584
        try:
2585
            return self._kndx_cache[prefix][0][suffix][1]
2586
        except KeyError:
2587
            raise RevisionNotPresent(key, self)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2588
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
2589
    def find_ancestry(self, keys):
2590
        """See CombinedGraphIndex.find_ancestry()"""
2591
        prefixes = set(key[:-1] for key in keys)
2592
        self._load_prefixes(prefixes)
2593
        result = {}
2594
        parent_map = {}
2595
        missing_keys = set()
2596
        pending_keys = list(keys)
2597
        # This assumes that keys will not reference parents in a different
2598
        # prefix, which is accurate so far.
2599
        while pending_keys:
2600
            key = pending_keys.pop()
2601
            if key in parent_map:
2602
                continue
2603
            prefix = key[:-1]
2604
            try:
2605
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2606
            except KeyError:
2607
                missing_keys.add(key)
2608
            else:
2609
                parent_keys = tuple([prefix + (suffix,)
2610
                                     for suffix in suffix_parents])
2611
                parent_map[key] = parent_keys
2612
                pending_keys.extend([p for p in parent_keys
2613
                                        if p not in parent_map])
2614
        return parent_map, missing_keys
2615
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2616
    def get_parent_map(self, keys):
2617
        """Get a map of the parents of keys.
2618
2619
        :param keys: The keys to look up parents for.
2620
        :return: A mapping from keys to parents. Absent keys are absent from
2621
            the mapping.
2622
        """
2623
        # Parse what we need to up front, this potentially trades off I/O
2624
        # locality (.kndx and .knit in the same block group for the same file
2625
        # id) for less checking in inner loops.
3350.6.10 by Martin Pool
VersionedFiles review cleanups
2626
        prefixes = set(key[:-1] for key in keys)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2627
        self._load_prefixes(prefixes)
2628
        result = {}
2629
        for key in keys:
2630
            prefix = key[:-1]
2631
            try:
2632
                suffix_parents = self._kndx_cache[prefix][0][key[-1]][4]
2633
            except KeyError:
2634
                pass
2635
            else:
2636
                result[key] = tuple(prefix + (suffix,) for
2637
                    suffix in suffix_parents)
2638
        return result
2639
2640
    def get_position(self, key):
2641
        """Return details needed to access the version.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2642
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2643
        :return: a tuple (key, data position, size) to hand to the access
2644
            logic to get the record.
2645
        """
2646
        prefix, suffix = self._split_key(key)
2647
        self._load_prefixes([prefix])
2648
        entry = self._kndx_cache[prefix][0][suffix]
2649
        return key, entry[2], entry[3]
2650
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2651
    has_key = _mod_index._has_key_from_parent_map
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2652
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2653
    def _init_index(self, path, extra_lines=[]):
2654
        """Initialize an index."""
2655
        sio = StringIO()
2656
        sio.write(self.HEADER)
2657
        sio.writelines(extra_lines)
2658
        sio.seek(0)
2659
        self._transport.put_file_non_atomic(path, sio,
2660
                            create_parent_dir=True)
2661
                           # self._create_parent_dir)
2662
                           # mode=self._file_mode,
2663
                           # dir_mode=self._dir_mode)
2664
2665
    def keys(self):
2666
        """Get all the keys in the collection.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2667
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2668
        The keys are not ordered.
2669
        """
2670
        result = set()
2671
        # Identify all key prefixes.
2672
        # XXX: A bit hacky, needs polish.
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
2673
        if type(self._mapper) is ConstantMapper:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2674
            prefixes = [()]
2675
        else:
2676
            relpaths = set()
2677
            for quoted_relpath in self._transport.iter_files_recursive():
2678
                path, ext = os.path.splitext(quoted_relpath)
2679
                relpaths.add(path)
2680
            prefixes = [self._mapper.unmap(path) for path in relpaths]
2681
        self._load_prefixes(prefixes)
2682
        for prefix in prefixes:
2683
            for suffix in self._kndx_cache[prefix][1]:
2684
                result.add(prefix + (suffix,))
2685
        return result
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2686
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2687
    def _load_prefixes(self, prefixes):
2688
        """Load the indices for prefixes."""
2689
        self._check_read()
2690
        for prefix in prefixes:
2691
            if prefix not in self._kndx_cache:
2692
                # the load_data interface writes to these variables.
2693
                self._cache = {}
2694
                self._history = []
2695
                self._filename = prefix
2696
                try:
2697
                    path = self._mapper.map(prefix) + '.kndx'
2698
                    fp = self._transport.get(path)
2699
                    try:
2700
                        # _load_data may raise NoSuchFile if the target knit is
2701
                        # completely empty.
2702
                        _load_data(self, fp)
2703
                    finally:
2704
                        fp.close()
2705
                    self._kndx_cache[prefix] = (self._cache, self._history)
2706
                    del self._cache
2707
                    del self._filename
2708
                    del self._history
2709
                except NoSuchFile:
2710
                    self._kndx_cache[prefix] = ({}, [])
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
2711
                    if type(self._mapper) is ConstantMapper:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2712
                        # preserve behaviour for revisions.kndx etc.
2713
                        self._init_index(path)
2714
                    del self._cache
2715
                    del self._filename
2716
                    del self._history
2717
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
2718
    missing_keys = _mod_index._missing_keys_from_parent_map
2719
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2720
    def _partition_keys(self, keys):
2721
        """Turn keys into a dict of prefix:suffix_list."""
2722
        result = {}
2723
        for key in keys:
2724
            prefix_keys = result.setdefault(key[:-1], [])
2725
            prefix_keys.append(key[-1])
2726
        return result
2727
2728
    def _dictionary_compress(self, keys):
2729
        """Dictionary compress keys.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2730
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2731
        :param keys: The keys to generate references to.
2732
        :return: A string representation of keys. keys which are present are
2733
            dictionary compressed, and others are emitted as fulltext with a
2734
            '.' prefix.
2735
        """
2736
        if not keys:
2737
            return ''
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2738
        result_list = []
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2739
        prefix = keys[0][:-1]
2740
        cache = self._kndx_cache[prefix][0]
2741
        for key in keys:
2742
            if key[:-1] != prefix:
2743
                # kndx indices cannot refer across partitioned storage.
2744
                raise ValueError("mismatched prefixes for %r" % keys)
2745
            if key[-1] in cache:
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
2746
                # -- inlined lookup() --
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2747
                result_list.append(str(cache[key[-1]][5]))
1628.1.1 by Robert Collins
Cache the index number of versions in the knit index's self._cache so that
2748
                # -- end lookup () --
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2749
            else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2750
                result_list.append('.' + key[-1])
1594.2.8 by Robert Collins
add ghost aware apis to knits.
2751
        return ' '.join(result_list)
2752
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2753
    def _reset_cache(self):
2754
        # Possibly this should be a LRU cache. A dictionary from key_prefix to
2755
        # (cache_dict, history_vector) for parsed kndx files.
2756
        self._kndx_cache = {}
2757
        self._scope = self._get_scope()
2758
        allow_writes = self._allow_writes()
2759
        if allow_writes:
2760
            self._mode = 'w'
1563.2.4 by Robert Collins
First cut at including the knit implementation of versioned_file.
2761
        else:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2762
            self._mode = 'r'
2763
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2764
    def _sort_keys_by_io(self, keys, positions):
2765
        """Figure out an optimal order to read the records for the given keys.
2766
2767
        Sort keys, grouped by index and sorted by position.
2768
2769
        :param keys: A list of keys whose records we want to read. This will be
2770
            sorted 'in-place'.
2771
        :param positions: A dict, such as the one returned by
2772
            _get_components_positions()
2773
        :return: None
2774
        """
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2775
        def get_sort_key(key):
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2776
            index_memo = positions[key][1]
2777
            # Group by prefix and position. index_memo[0] is the key, so it is
2778
            # (file_id, revision_id) and we don't want to sort on revision_id,
2779
            # index_memo[1] is the position, and index_memo[2] is the size,
2780
            # which doesn't matter for the sort
2781
            return index_memo[0][:-1], index_memo[1]
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
2782
        return keys.sort(key=get_sort_key)
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
2783
4039.3.5 by John Arbash Meinel
Add direct tests for _get_total_build_size.
2784
    _get_total_build_size = _get_total_build_size
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
2785
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2786
    def _split_key(self, key):
2787
        """Split key into a prefix and suffix."""
2788
        return key[:-1], key[-1]
2789
2790
2791
class _KnitGraphIndex(object):
2792
    """A KnitVersionedFiles index layered on GraphIndex."""
2793
2794
    def __init__(self, graph_index, is_locked, deltas=False, parents=True,
4634.29.3 by Andrew Bennetts
Simplify further.
2795
        add_callback=None, track_external_parent_refs=False):
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
2796
        """Construct a KnitGraphIndex on a graph_index.
2797
2798
        :param graph_index: An implementation of bzrlib.index.GraphIndex.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2799
        :param is_locked: A callback to check whether the object should answer
2800
            queries.
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2801
        :param deltas: Allow delta-compressed records.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2802
        :param parents: If True, record knits parents, if not do not record
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2803
            parents.
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2804
        :param add_callback: If not None, allow additions to the index and call
2805
            this callback with a list of added GraphIndex nodes:
2592.3.33 by Robert Collins
Change the order of index refs and values to make the no-graph knit index easier.
2806
            [(node, value, node_refs), ...]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2807
        :param is_locked: A callback, returns True if the index is locked and
2808
            thus usable.
4257.4.11 by Andrew Bennetts
Polish the patch.
2809
        :param track_external_parent_refs: If True, record all external parent
2810
            references parents from added records.  These can be retrieved
2811
            later by calling get_missing_parents().
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
2812
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2813
        self._add_callback = add_callback
2592.3.2 by Robert Collins
Implement a get_graph for a new KnitGraphIndex that will implement a KnitIndex on top of the GraphIndex API.
2814
        self._graph_index = graph_index
2592.3.13 by Robert Collins
Implement KnitGraphIndex.get_method.
2815
        self._deltas = deltas
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2816
        self._parents = parents
2817
        if deltas and not parents:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2818
            # XXX: TODO: Delta tree and parent graph should be conceptually
2819
            # separate.
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2820
            raise KnitCorrupt(self, "Cannot do delta compression without "
2821
                "parent tracking.")
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2822
        self.has_graph = parents
2823
        self._is_locked = is_locked
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2824
        self._missing_compression_parents = set()
4257.4.11 by Andrew Bennetts
Polish the patch.
2825
        if track_external_parent_refs:
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2826
            self._key_dependencies = _KeyRefs()
4257.4.10 by Andrew Bennetts
Observe new revisions in _KnitGraphIndex.add_record rather than iterating all the uncommitted packs' indices.
2827
        else:
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2828
            self._key_dependencies = None
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2829
3517.4.13 by Martin Pool
Add repr methods
2830
    def __repr__(self):
2831
        return "%s(%r)" % (self.__class__.__name__, self._graph_index)
2832
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2833
    def add_records(self, records, random_id=False,
2834
        missing_compression_parents=False):
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2835
        """Add multiple records to the index.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2836
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2837
        This function does not insert data into the Immutable GraphIndex
2838
        backing the KnitGraphIndex, instead it prepares data for insertion by
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2839
        the caller and checks that it is safe to insert then calls
2840
        self._add_callback with the prepared GraphIndex nodes.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2841
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2842
        :param records: a list of tuples:
2843
                         (key, options, access_memo, parents).
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2844
        :param random_id: If True the ids being added were randomly generated
2845
            and no check for existence will be performed.
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2846
        :param missing_compression_parents: If True the records being added are
2847
            only compressed against texts already in the index (or inside
2848
            records). If False the records all refer to unavailable texts (or
2849
            texts inside records) as compression parents.
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2850
        """
2592.3.19 by Robert Collins
Change KnitGraphIndex from returning data to performing a callback on insertions.
2851
        if not self._add_callback:
2852
            raise errors.ReadOnlyError(self)
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2853
        # we hope there are no repositories with inconsistent parentage
2854
        # anymore.
2855
2856
        keys = {}
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2857
        compression_parents = set()
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2858
        key_dependencies = self._key_dependencies
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2859
        for (key, options, access_memo, parents) in records:
2860
            if self._parents:
2861
                parents = tuple(parents)
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2862
                if key_dependencies is not None:
2863
                    key_dependencies.add_references(key, parents)
2670.2.2 by Robert Collins
* In ``bzrlib.knit`` the internal interface has been altered to use
2864
            index, pos, size = access_memo
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2865
            if 'no-eol' in options:
2866
                value = 'N'
2867
            else:
2868
                value = ' '
2869
            value += "%d %d" % (pos, size)
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2870
            if not self._deltas:
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2871
                if 'line-delta' in options:
2872
                    raise KnitCorrupt(self, "attempt to add line-delta in non-delta knit")
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2873
            if self._parents:
2874
                if self._deltas:
2875
                    if 'line-delta' in options:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2876
                        node_refs = (parents, (parents[0],))
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2877
                        if missing_compression_parents:
2878
                            compression_parents.add(parents[0])
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2879
                    else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2880
                        node_refs = (parents, ())
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2881
                else:
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2882
                    node_refs = (parents, )
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2883
            else:
2884
                if parents:
2885
                    raise KnitCorrupt(self, "attempt to add node with parents "
2886
                        "in parentless index.")
2887
                node_refs = ()
2624.2.5 by Robert Collins
Change bzrlib.index.Index keys to be 1-tuples, not strings.
2888
            keys[key] = (value, node_refs)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2889
        # check for dups
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2890
        if not random_id:
2891
            present_nodes = self._get_entries(keys)
2892
            for (index, key, value, node_refs) in present_nodes:
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
2893
                parents = node_refs[:1]
2894
                # Sometimes these are passed as a list rather than a tuple
2895
                passed = static_tuple.as_tuples(keys[key])
4789.28.4 by John Arbash Meinel
Fix a small typo
2896
                passed_parents = passed[1][:1]
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2897
                if (value[0] != keys[key][0][0] or
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
2898
                    parents != passed_parents):
2899
                    node_refs = static_tuple.as_tuples(node_refs)
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2900
                    raise KnitCorrupt(self, "inconsistent details in add_records"
4789.28.3 by John Arbash Meinel
Add a static_tuple.as_tuples() helper.
2901
                        ": %s %s" % ((value, node_refs), passed))
2841.2.1 by Robert Collins
* Commit no longer checks for new text keys during insertion when the
2902
                del keys[key]
2592.3.17 by Robert Collins
Add add_version(s) to KnitGraphIndex, completing the required api for KnitVersionedFile.
2903
        result = []
2592.3.34 by Robert Collins
Rough unfactored support for parentless KnitGraphIndexs.
2904
        if self._parents:
2905
            for key, (value, node_refs) in keys.iteritems():
2906
                result.append((key, value, node_refs))
2907
        else:
2908
            for key, (value, node_refs) in keys.iteritems():
2909
                result.append((key, value))
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2910
        self._add_callback(result)
2911
        if missing_compression_parents:
2912
            # This may appear to be incorrect (it does not check for
2913
            # compression parents that are in the existing graph index),
2914
            # but such records won't have been buffered, so this is
2915
            # actually correct: every entry when
2916
            # missing_compression_parents==True either has a missing parent, or
2917
            # a parent that is one of the keys in records.
2918
            compression_parents.difference_update(keys)
2919
            self._missing_compression_parents.update(compression_parents)
2920
        # Adding records may have satisfied missing compression parents.
4009.3.7 by Andrew Bennetts
Most tests passing.
2921
        self._missing_compression_parents.difference_update(keys)
4032.1.1 by John Arbash Meinel
Merge the removal of all trailing whitespace, and resolve conflicts.
2922
4011.5.7 by Andrew Bennetts
Remove leading underscore from _scan_unvalidate_index, explicitly NotImplementedError it for _KndxIndex.
2923
    def scan_unvalidated_index(self, graph_index):
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2924
        """Inform this _KnitGraphIndex that there is an unvalidated index.
2925
2926
        This allows this _KnitGraphIndex to keep track of any missing
2927
        compression parents we may want to have filled in to make those
2928
        indices valid.
2929
2930
        :param graph_index: A GraphIndex
2931
        """
4011.5.11 by Robert Collins
Polish the KnitVersionedFiles.scan_unvalidated_index api.
2932
        if self._deltas:
2933
            new_missing = graph_index.external_references(ref_list_num=1)
2934
            new_missing.difference_update(self.get_parent_map(new_missing))
2935
            self._missing_compression_parents.update(new_missing)
4634.29.3 by Andrew Bennetts
Simplify further.
2936
        if self._key_dependencies is not None:
2937
            # Add parent refs from graph_index (and discard parent refs that
2938
            # the graph_index has).
2939
            for node in graph_index.iter_all_entries():
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2940
                self._key_dependencies.add_references(node[1], node[3][0])
4009.3.7 by Andrew Bennetts
Most tests passing.
2941
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2942
    def get_missing_compression_parents(self):
4009.3.12 by Robert Collins
Polish on inserting record streams with missing compression parents.
2943
        """Return the keys of missing compression parents.
2944
2945
        Missing compression parents occur when a record stream was missing
2946
        basis texts, or a index was scanned that had missing basis texts.
4011.5.1 by Andrew Bennetts
Start to add _add_unvalidated_index/get_missing_compression_parents methods to _KnitGraphIndex.
2947
        """
2948
        return frozenset(self._missing_compression_parents)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
2949
4257.4.11 by Andrew Bennetts
Polish the patch.
2950
    def get_missing_parents(self):
2951
        """Return the keys of missing parents."""
4343.3.21 by John Arbash Meinel
Implement get_missing_parents in terms of _KeyRefs.
2952
        # If updating this, you should also update
2953
        # groupcompress._GCGraphIndex.get_missing_parents
4257.4.11 by Andrew Bennetts
Polish the patch.
2954
        # We may have false positives, so filter those out.
4634.29.6 by Andrew Bennetts
Put new key tracking in _KeyRefs rather than alongside it.
2955
        self._key_dependencies.satisfy_refs_for_keys(
4309.1.1 by Andrew Bennetts
Track which keys referenced the missing parents.
2956
            self.get_parent_map(self._key_dependencies.get_unsatisfied_refs()))
2957
        return frozenset(self._key_dependencies.get_unsatisfied_refs())
4257.4.11 by Andrew Bennetts
Polish the patch.
2958
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
2959
    def _check_read(self):
2960
        """raise if reads are not permitted."""
2961
        if not self._is_locked():
2962
            raise errors.ObjectNotLocked(self)
2963
2964
    def _check_write_ok(self):
2965
        """Assert if writes are not permitted."""
2966
        if not self._is_locked():
2967
            raise errors.ObjectNotLocked(self)
2968
2969
    def _compression_parent(self, an_entry):
2970
        # return the key that an_entry is compressed against, or None
2971
        # Grab the second parent list (as deltas implies parents currently)
2972
        compression_parents = an_entry[3][1]
2973
        if not compression_parents:
2974
            return None
2975
        if len(compression_parents) != 1:
2976
            raise AssertionError(
2977
                "Too many compression parents: %r" % compression_parents)
2978
        return compression_parents[0]
2979
2980
    def get_build_details(self, keys):
2981
        """Get the method, index_memo and compression parent for version_ids.
2982
2983
        Ghosts are omitted from the result.
2984
2985
        :param keys: An iterable of keys.
2986
        :return: A dict of key:
2987
            (index_memo, compression_parent, parents, record_details).
2988
            index_memo
2989
                opaque structure to pass to read_records to extract the raw
2990
                data
2991
            compression_parent
2992
                Content that this record is built upon, may be None
2993
            parents
2994
                Logical parents of this node
2995
            record_details
2996
                extra information about the content which needs to be passed to
2997
                Factory.parse_record
2998
        """
2999
        self._check_read()
3000
        result = {}
3001
        entries = self._get_entries(keys, False)
3002
        for entry in entries:
3003
            key = entry[1]
3004
            if not self._parents:
3005
                parents = ()
3006
            else:
3007
                parents = entry[3][0]
3008
            if not self._deltas:
3009
                compression_parent_key = None
3010
            else:
3011
                compression_parent_key = self._compression_parent(entry)
3012
            noeol = (entry[2][0] == 'N')
3013
            if compression_parent_key:
3014
                method = 'line-delta'
3015
            else:
3016
                method = 'fulltext'
3017
            result[key] = (self._node_to_position(entry),
3018
                                  compression_parent_key, parents,
3019
                                  (method, noeol))
3020
        return result
3021
3022
    def _get_entries(self, keys, check_present=False):
3023
        """Get the entries for keys.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3024
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3025
        :param keys: An iterable of index key tuples.
3026
        """
3027
        keys = set(keys)
3028
        found_keys = set()
3029
        if self._parents:
3030
            for node in self._graph_index.iter_entries(keys):
3031
                yield node
3032
                found_keys.add(node[1])
3033
        else:
3034
            # adapt parentless index to the rest of the code.
3035
            for node in self._graph_index.iter_entries(keys):
3036
                yield node[0], node[1], node[2], ()
3037
                found_keys.add(node[1])
3038
        if check_present:
3039
            missing_keys = keys.difference(found_keys)
3040
            if missing_keys:
3041
                raise RevisionNotPresent(missing_keys.pop(), self)
3042
3043
    def get_method(self, key):
3044
        """Return compression method of specified key."""
3045
        return self._get_method(self._get_node(key))
3046
3047
    def _get_method(self, node):
3048
        if not self._deltas:
3049
            return 'fulltext'
3050
        if self._compression_parent(node):
3051
            return 'line-delta'
3052
        else:
3053
            return 'fulltext'
3054
3055
    def _get_node(self, key):
3056
        try:
3057
            return list(self._get_entries([key]))[0]
3058
        except IndexError:
3059
            raise RevisionNotPresent(key, self)
3060
3061
    def get_options(self, key):
3062
        """Return a list representing options.
3063
3064
        e.g. ['foo', 'bar']
3065
        """
3066
        node = self._get_node(key)
3067
        options = [self._get_method(node)]
3068
        if node[2][0] == 'N':
3069
            options.append('no-eol')
3070
        return options
3071
4593.5.35 by John Arbash Meinel
Start working on a per-vf implementation test of find_ancestry.
3072
    def find_ancestry(self, keys):
3073
        """See CombinedGraphIndex.find_ancestry()"""
3074
        return self._graph_index.find_ancestry(keys, 0)
3075
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3076
    def get_parent_map(self, keys):
3077
        """Get a map of the parents of keys.
3078
3079
        :param keys: The keys to look up parents for.
3080
        :return: A mapping from keys to parents. Absent keys are absent from
3081
            the mapping.
3082
        """
3083
        self._check_read()
3084
        nodes = self._get_entries(keys)
3085
        result = {}
3086
        if self._parents:
3087
            for node in nodes:
3088
                result[node[1]] = node[3][0]
3089
        else:
3090
            for node in nodes:
3091
                result[node[1]] = None
3092
        return result
3093
3094
    def get_position(self, key):
3095
        """Return details needed to access the version.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3096
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3097
        :return: a tuple (index, data position, size) to hand to the access
3098
            logic to get the record.
3099
        """
3100
        node = self._get_node(key)
3101
        return self._node_to_position(node)
3102
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
3103
    has_key = _mod_index._has_key_from_parent_map
3830.3.9 by Martin Pool
Simplify kvf insert_record_stream; add has_key shorthand methods; update stacking effort tests
3104
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3105
    def keys(self):
3106
        """Get all the keys in the collection.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3107
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3108
        The keys are not ordered.
3109
        """
3110
        self._check_read()
3111
        return [node[1] for node in self._graph_index.iter_all_entries()]
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
3112
3830.3.12 by Martin Pool
Review cleanups: unify has_key impls, add missing_keys(), clean up exception blocks
3113
    missing_keys = _mod_index._missing_keys_from_parent_map
3114
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3115
    def _node_to_position(self, node):
3116
        """Convert an index value to position details."""
3117
        bits = node[2][1:].split(' ')
3118
        return node[0], int(bits[0]), int(bits[1])
3119
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
3120
    def _sort_keys_by_io(self, keys, positions):
3121
        """Figure out an optimal order to read the records for the given keys.
3122
3123
        Sort keys, grouped by index and sorted by position.
3124
3125
        :param keys: A list of keys whose records we want to read. This will be
3126
            sorted 'in-place'.
3127
        :param positions: A dict, such as the one returned by
3128
            _get_components_positions()
3129
        :return: None
3130
        """
3131
        def get_index_memo(key):
3878.1.3 by John Arbash Meinel
Add a comment about what data we are sorting by.
3132
            # index_memo is at offset [1]. It is made up of (GraphIndex,
3133
            # position, size). GI is an object, which will be unique for each
3134
            # pack file. This causes us to group by pack file, then sort by
3135
            # position. Size doesn't matter, but it isn't worth breaking up the
3136
            # tuple.
3878.1.2 by John Arbash Meinel
Move the sorting into each index, and customize it for Kndx access.
3137
            return positions[key][1]
3138
        return keys.sort(key=get_index_memo)
3139
4039.3.5 by John Arbash Meinel
Add direct tests for _get_total_build_size.
3140
    _get_total_build_size = _get_total_build_size
4039.3.2 by John Arbash Meinel
Batch get_record_stream(fulltexts) into 5MB requests.
3141
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3142
3143
class _KnitKeyAccess(object):
3144
    """Access to records in .knit files."""
3145
3146
    def __init__(self, transport, mapper):
3147
        """Create a _KnitKeyAccess with transport and mapper.
3148
3149
        :param transport: The transport the access object is rooted at.
3150
        :param mapper: The mapper used to map keys to .knit files.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3151
        """
3152
        self._transport = transport
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3153
        self._mapper = mapper
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3154
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3155
    def add_raw_records(self, key_sizes, raw_data):
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3156
        """Add raw knit bytes to a storage area.
3157
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3158
        The data is spooled to the container writer in one bytes-record per
3159
        raw data item.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3160
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3161
        :param sizes: An iterable of tuples containing the key and size of each
3162
            raw data segment.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3163
        :param raw_data: A bytestring containing the data.
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3164
        :return: A list of memos to retrieve the record later. Each memo is an
3165
            opaque index memo. For _KnitKeyAccess the memo is (key, pos,
3166
            length), where the key is the record key.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3167
        """
4398.8.8 by John Arbash Meinel
Respond to Andrew's review comments.
3168
        if type(raw_data) is not str:
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3169
            raise AssertionError(
3170
                'data must be plain bytes was %s' % type(raw_data))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3171
        result = []
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3172
        offset = 0
3173
        # TODO: This can be tuned for writing to sftp and other servers where
3174
        # append() is relatively expensive by grouping the writes to each key
3175
        # prefix.
3176
        for key, size in key_sizes:
3177
            path = self._mapper.map(key)
3178
            try:
3179
                base = self._transport.append_bytes(path + '.knit',
3180
                    raw_data[offset:offset+size])
3181
            except errors.NoSuchFile:
3182
                self._transport.mkdir(osutils.dirname(path))
3183
                base = self._transport.append_bytes(path + '.knit',
3184
                    raw_data[offset:offset+size])
3185
            # if base == 0:
3186
            # chmod.
3187
            offset += size
3188
            result.append((key, base, size))
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3189
        return result
3190
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
3191
    def flush(self):
4187.3.4 by Andrew Bennetts
Better docstrings and comments.
3192
        """Flush pending writes on this access object.
3193
        
3194
        For .knit files this is a no-op.
3195
        """
4187.3.3 by Andrew Bennetts
In KnitVersionedFiles.insert_record_stream, flush the access object before expanding a delta into a fulltext.
3196
        pass
3197
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3198
    def get_raw_records(self, memos_for_retrieval):
3199
        """Get the raw bytes for a records.
3200
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3201
        :param memos_for_retrieval: An iterable containing the access memo for
3202
            retrieving the bytes.
2592.3.66 by Robert Collins
Allow adaption of KnitData to pack files.
3203
        :return: An iterator over the bytes of the records.
3204
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3205
        # first pass, group into same-index request to minimise readv's issued.
3206
        request_lists = []
3207
        current_prefix = None
3208
        for (key, offset, length) in memos_for_retrieval:
3209
            if current_prefix == key[:-1]:
3210
                current_list.append((offset, length))
3211
            else:
3212
                if current_prefix is not None:
3213
                    request_lists.append((current_prefix, current_list))
3214
                current_prefix = key[:-1]
3215
                current_list = [(offset, length)]
3216
        # handle the last entry
3217
        if current_prefix is not None:
3218
            request_lists.append((current_prefix, current_list))
3219
        for prefix, read_vector in request_lists:
3220
            path = self._mapper.map(prefix) + '.knit'
3221
            for pos, data in self._transport.readv(path, read_vector):
3222
                yield data
3223
3224
5757.1.3 by Jelmer Vernooij
Revert noknit branch for the moment.
3225
class _DirectPackAccess(object):
3226
    """Access to data in one or more packs with less translation."""
3227
3228
    def __init__(self, index_to_packs, reload_func=None, flush_func=None):
3229
        """Create a _DirectPackAccess object.
3230
3231
        :param index_to_packs: A dict mapping index objects to the transport
3232
            and file names for obtaining data.
3233
        :param reload_func: A function to call if we determine that the pack
3234
            files have moved and we need to reload our caches. See
3235
            bzrlib.repo_fmt.pack_repo.AggregateIndex for more details.
3236
        """
3237
        self._container_writer = None
3238
        self._write_index = None
3239
        self._indices = index_to_packs
3240
        self._reload_func = reload_func
3241
        self._flush_func = flush_func
3242
3243
    def add_raw_records(self, key_sizes, raw_data):
3244
        """Add raw knit bytes to a storage area.
3245
3246
        The data is spooled to the container writer in one bytes-record per
3247
        raw data item.
3248
3249
        :param sizes: An iterable of tuples containing the key and size of each
3250
            raw data segment.
3251
        :param raw_data: A bytestring containing the data.
3252
        :return: A list of memos to retrieve the record later. Each memo is an
3253
            opaque index memo. For _DirectPackAccess the memo is (index, pos,
3254
            length), where the index field is the write_index object supplied
3255
            to the PackAccess object.
3256
        """
3257
        if type(raw_data) is not str:
3258
            raise AssertionError(
3259
                'data must be plain bytes was %s' % type(raw_data))
3260
        result = []
3261
        offset = 0
3262
        for key, size in key_sizes:
3263
            p_offset, p_length = self._container_writer.add_bytes_record(
3264
                raw_data[offset:offset+size], [])
3265
            offset += size
3266
            result.append((self._write_index, p_offset, p_length))
3267
        return result
3268
3269
    def flush(self):
3270
        """Flush pending writes on this access object.
3271
3272
        This will flush any buffered writes to a NewPack.
3273
        """
3274
        if self._flush_func is not None:
3275
            self._flush_func()
3276
            
3277
    def get_raw_records(self, memos_for_retrieval):
3278
        """Get the raw bytes for a records.
3279
3280
        :param memos_for_retrieval: An iterable containing the (index, pos,
3281
            length) memo for retrieving the bytes. The Pack access method
3282
            looks up the pack to use for a given record in its index_to_pack
3283
            map.
3284
        :return: An iterator over the bytes of the records.
3285
        """
3286
        # first pass, group into same-index requests
3287
        request_lists = []
3288
        current_index = None
3289
        for (index, offset, length) in memos_for_retrieval:
3290
            if current_index == index:
3291
                current_list.append((offset, length))
3292
            else:
3293
                if current_index is not None:
3294
                    request_lists.append((current_index, current_list))
3295
                current_index = index
3296
                current_list = [(offset, length)]
3297
        # handle the last entry
3298
        if current_index is not None:
3299
            request_lists.append((current_index, current_list))
3300
        for index, offsets in request_lists:
3301
            try:
3302
                transport, path = self._indices[index]
3303
            except KeyError:
3304
                # A KeyError here indicates that someone has triggered an index
3305
                # reload, and this index has gone missing, we need to start
3306
                # over.
3307
                if self._reload_func is None:
3308
                    # If we don't have a _reload_func there is nothing that can
3309
                    # be done
3310
                    raise
3311
                raise errors.RetryWithNewPacks(index,
3312
                                               reload_occurred=True,
3313
                                               exc_info=sys.exc_info())
3314
            try:
3315
                reader = pack.make_readv_reader(transport, path, offsets)
3316
                for names, read_func in reader.iter_records():
3317
                    yield read_func(None)
3318
            except errors.NoSuchFile:
3319
                # A NoSuchFile error indicates that a pack file has gone
3320
                # missing on disk, we need to trigger a reload, and start over.
3321
                if self._reload_func is None:
3322
                    raise
3323
                raise errors.RetryWithNewPacks(transport.abspath(path),
3324
                                               reload_occurred=False,
3325
                                               exc_info=sys.exc_info())
3326
3327
    def set_writer(self, writer, index, transport_packname):
3328
        """Set a writer to use for adding data."""
3329
        if index is not None:
3330
            self._indices[index] = transport_packname
3331
        self._container_writer = writer
3332
        self._write_index = index
3333
3334
    def reload_or_raise(self, retry_exc):
3335
        """Try calling the reload function, or re-raise the original exception.
3336
3337
        This should be called after _DirectPackAccess raises a
3338
        RetryWithNewPacks exception. This function will handle the common logic
3339
        of determining when the error is fatal versus being temporary.
3340
        It will also make sure that the original exception is raised, rather
3341
        than the RetryWithNewPacks exception.
3342
3343
        If this function returns, then the calling function should retry
3344
        whatever operation was being performed. Otherwise an exception will
3345
        be raised.
3346
3347
        :param retry_exc: A RetryWithNewPacks exception.
3348
        """
3349
        is_error = False
3350
        if self._reload_func is None:
3351
            is_error = True
3352
        elif not self._reload_func():
3353
            # The reload claimed that nothing changed
3354
            if not retry_exc.reload_occurred:
3355
                # If there wasn't an earlier reload, then we really were
3356
                # expecting to find changes. We didn't find them, so this is a
3357
                # hard error
3358
                is_error = True
3359
        if is_error:
3360
            exc_class, exc_value, exc_traceback = retry_exc.exc_info
3361
            raise exc_class, exc_value, exc_traceback
3362
3363
2770.1.2 by Aaron Bentley
Convert to knit-only annotation
3364
def annotate_knit(knit, revision_id):
3365
    """Annotate a knit with no cached annotations.
3366
3367
    This implementation is for knits with no cached annotations.
3368
    It will work for knits with cached annotations, but this is not
3369
    recommended.
3370
    """
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
3371
    annotator = _KnitAnnotator(knit)
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3372
    return iter(annotator.annotate_flat(revision_id))
3224.1.7 by John Arbash Meinel
_StreamIndex also needs to return the proper values for get_build_details.
3373
3374
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3375
class _KnitAnnotator(annotate.Annotator):
3224.1.5 by John Arbash Meinel
Start using a helper class for doing the knit-pack annotations.
3376
    """Build up the annotations for a text."""
3377
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3378
    def __init__(self, vf):
3379
        annotate.Annotator.__init__(self, vf)
3380
3381
        # TODO: handle Nodes which cannot be extracted
3382
        # self._ghosts = set()
3383
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3384
        # Map from (key, parent_key) => matching_blocks, should be 'use once'
3385
        self._matching_blocks = {}
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3386
3387
        # KnitContent objects
3388
        self._content_objects = {}
3389
        # The number of children that depend on this fulltext content object
3390
        self._num_compression_children = {}
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3391
        # Delta records that need their compression parent before they can be
3392
        # expanded
3393
        self._pending_deltas = {}
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3394
        # Fulltext records that are waiting for their parents fulltexts before
3395
        # they can be yielded for annotation
3396
        self._pending_annotation = {}
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
3397
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3398
        self._all_build_details = {}
3399
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3400
    def _get_build_graph(self, key):
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3401
        """Get the graphs for building texts and annotations.
3402
3403
        The data you need for creating a full text may be different than the
3404
        data you need to annotate that text. (At a minimum, you need both
3405
        parents to create an annotation, but only need 1 parent to generate the
3406
        fulltext.)
3407
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3408
        :return: A list of (key, index_memo) records, suitable for
4371.2.1 by Vincent Ladeuil
Start fixing annotate for gc.
3409
            passing to read_records_iter to start reading in the raw data from
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3410
            the pack file.
3411
        """
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3412
        pending = set([key])
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3413
        records = []
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3414
        ann_keys = set()
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3415
        self._num_needed_children[key] = 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3416
        while pending:
3417
            # get all pending nodes
3418
            this_iteration = pending
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3419
            build_details = self._vf._index.get_build_details(this_iteration)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3420
            self._all_build_details.update(build_details)
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3421
            # new_nodes = self._vf._index._get_entries(this_iteration)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3422
            pending = set()
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3423
            for key, details in build_details.iteritems():
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3424
                (index_memo, compression_parent, parent_keys,
3224.1.15 by John Arbash Meinel
Finish removing method and noeol from general knowledge,
3425
                 record_details) = details
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3426
                self._parent_map[key] = parent_keys
4454.3.41 by John Arbash Meinel
Cache the heads provider as long as we know that the parent_map hasn't changed.
3427
                self._heads_provider = None
3350.6.4 by Robert Collins
First cut at pluralised VersionedFiles. Some rather massive API incompatabilities, primarily because of the difficulty of coherence among competing stores.
3428
                records.append((key, index_memo))
3224.1.19 by John Arbash Meinel
Work on removing nodes from the working set once they aren't needed.
3429
                # Do we actually need to check _annotated_lines?
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3430
                pending.update([p for p in parent_keys
3431
                                   if p not in self._all_build_details])
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3432
                if parent_keys:
3433
                    for parent_key in parent_keys:
3434
                        if parent_key in self._num_needed_children:
3435
                            self._num_needed_children[parent_key] += 1
3436
                        else:
3437
                            self._num_needed_children[parent_key] = 1
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3438
                if compression_parent:
3439
                    if compression_parent in self._num_compression_children:
3440
                        self._num_compression_children[compression_parent] += 1
3441
                    else:
3442
                        self._num_compression_children[compression_parent] = 1
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3443
3444
            missing_versions = this_iteration.difference(build_details.keys())
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3445
            if missing_versions:
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3446
                for key in missing_versions:
3447
                    if key in self._parent_map and key in self._text_cache:
3448
                        # We already have this text ready, we just need to
3449
                        # yield it later so we get it annotated
3450
                        ann_keys.add(key)
3451
                        parent_keys = self._parent_map[key]
3452
                        for parent_key in parent_keys:
3453
                            if parent_key in self._num_needed_children:
3454
                                self._num_needed_children[parent_key] += 1
3455
                            else:
3456
                                self._num_needed_children[parent_key] = 1
3457
                        pending.update([p for p in parent_keys
3458
                                           if p not in self._all_build_details])
3459
                    else:
4454.3.65 by John Arbash Meinel
Tests that VF implementations support .get_annotator()
3460
                        raise errors.RevisionNotPresent(key, self._vf)
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3461
        # Generally we will want to read the records in reverse order, because
3462
        # we find the parent nodes after the children
3463
        records.reverse()
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3464
        return records, ann_keys
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3465
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3466
    def _get_needed_texts(self, key, pb=None):
5652.2.4 by Martin Pool
Rename to _immediate_fallback_vfs
3467
        # if True or len(self._vf._immediate_fallback_vfs) > 0:
3468
        if len(self._vf._immediate_fallback_vfs) > 0:
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3469
            # If we have fallbacks, go to the generic path
4454.3.43 by John Arbash Meinel
Initial implementation of a Pyrex annotator.
3470
            for v in annotate.Annotator._get_needed_texts(self, key, pb=pb):
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3471
                yield v
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3472
            return
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3473
        while True:
3474
            try:
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3475
                records, ann_keys = self._get_build_graph(key)
4454.3.59 by John Arbash Meinel
Track down why the annotate retry code was failing.
3476
                for idx, (sub_key, text, num_lines) in enumerate(
4454.3.42 by John Arbash Meinel
Make use of the passed in progress bar.
3477
                                                self._extract_texts(records)):
3478
                    if pb is not None:
3479
                        pb.update('annotating', idx, len(records))
4454.3.59 by John Arbash Meinel
Track down why the annotate retry code was failing.
3480
                    yield sub_key, text, num_lines
4454.3.64 by John Arbash Meinel
Ensure that _KnitAnnotator also supports add_special_text.
3481
                for sub_key in ann_keys:
3482
                    text = self._text_cache[sub_key]
3483
                    num_lines = len(text) # bad assumption
3484
                    yield sub_key, text, num_lines
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3485
                return
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3486
            except errors.RetryWithNewPacks, e:
3487
                self._vf._access.reload_or_raise(e)
3488
                # The cached build_details are no longer valid
3489
                self._all_build_details.clear()
3490
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3491
    def _cache_delta_blocks(self, key, compression_parent, delta, lines):
3492
        parent_lines = self._text_cache[compression_parent]
3493
        blocks = list(KnitContent.get_line_delta_blocks(delta, parent_lines, lines))
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3494
        self._matching_blocks[(key, compression_parent)] = blocks
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3495
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3496
    def _expand_record(self, key, parent_keys, compression_parent, record,
3497
                       record_details):
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3498
        delta = None
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3499
        if compression_parent:
3500
            if compression_parent not in self._content_objects:
3501
                # Waiting for the parent
3502
                self._pending_deltas.setdefault(compression_parent, []).append(
3503
                    (key, parent_keys, record, record_details))
3504
                return None
3505
            # We have the basis parent, so expand the delta
4454.3.33 by John Arbash Meinel
Change the _expand_record code to pop out old content objects.
3506
            num = self._num_compression_children[compression_parent]
3507
            num -= 1
3508
            if num == 0:
3509
                base_content = self._content_objects.pop(compression_parent)
3510
                self._num_compression_children.pop(compression_parent)
3511
            else:
3512
                self._num_compression_children[compression_parent] = num
3513
                base_content = self._content_objects[compression_parent]
4454.3.35 by John Arbash Meinel
Figure out why we don't want to copy_base_content=False.
3514
            # It is tempting to want to copy_base_content=False for the last
3515
            # child object. However, whenever noeol=False,
3516
            # self._text_cache[parent_key] is content._lines. So mutating it
3517
            # gives very bad results.
4454.3.36 by John Arbash Meinel
Only cache the content objects that we will reuse.
3518
            # The alternative is to copy the lines into text cache, but then we
3519
            # are copying anyway, so just do it here.
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3520
            content, delta = self._vf._factory.parse_record(
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3521
                key, record, record_details, base_content,
3522
                copy_base_content=True)
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3523
        else:
3524
            # Fulltext record
3525
            content, _ = self._vf._factory.parse_record(
3526
                key, record, record_details, None)
4454.3.36 by John Arbash Meinel
Only cache the content objects that we will reuse.
3527
        if self._num_compression_children.get(key, 0) > 0:
3528
            self._content_objects[key] = content
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3529
        lines = content.text()
3530
        self._text_cache[key] = lines
4454.3.37 by John Arbash Meinel
Add tests tha left-matching-blocks gets populated.
3531
        if delta is not None:
3532
            self._cache_delta_blocks(key, compression_parent, delta, lines)
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3533
        return lines
3534
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3535
    def _get_parent_annotations_and_matches(self, key, text, parent_key):
3536
        """Get the list of annotations for the parent, and the matching lines.
3537
3538
        :param text: The opaque value given by _get_needed_texts
3539
        :param parent_key: The key for the parent text
3540
        :return: (parent_annotations, matching_blocks)
3541
            parent_annotations is a list as long as the number of lines in
3542
                parent
3543
            matching_blocks is a list of (parent_idx, text_idx, len) tuples
3544
                indicating which lines match between the two texts
3545
        """
3546
        block_key = (key, parent_key)
3547
        if block_key in self._matching_blocks:
3548
            blocks = self._matching_blocks.pop(block_key)
3549
            parent_annotations = self._annotations_cache[parent_key]
3550
            return parent_annotations, blocks
4454.3.43 by John Arbash Meinel
Initial implementation of a Pyrex annotator.
3551
        return annotate.Annotator._get_parent_annotations_and_matches(self,
4454.3.38 by John Arbash Meinel
Start using left-matching-blocks during the actual annotation.
3552
            key, text, parent_key)
3553
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3554
    def _process_pending(self, key):
3555
        """The content for 'key' was just processed.
3556
3557
        Determine if there is any more pending work to be processed.
3558
        """
3559
        to_return = []
4454.3.31 by John Arbash Meinel
Change the processing lines to now handle fallbacks properly.
3560
        if key in self._pending_deltas:
3561
            compression_parent = key
3562
            children = self._pending_deltas.pop(key)
3563
            for child_key, parent_keys, record, record_details in children:
3564
                lines = self._expand_record(child_key, parent_keys,
3565
                                            compression_parent,
3566
                                            record, record_details)
3567
                if self._check_ready_for_annotations(child_key, parent_keys):
3568
                    to_return.append(child_key)
3569
        # Also check any children that are waiting for this parent to be
3570
        # annotation ready
3571
        if key in self._pending_annotation:
3572
            children = self._pending_annotation.pop(key)
3573
            to_return.extend([c for c, p_keys in children
3574
                              if self._check_ready_for_annotations(c, p_keys)])
3575
        return to_return
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3576
3577
    def _check_ready_for_annotations(self, key, parent_keys):
3578
        """return true if this text is ready to be yielded.
3579
3580
        Otherwise, this will return False, and queue the text into
3581
        self._pending_annotation
3582
        """
3583
        for parent_key in parent_keys:
3584
            if parent_key not in self._annotations_cache:
3585
                # still waiting on at least one parent text, so queue it up
3586
                # Note that if there are multiple parents, we need to wait
3587
                # for all of them.
3588
                self._pending_annotation.setdefault(parent_key,
3589
                    []).append((key, parent_keys))
3590
                return False
3591
        return True
3592
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3593
    def _extract_texts(self, records):
3594
        """Extract the various texts needed based on records"""
3224.1.6 by John Arbash Meinel
Refactor the annotation logic into a helper class.
3595
        # We iterate in the order read, rather than a strict order requested
3224.1.22 by John Arbash Meinel
Cleanup the extra debugging info, and some >80 char lines.
3596
        # However, process what we can, and put off to the side things that
3597
        # still need parents, cleaning them up when those parents are
3598
        # processed.
4454.3.29 by John Arbash Meinel
Some code comments about what needs to happen.
3599
        # Basic data flow:
3600
        #   1) As 'records' are read, see if we can expand these records into
3601
        #      Content objects (and thus lines)
3602
        #   2) If a given line-delta is waiting on its compression parent, it
3603
        #      gets queued up into self._pending_deltas, otherwise we expand
3604
        #      it, and put it into self._text_cache and self._content_objects
3605
        #   3) If we expanded the text, we will then check to see if all
3606
        #      parents have also been processed. If so, this text gets yielded,
3607
        #      else this record gets set aside into pending_annotation
3608
        #   4) Further, if we expanded the text in (2), we will then check to
3609
        #      see if there are any children in self._pending_deltas waiting to
3610
        #      also be processed. If so, we go back to (2) for those
3611
        #   5) Further again, if we yielded the text, we can then check if that
3612
        #      'unlocks' any of the texts in pending_annotations, which should
3613
        #      then get yielded as well
3614
        # Note that both steps 4 and 5 are 'recursive' in that unlocking one
3615
        # compression child could unlock yet another, and yielding a fulltext
3616
        # will also 'unlock' the children that are waiting on that annotation.
3617
        # (Though also, unlocking 1 parent's fulltext, does not unlock a child
3618
        # if other parents are also waiting.)
3619
        # We want to yield content before expanding child content objects, so
3620
        # that we know when we can re-use the content lines, and the annotation
3621
        # code can know when it can stop caching fulltexts, as well.
3622
4454.3.23 by John Arbash Meinel
Initial attempt at refactoring _KnitAnnotator to derive from Annotator.
3623
        # Children that are missing their compression parent
3624
        pending_deltas = {}
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3625
        for (key, record, digest) in self._vf._read_records_iter(records):
3626
            # ghosts?
4454.3.26 by John Arbash Meinel
The new _KnitAnnotator based on Annotator seems to pass the test suite.
3627
            details = self._all_build_details[key]
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3628
            (_, compression_parent, parent_keys, record_details) = details
3629
            lines = self._expand_record(key, parent_keys, compression_parent,
3630
                                        record, record_details)
3631
            if lines is None:
3632
                # Pending delta should be queued up
3633
                continue
3634
            # At this point, we may be able to yield this content, if all
3635
            # parents are also finished
4454.3.30 by John Arbash Meinel
add a bit more work to be able to process 'pending_annotations'.
3636
            yield_this_text = self._check_ready_for_annotations(key,
3637
                                                                parent_keys)
4454.3.29 by John Arbash Meinel
Some code comments about what needs to happen.
3638
            if yield_this_text:
4454.3.28 by John Arbash Meinel
Continue breaking things to build it up cleanly.
3639
                # All parents present
3640
                yield key, lines, len(lines)
4454.3.31 by John Arbash Meinel
Change the processing lines to now handle fallbacks properly.
3641
            to_process = self._process_pending(key)
3642
            while to_process:
3643
                this_process = to_process
3644
                to_process = []
3645
                for key in this_process:
3646
                    lines = self._text_cache[key]
3647
                    yield key, lines, len(lines)
3648
                    to_process.extend(self._process_pending(key))
3224.1.10 by John Arbash Meinel
Introduce the heads_provider for reannotate.
3649
2484.1.1 by John Arbash Meinel
Add an initial function to read knit indexes in pyrex.
3650
try:
4573.1.1 by Andrew Bennetts
Fix imports for _knit_load_data_pyx, which was recently renamed.
3651
    from bzrlib._knit_load_data_pyx import _load_data_c as _load_data
4574.3.6 by Martin Pool
More warnings when failing to load extensions
3652
except ImportError, e:
4574.3.8 by Martin Pool
Only mutter extension load errors when they occur, and record for later
3653
    osutils.failed_to_load_extension(e)
2484.1.12 by John Arbash Meinel
Switch the layout to use a matching _knit_load_data_py.py and _knit_load_data_c.pyx
3654
    from bzrlib._knit_load_data_py import _load_data_py as _load_data