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