~bzr-pqm/bzr/bzr.dev

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